Remove ddagenthostname from metrics (DataDog#21523)

sethsamuel · web-flow · commit e61b0606244d · 2025-10-03T14:02:07.000Z
* Remove ddagenthostname from metrics

* Lint

* Changelog

* Clean

* Fix

* Fix

* Move ddagenthostname to property

* Clean

* Fix test
diff --git a/mysql/changelog.d/21523.fixed b/mysql/changelog.d/21523.fixed
@@ -0,0 +1 @@
+Remove ddagenthostname from metrics for Postgres, MySQL, and SQLServer
diff --git a/mysql/datadog_checks/mysql/mysql.py b/mysql/datadog_checks/mysql/mysql.py
@@ -245,8 +245,6 @@ def add_core_tags(self):
         """
         self.tag_manager.set_tag("database_hostname", self.database_hostname, replace=True)
         self.tag_manager.set_tag("database_instance", self.database_identifier, replace=True)
-        if self.agent_hostname:
-            self.tag_manager.set_tag("ddagenthostname", self.agent_hostname, replace=True)
 
     def set_resource_tags(self):
         if self.cloud_metadata.get("gcp") is not None:
@@ -1361,6 +1359,7 @@ def _send_database_instance_metadata(self):
                 "database_instance": self.database_identifier,
                 "database_hostname": self.database_hostname,
                 "agent_version": datadog_agent.get_version(),
+                "ddagenthostname": self.agent_hostname,
                 "dbms": "mysql",
                 "kind": "database_instance",
                 "collection_interval": self._config.database_instance_collection_interval,
diff --git a/mysql/datadog_checks/mysql/statements.py b/mysql/datadog_checks/mysql/statements.py
@@ -156,7 +156,6 @@ def collect_per_statement_metrics(self):
             'timestamp': time.time() * 1000,
             'mysql_version': self._check.version.version + '+' + self._check.version.build,
             'mysql_flavor': self._check.version.flavor,
-            "ddagenthostname": self._check.agent_hostname,
             'ddagentversion': datadog_agent.get_version(),
             'min_collection_interval': self._metric_collection_interval,
             'tags': tags,
diff --git a/mysql/tests/tags.py b/mysql/tests/tags.py
@@ -9,7 +9,6 @@ def database_instance_resource_tags(hostname):
         f'dd.internal.resource:database_instance:{hostname}',
         f'database_hostname:{hostname}',
         f'database_instance:{hostname}',
-        f'ddagenthostname:{hostname}',
     )
 
 
@@ -36,7 +35,6 @@ def database_instance_resource_tags(hostname):
     'dd.internal.resource:database_instance:stubbed.hostname',
     'database_hostname:stubbed.hostname',
     'database_instance:stubbed.hostname',
-    'ddagenthostname:stubbed.hostname',
 )
 SC_FAILURE_TAGS = (
     'port:unix_socket',
diff --git a/mysql/tests/test_metadata.py b/mysql/tests/test_metadata.py
@@ -662,7 +662,6 @@ def test_collect_schemas(aggregator, dd_run_check, dbm_instance):
         'database_instance:stubbed.hostname',
         'dbms_flavor:{}'.format(common.MYSQL_FLAVOR.lower()),
         'dd.internal.resource:database_instance:stubbed.hostname',
-        'ddagenthostname:stubbed.hostname',
         'port:13306',
         'tag1:value1',
         'tag2:value2',
diff --git a/mysql/tests/test_mysql.py b/mysql/tests/test_mysql.py
@@ -129,7 +129,6 @@ def test_e2e(dd_agent_check, dd_default_hostname, instance_complex, root_conn):
     expected_metric_tags = tags.METRIC_TAGS + (
         f'database_hostname:{dd_default_hostname}',
         f'database_instance:{dd_default_hostname}',
-        f'ddagenthostname:{dd_default_hostname}',
         'dbms_flavor:{}'.format(MYSQL_FLAVOR.lower()),
     )
     if MYSQL_FLAVOR in ('mysql', 'percona'):
@@ -428,7 +427,6 @@ def test_correct_hostname(dbm_enabled, reported_hostname, expected_hostname, agg
         'server:{}'.format(HOST),
         'port:{}'.format(PORT),
         'dd.internal.resource:database_instance:{}'.format(expected_hostname),
-        'ddagenthostname:{}'.format('stubbed.hostname'),
     )
     aggregator.assert_service_check(
         'mysql.can_connect', status=MySql.OK, tags=expected_tags, count=1, hostname=expected_hostname
@@ -802,7 +800,6 @@ def test_database_instance_metadata(aggregator, dd_run_check, instance_complex,
         "database_instance:{}".format(expected_database_instance),
         'dd.internal.resource:database_instance:{}'.format(expected_database_instance),
         "dbms_flavor:{}".format(MYSQL_FLAVOR.lower()),
-        'ddagenthostname:{}'.format('stubbed.hostname'),
     )
 
     mysql_check = MySql(common.CHECK_NAME, {}, [instance_complex])
@@ -821,6 +818,7 @@ def test_database_instance_metadata(aggregator, dd_run_check, instance_complex,
     assert event['database_instance'] == expected_database_instance
     assert event['database_hostname'] == expected_database_hostname
     assert event['dbms'] == "mysql"
+    assert event['ddagenthostname'] == "stubbed.hostname"
     assert sorted(event['tags']) == sorted(expected_tags)
     assert event['integration_version'] == __version__
     assert event['collection_interval'] == 300
@@ -872,7 +870,6 @@ def test_propagate_agent_tags(
         + (
             'database_hostname:stubbed.hostname',
             'database_instance:forced_hostname',
-            'ddagenthostname:stubbed.hostname',
             'server:{}'.format(HOST),
             'port:{}'.format(PORT),
             'dd.internal.resource:database_instance:forced_hostname',
diff --git a/mysql/tests/test_query_activity.py b/mysql/tests/test_query_activity.py
@@ -121,7 +121,6 @@ def _run_blocking(conn):
     expected_tags = (
         'database_hostname:stubbed.hostname',
         'database_instance:stubbed.hostname',
-        'ddagenthostname:stubbed.hostname',
         'tag1:value1',
         'tag2:value2',
         'port:13306',
@@ -551,7 +550,6 @@ def _expected_dbm_job_err_tags(dbm_instance, check):
     _tags = dbm_instance['tags'] + (
         'database_hostname:stubbed.hostname',
         'database_instance:stubbed.hostname',
-        'ddagenthostname:stubbed.hostname',
         'job:query-activity',
         'port:{}'.format(PORT),
         'dd.internal.resource:database_instance:stubbed.hostname',
diff --git a/mysql/tests/test_statements.py b/mysql/tests/test_statements.py
@@ -155,7 +155,6 @@ def run_query(q):
 
     assert event['host'] == 'stubbed.hostname'
     assert event['ddagentversion'] == datadog_agent.get_version()
-    assert event['ddagenthostname'] == datadog_agent.get_hostname()
     assert event['mysql_version'] == mysql_check.version.version + '+' + mysql_check.version.build
     assert event['mysql_flavor'] == mysql_check.version.flavor
     assert event['timestamp'] > 0
@@ -380,7 +379,6 @@ def run_query(q):
 
     assert event['host'] == 'stubbed.hostname'
     assert event['ddagentversion'] == datadog_agent.get_version()
-    assert event['ddagenthostname'] == datadog_agent.get_hostname()
     assert event['mysql_version'] == mysql_check.version.version + '+' + mysql_check.version.build
     assert event['mysql_flavor'] == mysql_check.version.flavor
     assert event['cloud_metadata'] == output_cloud_metadata, "wrong cloud_metadata"
@@ -911,7 +909,6 @@ def _expected_dbm_instance_tags(dbm_instance, check):
     _tags = dbm_instance.get('tags', ()) + (
         'database_hostname:{}'.format('stubbed.hostname'),
         'database_instance:{}'.format('stubbed.hostname'),
-        'ddagenthostname:{}'.format('stubbed.hostname'),
         'server:{}'.format(common.HOST),
         'port:{}'.format(common.PORT),
         'dbms_flavor:{}'.format(MYSQL_FLAVOR.lower()),
@@ -929,7 +926,6 @@ def _expected_dbm_job_err_tags(dbm_instance, check):
     _tags = dbm_instance['tags'] + (
         'database_hostname:{}'.format('stubbed.hostname'),
         'database_instance:{}'.format('stubbed.hostname'),
-        'ddagenthostname:{}'.format('stubbed.hostname'),
         'port:{}'.format(common.PORT),
         'server:{}'.format(common.HOST),
         'dd.internal.resource:database_instance:stubbed.hostname',
diff --git a/mysql/tests/test_unit.py b/mysql/tests/test_unit.py
@@ -292,7 +292,6 @@ def test_replication_check_status(
                 'database_hostname:stubbed.hostname',
                 'database_instance:stubbed.hostname',
                 'dd.internal.resource:database_instance:stubbed.hostname',
-                'ddagenthostname:stubbed.hostname',
             },
         ),
         (
@@ -304,7 +303,6 @@ def test_replication_check_status(
                 'database_hostname:stubbed.hostname',
                 'database_instance:stubbed.hostname',
                 'dd.internal.resource:database_instance:stubbed.hostname',
-                'ddagenthostname:stubbed.hostname',
             },
         ),
         (
@@ -315,7 +313,6 @@ def test_replication_check_status(
                 'database_hostname:stubbed.hostname',
                 'database_instance:stubbed.hostname',
                 'dd.internal.resource:database_instance:stubbed.hostname',
-                'ddagenthostname:stubbed.hostname',
             },
         ),
         (
@@ -327,7 +324,6 @@ def test_replication_check_status(
                 'database_hostname:stubbed.hostname',
                 'database_instance:stubbed.hostname',
                 'dd.internal.resource:database_instance:stubbed.hostname',
-                'ddagenthostname:stubbed.hostname',
             },
         ),
     ],
diff --git a/postgres/changelog.d/21523.fixed b/postgres/changelog.d/21523.fixed
@@ -0,0 +1 @@
+Remove ddagenthostname from metrics for Postgres, MySQL, and SQLServer
diff --git a/postgres/datadog_checks/postgres/health.py b/postgres/datadog_checks/postgres/health.py
@@ -54,5 +54,6 @@ def submit_health_event(
             # If we have an error parsing the config we may not have tags yet
             tags=self.check.tags if hasattr(self.check, 'tags') else [],
             database_instance=self.check.database_identifier,
+            ddagenthostname=self.check.agent_hostname,
             **kwargs,
         )
diff --git a/postgres/datadog_checks/postgres/postgres.py b/postgres/datadog_checks/postgres/postgres.py
@@ -223,8 +223,6 @@ def add_core_tags(self):
         """
         self.tags.append("database_hostname:{}".format(self.database_hostname))
         self.tags.append("database_instance:{}".format(self.database_identifier))
-        if self.agent_hostname:
-            self.tags.append("ddagenthostname:{}".format(self.agent_hostname))
 
     def set_resource_tags(self):
         if self._config.gcp.project_id and self._config.gcp.instance_id:
@@ -1035,6 +1033,7 @@ def _send_database_instance_metadata(self):
                 "database_instance": self.database_identifier,
                 "database_hostname": self.database_hostname,
                 "agent_version": datadog_agent.get_version(),
+                "ddagenthostname": self.agent_hostname,
                 "dbms": "postgres",
                 "kind": "database_instance",
                 "collection_interval": self._config.database_instance_collection_interval,
diff --git a/postgres/datadog_checks/postgres/statements.py b/postgres/datadog_checks/postgres/statements.py
@@ -279,7 +279,6 @@ def collect_per_statement_metrics(self):
                 'cloud_metadata': self._check.cloud_metadata,
                 'postgres_version': payload_pg_version(self._check.version),
                 'ddagentversion': datadog_agent.get_version(),
-                'ddagenthostname': self._check.agent_hostname,
                 'service': self._config.service,
             }
 
diff --git a/postgres/tests/common.py b/postgres/tests/common.py
@@ -160,7 +160,6 @@ def _get_expected_tags(
         pg_instance['tags']
         + [f'port:{pg_instance["port"]}']
         + [f'database_hostname:{check.database_hostname}', f'database_instance:{check.database_identifier}']
-        + [f'ddagenthostname:{check.agent_hostname}']
     )
     if role:
         base_tags.append(f'replication_role:{role}')
diff --git a/postgres/tests/test_pg_integration.py b/postgres/tests/test_pg_integration.py
@@ -478,6 +478,7 @@ def test_activity_vacuum_excluded(aggregator, integration_check, pg_instance):
     thread.join()
 
 
+@pytest.mark.flaky(max_runs=5)
 def test_backend_transaction_age(aggregator, integration_check, pg_instance):
     pg_instance['collect_activity_metrics'] = True
     check = integration_check(pg_instance)
@@ -685,7 +686,6 @@ def test_config_tags_is_unchanged_between_checks(integration_check, pg_instance)
         for tag in expected_tags
         if not tag.startswith('database_instance:')
         and not tag.startswith('database_hostname:')
-        and not tag.startswith('ddagenthostname:')
         and not tag.startswith('dd.internal')
     ]
 
@@ -773,7 +773,6 @@ def test_database_instance_metadata(aggregator, pg_instance, dbm_enabled, report
         'replication_role:master',
         'database_hostname:{}'.format(expected_database_hostname),
         'database_instance:{}'.format(expected_database_instance),
-        'ddagenthostname:{}'.format(expected_database_hostname),
     ]
     check = integration_check(pg_instance)
     run_one_check(check)
@@ -789,6 +788,7 @@ def test_database_instance_metadata(aggregator, pg_instance, dbm_enabled, report
     assert event['database_instance'] == expected_database_instance
     assert event['database_hostname'] == expected_database_hostname
     assert event['dbms'] == "postgres"
+    assert event['ddagenthostname'] == "stubbed.hostname"
 
     assert sorted(event['tags']) == sorted(expected_tags)
     assert event['integration_version'] == __version__
diff --git a/postgres/tests/test_statements.py b/postgres/tests/test_statements.py
@@ -258,7 +258,6 @@ def _should_catch_query(dbname):
     assert event['host'] == 'stubbed.hostname'
     assert event['timestamp'] > 0
     assert event['ddagentversion'] == datadog_agent.get_version()
-    assert event['ddagenthostname'] == datadog_agent.get_hostname()
     assert event['min_collection_interval'] == dbm_instance['query_metrics']['collection_interval']
     expected_dbm_metrics_tags = set(_get_expected_tags(check, dbm_instance, with_host=False))
     assert set(event['tags']) == expected_dbm_metrics_tags
diff --git a/postgres/tests/test_unit.py b/postgres/tests/test_unit.py
@@ -146,7 +146,6 @@ def test_query_timeout_connection_string(aggregator, integration_check, pg_insta
                 'dd.internal.resource:database_instance:stubbed.hostname',
                 'database_hostname:stubbed.hostname',
                 'database_instance:stubbed.hostname',
-                'ddagenthostname:stubbed.hostname',
             },
         ),
         (
@@ -159,7 +158,6 @@ def test_query_timeout_connection_string(aggregator, integration_check, pg_insta
                 'dd.internal.resource:database_instance:stubbed.hostname',
                 'database_hostname:stubbed.hostname',
                 'database_instance:stubbed.hostname',
-                'ddagenthostname:stubbed.hostname',
             },
         ),
     ],
diff --git a/sqlserver/changelog.d/21523.fixed b/sqlserver/changelog.d/21523.fixed
@@ -0,0 +1 @@
+Remove ddagenthostname from metrics for Postgres, MySQL, and SQLServer
diff --git a/sqlserver/datadog_checks/sqlserver/sqlserver.py b/sqlserver/datadog_checks/sqlserver/sqlserver.py
@@ -235,8 +235,6 @@ def add_core_tags(self):
         """
         self.tag_manager.set_tag("database_hostname", self.database_hostname, replace=True)
         self.tag_manager.set_tag("database_instance", self.database_identifier, replace=True)
-        if self.agent_hostname:
-            self.tag_manager.set_tag("ddagenthostname", self.agent_hostname, replace=True)
 
     def set_resource_tags(self):
         if self.cloud_metadata.get("gcp") is not None:
@@ -1076,6 +1074,7 @@ def _send_database_instance_metadata(self):
                 "database_instance": self.database_identifier,
                 "database_hostname": self.database_hostname,
                 "agent_version": datadog_agent.get_version(),
+                "ddagenthostname": self.agent_hostname,
                 "dbms": "sqlserver",
                 "kind": "database_instance",
                 "collection_interval": self._config.database_instance_collection_interval,
diff --git a/sqlserver/datadog_checks/sqlserver/statements.py b/sqlserver/datadog_checks/sqlserver/statements.py
@@ -517,7 +517,6 @@ def _to_metrics_payload(self, rows, max_queries):
             'sqlserver_version': self._check.static_info_cache.get(STATIC_INFO_VERSION, ""),
             'sqlserver_engine_edition': self._check.static_info_cache.get(STATIC_INFO_ENGINE_EDITION, ""),
             'ddagentversion': datadog_agent.get_version(),
-            'ddagenthostname': self._check.agent_hostname,
             'service': self._config.service,
         }
 
diff --git a/sqlserver/datadog_checks/sqlserver/stored_procedures.py b/sqlserver/datadog_checks/sqlserver/stored_procedures.py
@@ -157,7 +157,6 @@ def _to_metrics_payload(self, rows, max_queries):
             'sqlserver_version': self._check.static_info_cache.get(STATIC_INFO_VERSION, ""),
             'sqlserver_engine_edition': self._check.static_info_cache.get(STATIC_INFO_ENGINE_EDITION, ""),
             'ddagentversion': datadog_agent.get_version(),
-            'ddagenthostname': self._check.agent_hostname,
             'service': self._config.service,
             'tags': self._check.tag_manager.get_tags(),
         }
diff --git a/sqlserver/tests/test_activity.py b/sqlserver/tests/test_activity.py
@@ -125,7 +125,6 @@ def test_collect_load_activity(
     expected_instance_tags = {t for t in instance_tags if not t.startswith('dd.internal')}
     expected_instance_tags.add("database_hostname:stubbed.hostname")
     expected_instance_tags.add("database_instance:stubbed.hostname")
-    expected_instance_tags.add("ddagenthostname:stubbed.hostname")
     expected_instance_tags.add("dd.internal.resource:database_instance:stubbed.hostname")
     if collect_raw_query_statement:
         instance["collect_raw_query_statement"] = {"enabled": True}
@@ -834,7 +833,6 @@ def _expected_dbm_instance_tags(check):
     return check._config.tags + [
         "database_hostname:{}".format("stubbed.hostname"),
         "database_instance:{}".format("stubbed.hostname"),
-        "ddagenthostname:{}".format("stubbed.hostname"),
         "dd.internal.resource:database_instance:{}".format("stubbed.hostname"),
         "sqlserver_servername:{}".format(check.static_info_cache[STATIC_INFO_SERVERNAME].lower()),
     ]
diff --git a/sqlserver/tests/test_database_metrics.py b/sqlserver/tests/test_database_metrics.py
diff --git a/sqlserver/tests/test_integration.py b/sqlserver/tests/test_integration.py
diff --git a/sqlserver/tests/test_metrics.py b/sqlserver/tests/test_metrics.py
diff --git a/sqlserver/tests/test_statements.py b/sqlserver/tests/test_statements.py
diff --git a/sqlserver/tests/test_stored_procedures.py b/sqlserver/tests/test_stored_procedures.py
diff --git a/sqlserver/tests/test_unit.py b/sqlserver/tests/test_unit.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Remove ddagenthostname from metrics for Postgres, MySQL, and SQLServer`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ def database_instance_resource_tags(hostname):`
`9`	`9`	`f'dd.internal.resource:database_instance:{hostname}',`
`10`	`10`	`f'database_hostname:{hostname}',`
`11`	`11`	`f'database_instance:{hostname}',`
`12`		`- f'ddagenthostname:{hostname}',`
`13`	`12`	`)`
`14`	`13`
`15`	`14`
`@@ -36,7 +35,6 @@ def database_instance_resource_tags(hostname):`
`36`	`35`	`'dd.internal.resource:database_instance:stubbed.hostname',`
`37`	`36`	`'database_hostname:stubbed.hostname',`
`38`	`37`	`'database_instance:stubbed.hostname',`
`39`		`- 'ddagenthostname:stubbed.hostname',`
`40`	`38`	`)`
`41`	`39`	`SC_FAILURE_TAGS = (`
`42`	`40`	`'port:unix_socket',`