removing last comma

DataDog · Dec 12, 2024 · b098424 · b098424
1 parent e47ff39
commit b098424
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/vsphere/datadog_checks/vsphere/vsphere.py b/vsphere/datadog_checks/vsphere/vsphere.py
@@ -626,8 +626,9 @@ def send_resource_to_redapl(self, clusters_data):
                     input_data[i] = ''
                 input_data[i] += str(v) + ','
         for i, v in input_data.items():
-            self.log.debug("Sending resource to redapl: %s, %s", i, v)
-            self.set_metadata(i, v)
+            # we want to remove the last comma to avoid adding an empty '' resource
+            self.log.debug("Sending resource to redapl: %s, %s", i, v.rstrip(','))
+            self.set_metadata(i, v.rstrip(','))
 
     def make_query_specs(self):
         # type: () -> Iterable[List[vim.PerformanceManager.QuerySpec]]

diff --git a/vsphere/tests/test_unit.py b/vsphere/tests/test_unit.py
@@ -3627,7 +3627,7 @@ def test_vsan_cluster_to_redapl(realtime_instance, dd_run_check, datadog_agent,
 
         dd_run_check(check)
 
-        datadog_agent.assert_metadata('', {'attr0': '1.0,', 'attr1': 'value1,', 'attr2': '123,'})
+        datadog_agent.assert_metadata('', {'attr0': '1.0', 'attr1': 'value1', 'attr2': '123'})
         # 6 elts of version metadata + 3 elts of cluster metadata
         datadog_agent.assert_metadata_count(9)