From 2d66c45e8515876a4bf4c9e623e654e7875009c7 Mon Sep 17 00:00:00 2001 From: sangeetashivaji Date: Mon, 28 Jul 2025 15:12:16 -0400 Subject: [PATCH 01/16] Update tags with agent version and host name --- postgres/datadog_checks/postgres/postgres.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgres/datadog_checks/postgres/postgres.py b/postgres/datadog_checks/postgres/postgres.py index 6c41fd82320fa..db3c64493a716 100644 --- a/postgres/datadog_checks/postgres/postgres.py +++ b/postgres/datadog_checks/postgres/postgres.py @@ -1005,7 +1005,10 @@ def _send_database_instance_metadata(self): "collection_interval": self._config.database_instance_collection_interval, 'dbms_version': payload_pg_version(self.version), 'integration_version': __version__, - "tags": [t for t in self._non_internal_tags if not t.startswith('db:')], + "tags": [t for t in self._non_internal_tags if not t.startswith('db:')] + [ + f"agent_version:{datadog_agent.get_version()}", + f"agent_hostname:{datadog_agent.get_hostname()}", + ], "timestamp": time() * 1000, "cloud_metadata": self.cloud_metadata, "metadata": { From df4fb186ea846c52d0847f2599665402cfddacef Mon Sep 17 00:00:00 2001 From: sangeetashivaji Date: Mon, 4 Aug 2025 17:07:29 -0400 Subject: [PATCH 02/16] Update core tags with agent_hostname --- postgres/changelog.d/20870.added | 1 + postgres/datadog_checks/postgres/postgres.py | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 postgres/changelog.d/20870.added diff --git a/postgres/changelog.d/20870.added b/postgres/changelog.d/20870.added new file mode 100644 index 0000000000000..2c17637271132 --- /dev/null +++ b/postgres/changelog.d/20870.added @@ -0,0 +1 @@ +[DBMON-5545] Update tags with agent host name. Added agent_hostname to the core tags to be able to inject it to all surfaces of the UI diff --git a/postgres/datadog_checks/postgres/postgres.py b/postgres/datadog_checks/postgres/postgres.py index db3c64493a716..79efc4ec11e35 100644 --- a/postgres/datadog_checks/postgres/postgres.py +++ b/postgres/datadog_checks/postgres/postgres.py @@ -185,6 +185,7 @@ def add_core_tags(self): """ self.tags.append("database_hostname:{}".format(self.database_hostname)) self.tags.append("database_instance:{}".format(self.database_identifier)) + self.tags.append("agent_hostname:{}".format(datadog_agent.get_hostname())) def set_resource_tags(self): if self.cloud_metadata.get("gcp") is not None: @@ -1005,10 +1006,7 @@ def _send_database_instance_metadata(self): "collection_interval": self._config.database_instance_collection_interval, 'dbms_version': payload_pg_version(self.version), 'integration_version': __version__, - "tags": [t for t in self._non_internal_tags if not t.startswith('db:')] + [ - f"agent_version:{datadog_agent.get_version()}", - f"agent_hostname:{datadog_agent.get_hostname()}", - ], + "tags": [t for t in self._non_internal_tags if not t.startswith('db:')], "timestamp": time() * 1000, "cloud_metadata": self.cloud_metadata, "metadata": { From 02d7e4682518857880387be43f5661bcca887621 Mon Sep 17 00:00:00 2001 From: sangeetashivaji Date: Wed, 6 Aug 2025 09:33:48 -0400 Subject: [PATCH 03/16] Update ddagenthostname for other integrations --- mysql/datadog_checks/mysql/mysql.py | 1 + postgres/datadog_checks/postgres/postgres.py | 2 +- sqlserver/datadog_checks/sqlserver/sqlserver.py | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mysql/datadog_checks/mysql/mysql.py b/mysql/datadog_checks/mysql/mysql.py index 181d6a9e1537b..136fef9d54e22 100644 --- a/mysql/datadog_checks/mysql/mysql.py +++ b/mysql/datadog_checks/mysql/mysql.py @@ -242,6 +242,7 @@ 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) + 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: diff --git a/postgres/datadog_checks/postgres/postgres.py b/postgres/datadog_checks/postgres/postgres.py index 79efc4ec11e35..75f07417b0965 100644 --- a/postgres/datadog_checks/postgres/postgres.py +++ b/postgres/datadog_checks/postgres/postgres.py @@ -185,7 +185,7 @@ def add_core_tags(self): """ self.tags.append("database_hostname:{}".format(self.database_hostname)) self.tags.append("database_instance:{}".format(self.database_identifier)) - self.tags.append("agent_hostname:{}".format(datadog_agent.get_hostname())) + self.tags.append("ddagenthostname:{}".format(datadog_agent.get_hostname())) def set_resource_tags(self): if self.cloud_metadata.get("gcp") is not None: diff --git a/sqlserver/datadog_checks/sqlserver/sqlserver.py b/sqlserver/datadog_checks/sqlserver/sqlserver.py index 8893a5f9b27f3..0c1ba4302c68c 100644 --- a/sqlserver/datadog_checks/sqlserver/sqlserver.py +++ b/sqlserver/datadog_checks/sqlserver/sqlserver.py @@ -235,6 +235,7 @@ 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) + 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: From 5a7da00687c161a415b5b0b4e16db844dc95721f Mon Sep 17 00:00:00 2001 From: sangeetashivaji Date: Wed, 6 Aug 2025 09:36:54 -0400 Subject: [PATCH 04/16] Update changelog --- mysql/changelog.d/20870.added | 1 + postgres/changelog.d/20870.added.1 | 1 + sqlserver/changelog.d/20870.added | 1 + 3 files changed, 3 insertions(+) create mode 100644 mysql/changelog.d/20870.added create mode 100644 postgres/changelog.d/20870.added.1 create mode 100644 sqlserver/changelog.d/20870.added diff --git a/mysql/changelog.d/20870.added b/mysql/changelog.d/20870.added new file mode 100644 index 0000000000000..22d2736852927 --- /dev/null +++ b/mysql/changelog.d/20870.added @@ -0,0 +1 @@ +[DBMON-5545] Update core tags with agent host name diff --git a/postgres/changelog.d/20870.added.1 b/postgres/changelog.d/20870.added.1 new file mode 100644 index 0000000000000..22d2736852927 --- /dev/null +++ b/postgres/changelog.d/20870.added.1 @@ -0,0 +1 @@ +[DBMON-5545] Update core tags with agent host name diff --git a/sqlserver/changelog.d/20870.added b/sqlserver/changelog.d/20870.added new file mode 100644 index 0000000000000..22d2736852927 --- /dev/null +++ b/sqlserver/changelog.d/20870.added @@ -0,0 +1 @@ +[DBMON-5545] Update core tags with agent host name From d32bd7a962c39dc1ea705275aafd09c01e38a46a Mon Sep 17 00:00:00 2001 From: sangeetashivaji Date: Wed, 6 Aug 2025 09:49:22 -0400 Subject: [PATCH 05/16] Update postgres ddagenthostname call --- mysql/changelog.d/20870.added.1 | 1 + postgres/changelog.d/20870.added.2 | 1 + postgres/datadog_checks/postgres/postgres.py | 2 +- sqlserver/changelog.d/20870.added.1 | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 mysql/changelog.d/20870.added.1 create mode 100644 postgres/changelog.d/20870.added.2 create mode 100644 sqlserver/changelog.d/20870.added.1 diff --git a/mysql/changelog.d/20870.added.1 b/mysql/changelog.d/20870.added.1 new file mode 100644 index 0000000000000..16c98318026de --- /dev/null +++ b/mysql/changelog.d/20870.added.1 @@ -0,0 +1 @@ +Update core tags with agent host name diff --git a/postgres/changelog.d/20870.added.2 b/postgres/changelog.d/20870.added.2 new file mode 100644 index 0000000000000..16c98318026de --- /dev/null +++ b/postgres/changelog.d/20870.added.2 @@ -0,0 +1 @@ +Update core tags with agent host name diff --git a/postgres/datadog_checks/postgres/postgres.py b/postgres/datadog_checks/postgres/postgres.py index 75f07417b0965..0503e6c6eef1b 100644 --- a/postgres/datadog_checks/postgres/postgres.py +++ b/postgres/datadog_checks/postgres/postgres.py @@ -185,7 +185,7 @@ def add_core_tags(self): """ self.tags.append("database_hostname:{}".format(self.database_hostname)) self.tags.append("database_instance:{}".format(self.database_identifier)) - self.tags.append("ddagenthostname:{}".format(datadog_agent.get_hostname())) + self.tags.append("ddagenthostname:{}".format(self._agent_hostname)) def set_resource_tags(self): if self.cloud_metadata.get("gcp") is not None: diff --git a/sqlserver/changelog.d/20870.added.1 b/sqlserver/changelog.d/20870.added.1 new file mode 100644 index 0000000000000..16c98318026de --- /dev/null +++ b/sqlserver/changelog.d/20870.added.1 @@ -0,0 +1 @@ +Update core tags with agent host name From b5cd85c58d199227cfb43a75f390e4d8381554e5 Mon Sep 17 00:00:00 2001 From: sangeetashivaji Date: Wed, 6 Aug 2025 09:52:28 -0400 Subject: [PATCH 06/16] Update change logs --- mysql/changelog.d/20870.added | 2 +- mysql/changelog.d/20870.added.1 | 1 - postgres/changelog.d/20870.added | 2 +- postgres/changelog.d/20870.added.1 | 1 - postgres/changelog.d/20870.added.2 | 1 - sqlserver/changelog.d/20870.added | 2 +- sqlserver/changelog.d/20870.added.1 | 1 - 7 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 mysql/changelog.d/20870.added.1 delete mode 100644 postgres/changelog.d/20870.added.1 delete mode 100644 postgres/changelog.d/20870.added.2 delete mode 100644 sqlserver/changelog.d/20870.added.1 diff --git a/mysql/changelog.d/20870.added b/mysql/changelog.d/20870.added index 22d2736852927..16c98318026de 100644 --- a/mysql/changelog.d/20870.added +++ b/mysql/changelog.d/20870.added @@ -1 +1 @@ -[DBMON-5545] Update core tags with agent host name +Update core tags with agent host name diff --git a/mysql/changelog.d/20870.added.1 b/mysql/changelog.d/20870.added.1 deleted file mode 100644 index 16c98318026de..0000000000000 --- a/mysql/changelog.d/20870.added.1 +++ /dev/null @@ -1 +0,0 @@ -Update core tags with agent host name diff --git a/postgres/changelog.d/20870.added b/postgres/changelog.d/20870.added index 2c17637271132..d6f0a8011eda0 100644 --- a/postgres/changelog.d/20870.added +++ b/postgres/changelog.d/20870.added @@ -1 +1 @@ -[DBMON-5545] Update tags with agent host name. Added agent_hostname to the core tags to be able to inject it to all surfaces of the UI +Update tags with agent host name. Added agent_hostname to the core tags to be able to inject it to all surfaces of the UI diff --git a/postgres/changelog.d/20870.added.1 b/postgres/changelog.d/20870.added.1 deleted file mode 100644 index 22d2736852927..0000000000000 --- a/postgres/changelog.d/20870.added.1 +++ /dev/null @@ -1 +0,0 @@ -[DBMON-5545] Update core tags with agent host name diff --git a/postgres/changelog.d/20870.added.2 b/postgres/changelog.d/20870.added.2 deleted file mode 100644 index 16c98318026de..0000000000000 --- a/postgres/changelog.d/20870.added.2 +++ /dev/null @@ -1 +0,0 @@ -Update core tags with agent host name diff --git a/sqlserver/changelog.d/20870.added b/sqlserver/changelog.d/20870.added index 22d2736852927..16c98318026de 100644 --- a/sqlserver/changelog.d/20870.added +++ b/sqlserver/changelog.d/20870.added @@ -1 +1 @@ -[DBMON-5545] Update core tags with agent host name +Update core tags with agent host name diff --git a/sqlserver/changelog.d/20870.added.1 b/sqlserver/changelog.d/20870.added.1 deleted file mode 100644 index 16c98318026de..0000000000000 --- a/sqlserver/changelog.d/20870.added.1 +++ /dev/null @@ -1 +0,0 @@ -Update core tags with agent host name From 6946305523b99c221da46666640306cfa790cdb5 Mon Sep 17 00:00:00 2001 From: sangeetashivaji Date: Wed, 6 Aug 2025 13:05:56 -0400 Subject: [PATCH 07/16] Update tests --- mysql/tests/test_statements.py | 2 ++ postgres/tests/common.py | 1 + postgres/tests/test_unit.py | 2 ++ sqlserver/tests/test_statements.py | 1 + sqlserver/tests/test_stored_procedures.py | 1 + 5 files changed, 7 insertions(+) diff --git a/mysql/tests/test_statements.py b/mysql/tests/test_statements.py index d83fb83d7790a..c423b62dc6d9b 100644 --- a/mysql/tests/test_statements.py +++ b/mysql/tests/test_statements.py @@ -879,6 +879,7 @@ 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()), @@ -896,6 +897,7 @@ 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/postgres/tests/common.py b/postgres/tests/common.py index da86e8258d712..deff721c61abb 100644 --- a/postgres/tests/common.py +++ b/postgres/tests/common.py @@ -160,6 +160,7 @@ 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_unit.py b/postgres/tests/test_unit.py index 8a56569a934f6..c52e43b59ca64 100644 --- a/postgres/tests/test_unit.py +++ b/postgres/tests/test_unit.py @@ -142,6 +142,7 @@ def test_query_timeout_connection_string(aggregator, integration_check, pg_insta 'port:5432', 'foo:bar', 'dd.internal.resource:database_instance:stubbed.hostname', + 'ddagenthostname:None', 'database_hostname:stubbed.hostname', 'database_instance:stubbed.hostname', }, @@ -154,6 +155,7 @@ def test_query_timeout_connection_string(aggregator, integration_check, pg_insta 'port:5432', 'server:localhost', 'dd.internal.resource:database_instance:stubbed.hostname', + 'ddagenthostname:None', 'database_hostname:stubbed.hostname', 'database_instance:stubbed.hostname', }, diff --git a/sqlserver/tests/test_statements.py b/sqlserver/tests/test_statements.py index 553df7b80b5c6..bf0001aba9727 100644 --- a/sqlserver/tests/test_statements.py +++ b/sqlserver/tests/test_statements.py @@ -912,6 +912,7 @@ def _expected_dbm_instance_tags(check): "database_hostname:{}".format("stubbed.hostname"), "database_instance:{}".format("stubbed.hostname"), "dd.internal.resource:database_instance:{}".format("stubbed.hostname"), + "ddagenthostname:{}".format("stubbed.hostname"), "sqlserver_servername:{}".format(check.static_info_cache.get(STATIC_INFO_SERVERNAME)), ] diff --git a/sqlserver/tests/test_stored_procedures.py b/sqlserver/tests/test_stored_procedures.py index d25b9a4218deb..d02acd1b8ba7c 100644 --- a/sqlserver/tests/test_stored_procedures.py +++ b/sqlserver/tests/test_stored_procedures.py @@ -44,6 +44,7 @@ def _expected_dbm_instance_tags(check): "database_hostname:{}".format("stubbed.hostname"), "database_instance:{}".format("stubbed.hostname"), "dd.internal.resource:database_instance:{}".format("stubbed.hostname"), + "ddagenthostname:{}".format("stubbed.hostname"), "sqlserver_servername:{}".format(check.static_info_cache.get(STATIC_INFO_SERVERNAME)), ] From f6b7697e81c94b2929536ed1ba4b93c433b5fc1a Mon Sep 17 00:00:00 2001 From: sangeetashivaji Date: Wed, 6 Aug 2025 13:35:37 -0400 Subject: [PATCH 08/16] Update mysql tests --- mysql/tests/test_mysql.py | 4 ++++ mysql/tests/test_query_activity.py | 2 ++ mysql/tests/test_unit.py | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/mysql/tests/test_mysql.py b/mysql/tests/test_mysql.py index f5e2473b34b8f..f46c0270d9ed9 100644 --- a/mysql/tests/test_mysql.py +++ b/mysql/tests/test_mysql.py @@ -134,6 +134,7 @@ 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'): @@ -457,6 +458,7 @@ 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(dd_default_hostname), ) aggregator.assert_service_check( 'mysql.can_connect', status=MySql.OK, tags=expected_tags, count=1, hostname=expected_hostname @@ -828,6 +830,7 @@ 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(expected_database_hostname), ) mysql_check = MySql(common.CHECK_NAME, {}, [instance_complex]) @@ -897,6 +900,7 @@ 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 index 46a16ee46aba1..a83d48f33ae88 100644 --- a/mysql/tests/test_query_activity.py +++ b/mysql/tests/test_query_activity.py @@ -121,6 +121,7 @@ def _run_blocking(conn): expected_tags = ( 'database_hostname:stubbed.hostname', 'database_instance:stubbed.hostname', + 'ddagenthostname:stubbed.hostname', 'tag1:value1', 'tag2:value2', 'port:13306', @@ -550,6 +551,7 @@ 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_unit.py b/mysql/tests/test_unit.py index 6d79aa8635843..e0058af459c48 100644 --- a/mysql/tests/test_unit.py +++ b/mysql/tests/test_unit.py @@ -309,6 +309,7 @@ def cursor(self): 'database_hostname:stubbed.hostname', 'database_instance:stubbed.hostname', 'dd.internal.resource:database_instance:stubbed.hostname', + 'ddagenthostname:stubbed.hostname', }, ), ( @@ -320,6 +321,7 @@ def cursor(self): 'database_hostname:stubbed.hostname', 'database_instance:stubbed.hostname', 'dd.internal.resource:database_instance:stubbed.hostname', + 'ddagenthostname:stubbed.hostname', }, ), ( @@ -330,6 +332,7 @@ def cursor(self): 'database_hostname:stubbed.hostname', 'database_instance:stubbed.hostname', 'dd.internal.resource:database_instance:stubbed.hostname', + 'ddagenthostname:stubbed.hostname', }, ), ( @@ -341,6 +344,7 @@ def cursor(self): 'database_hostname:stubbed.hostname', 'database_instance:stubbed.hostname', 'dd.internal.resource:database_instance:stubbed.hostname', + 'ddagenthostname:stubbed.hostname', }, ), ], From 2bb68396dc3d86844bb3e88955395fa94aaf9ede Mon Sep 17 00:00:00 2001 From: sangeetashivaji Date: Wed, 6 Aug 2025 13:41:59 -0400 Subject: [PATCH 09/16] Update mysql test --- mysql/tests/test_mysql.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/tests/test_mysql.py b/mysql/tests/test_mysql.py index f46c0270d9ed9..50813df5de021 100644 --- a/mysql/tests/test_mysql.py +++ b/mysql/tests/test_mysql.py @@ -458,7 +458,7 @@ 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(dd_default_hostname), + 'ddagenthostname:{}'.format(expected_hostname), ) aggregator.assert_service_check( 'mysql.can_connect', status=MySql.OK, tags=expected_tags, count=1, hostname=expected_hostname From efe38f3278fa2d67a305a75e0ccd0ae7ca6c998b Mon Sep 17 00:00:00 2001 From: sangeetashivaji Date: Wed, 6 Aug 2025 15:16:06 -0400 Subject: [PATCH 10/16] Update mysql tests --- mysql/tests/test_metadata.py | 1 + mysql/tests/test_mysql.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mysql/tests/test_metadata.py b/mysql/tests/test_metadata.py index fc7014f2418e0..8b78ec645e384 100644 --- a/mysql/tests/test_metadata.py +++ b/mysql/tests/test_metadata.py @@ -662,6 +662,7 @@ 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 index 50813df5de021..2efa1bded1ca0 100644 --- a/mysql/tests/test_mysql.py +++ b/mysql/tests/test_mysql.py @@ -88,7 +88,7 @@ def test_minimal_config(aggregator, dd_run_check, instance_basic): _test_operation_time_metrics(aggregator, operation_time_metrics, mysql_check.debug_stats_kwargs()['tags']) - aggregator.assert_all_metrics_covered() + aggregator.assert_all_metricdatabase_instances_covered() aggregator.assert_metrics_using_metadata( get_metadata_metrics(), check_submission_type=True, exclude=[variables.OPERATION_TIME_METRIC_NAME] ) @@ -134,7 +134,7 @@ 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}', + f'ddagenthostname:{"stubbed.hostname"}', 'dbms_flavor:{}'.format(MYSQL_FLAVOR.lower()), ) if MYSQL_FLAVOR in ('mysql', 'percona'): @@ -458,7 +458,7 @@ 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(expected_hostname), + 'ddagenthostname:{}'.format('stubbed.hostname'), ) aggregator.assert_service_check( 'mysql.can_connect', status=MySql.OK, tags=expected_tags, count=1, hostname=expected_hostname @@ -830,7 +830,7 @@ 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(expected_database_hostname), + 'ddagenthostname:{}'.format('stubbed.hostname'), ) mysql_check = MySql(common.CHECK_NAME, {}, [instance_complex]) From 7263d5f9a07b689c7275b614f360c99eb993012e Mon Sep 17 00:00:00 2001 From: sangeetashivaji Date: Wed, 6 Aug 2025 15:18:38 -0400 Subject: [PATCH 11/16] Update sql --- mysql/tests/test_mysql.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/tests/test_mysql.py b/mysql/tests/test_mysql.py index 2efa1bded1ca0..758a5a98bb2f4 100644 --- a/mysql/tests/test_mysql.py +++ b/mysql/tests/test_mysql.py @@ -88,7 +88,7 @@ def test_minimal_config(aggregator, dd_run_check, instance_basic): _test_operation_time_metrics(aggregator, operation_time_metrics, mysql_check.debug_stats_kwargs()['tags']) - aggregator.assert_all_metricdatabase_instances_covered() + aggregator.assert_all_metrics_covered() aggregator.assert_metrics_using_metadata( get_metadata_metrics(), check_submission_type=True, exclude=[variables.OPERATION_TIME_METRIC_NAME] ) From eec67858cfc85d5efff3ed8e3520503f597f8c72 Mon Sep 17 00:00:00 2001 From: sangeetashivaji Date: Wed, 6 Aug 2025 15:25:12 -0400 Subject: [PATCH 12/16] Update mysql tests --- mysql/tests/tags.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql/tests/tags.py b/mysql/tests/tags.py index 18c74b1072c41..23bee8b480237 100644 --- a/mysql/tests/tags.py +++ b/mysql/tests/tags.py @@ -9,6 +9,7 @@ def database_instance_resource_tags(hostname): f'dd.internal.resource:database_instance:{hostname}', f'database_hostname:{hostname}', f'database_instance:{hostname}', + f'ddagenthostname:{"stubbed.hostname"}', ) From 8a724bf4722496f5768586b873bd19ae55742769 Mon Sep 17 00:00:00 2001 From: sangeetashivaji Date: Wed, 6 Aug 2025 15:26:15 -0400 Subject: [PATCH 13/16] Update mysql tests --- mysql/tests/tags.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql/tests/tags.py b/mysql/tests/tags.py index 23bee8b480237..28badba745cdf 100644 --- a/mysql/tests/tags.py +++ b/mysql/tests/tags.py @@ -36,6 +36,7 @@ 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', From 56711c338f7446b9ff51d4783838f189f047b6db Mon Sep 17 00:00:00 2001 From: sangeetashivaji Date: Wed, 6 Aug 2025 16:16:52 -0400 Subject: [PATCH 14/16] Update mysql --- mysql/tests/tags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/tests/tags.py b/mysql/tests/tags.py index 28badba745cdf..ad78549a9a207 100644 --- a/mysql/tests/tags.py +++ b/mysql/tests/tags.py @@ -9,7 +9,7 @@ def database_instance_resource_tags(hostname): f'dd.internal.resource:database_instance:{hostname}', f'database_hostname:{hostname}', f'database_instance:{hostname}', - f'ddagenthostname:{"stubbed.hostname"}', + f'ddagenthostname:{hostname}', ) From dc650aa9c601329c00bef75c5af890978c5d81eb Mon Sep 17 00:00:00 2001 From: sangeetashivaji Date: Wed, 6 Aug 2025 16:53:36 -0400 Subject: [PATCH 15/16] Update --- postgres/datadog_checks/postgres/postgres.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgres/datadog_checks/postgres/postgres.py b/postgres/datadog_checks/postgres/postgres.py index 0503e6c6eef1b..d057cbfc72251 100644 --- a/postgres/datadog_checks/postgres/postgres.py +++ b/postgres/datadog_checks/postgres/postgres.py @@ -185,7 +185,7 @@ def add_core_tags(self): """ self.tags.append("database_hostname:{}".format(self.database_hostname)) self.tags.append("database_instance:{}".format(self.database_identifier)) - self.tags.append("ddagenthostname:{}".format(self._agent_hostname)) + self.tags.append("ddagenthostname:{}".format(self.agent_hostname)) def set_resource_tags(self): if self.cloud_metadata.get("gcp") is not None: From dbd93e2b589cfff4f9e631713dd77da9e8dc6cd1 Mon Sep 17 00:00:00 2001 From: sangeetashivaji Date: Wed, 6 Aug 2025 17:03:10 -0400 Subject: [PATCH 16/16] Update postgresql tests --- postgres/tests/test_pg_integration.py | 1 + postgres/tests/test_unit.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/postgres/tests/test_pg_integration.py b/postgres/tests/test_pg_integration.py index fbf4ee821b8cb..a1bd70720e34e 100644 --- a/postgres/tests/test_pg_integration.py +++ b/postgres/tests/test_pg_integration.py @@ -772,6 +772,7 @@ 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('stubbed.hostname'), ] check = PostgreSql('test_instance', {}, [pg_instance]) run_one_check(check) diff --git a/postgres/tests/test_unit.py b/postgres/tests/test_unit.py index c52e43b59ca64..aa1d5c9af3ae9 100644 --- a/postgres/tests/test_unit.py +++ b/postgres/tests/test_unit.py @@ -142,7 +142,7 @@ def test_query_timeout_connection_string(aggregator, integration_check, pg_insta 'port:5432', 'foo:bar', 'dd.internal.resource:database_instance:stubbed.hostname', - 'ddagenthostname:None', + 'ddagenthostname:stubbed.hostname', 'database_hostname:stubbed.hostname', 'database_instance:stubbed.hostname', }, @@ -155,7 +155,7 @@ def test_query_timeout_connection_string(aggregator, integration_check, pg_insta 'port:5432', 'server:localhost', 'dd.internal.resource:database_instance:stubbed.hostname', - 'ddagenthostname:None', + 'ddagenthostname:stubbed.hostname', 'database_hostname:stubbed.hostname', 'database_instance:stubbed.hostname', },