[AGENT-13541] Properly support for custom tags in esxi (#20022)

* Add support for custom tags in esxi

* Add changelog

* update changelog and remove caplog fixture

Author: sarah-witt

esxi/changelog.d/20022.fixed

@@ -0,0 +1 @@
+Properly support custom tags.

esxi/datadog_checks/esxi/check.py

@@ -61,7 +61,8 @@ def __init__(self, name, init_config, instances):
         self.ssl_verify = is_affirmative(self.instance.get('ssl_verify', True))
         self.ssl_capath = self.instance.get("ssl_capath")
         self.ssl_cafile = self.instance.get("ssl_cafile")
-        self.tags = [f"esxi_url:{self.host}"]
+        self.tags = self.instance.get("tags", [])
+        self.tags.append(f"esxi_url:{self.host}")
         self.proxy_host = None
         self.proxy_port = None
         proxy = self.instance.get('proxy', init_config.get('proxy'))

esxi/tests/test_unit.py

@@ -1271,3 +1271,15 @@ def test_cant_get_version(vcsim_instance, dd_run_check, caplog, service_instance
     )
     aggregator.assert_metric('esxi.host.can_connect', 0, count=1)
     aggregator.assert_all_metrics_covered()
+
+
+@pytest.mark.usefixtures("service_instance")
+def test_esxi_custom_tags(vcsim_instance, dd_run_check, aggregator):
+    vcsim_instance['tags'] = ['test:tag']
+    check = EsxiCheck('esxi', {}, [vcsim_instance])
+    dd_run_check(check)
+
+    base_tags = ["esxi_url:127.0.0.1:8989", "test:tag"]
+    aggregator.assert_metric("esxi.cpu.usage.avg", value=0.26, tags=base_tags, hostname="localhost.localdomain")
+    aggregator.assert_metric("esxi.mem.granted.avg", value=80, tags=base_tags, hostname="localhost.localdomain")
+    aggregator.assert_metric("esxi.host.can_connect", 1, count=2, tags=base_tags)