[sqlserver] send database_instance metadata before collecting metrics (#17675)

Author: eric-weaver

sqlserver/changelog.d/17675.fixed

@@ -0,0 +1,2 @@
+Emit database_instance metadata before collecting metrics
+Decreased database instance collection interval from 1800 seconds to 300 seconds to improve reliability

sqlserver/datadog_checks/sqlserver/config.py

@@ -98,7 +98,7 @@ def __init__(self, init_config, instance, log):
         )
         self.log_unobfuscated_queries: bool = is_affirmative(instance.get('log_unobfuscated_queries', False))
         self.log_unobfuscated_plans: bool = is_affirmative(instance.get('log_unobfuscated_plans', False))
-        self.database_instance_collection_interval: int = instance.get('database_instance_collection_interval', 1800)
+        self.database_instance_collection_interval: int = instance.get('database_instance_collection_interval', 300)
         self.stored_procedure_characters_limit: int = instance.get('stored_procedure_characters_limit', PROC_CHAR_LIMIT)
         self.connection_host: str = instance['host']
 

sqlserver/datadog_checks/sqlserver/sqlserver.py

@@ -747,13 +747,14 @@ def check(self, _):
                     [QUERY_SERVER_STATIC_INFO], executor=self.execute_query_raw
                 )
                 self.server_state_queries.compile_queries()
+
+            self._send_database_instance_metadata()
             if self._config.proc:
                 self.do_stored_procedure_check()
             else:
                 self.collect_metrics()
             if self._config.autodiscovery and self._config.autodiscovery_db_service_check:
                 self._check_database_conns()
-            self._send_database_instance_metadata()
             if self._config.dbm_enabled:
                 self.statement_metrics.run_job_loop(self.tags)
                 self.procedure_metrics.run_job_loop(self.tags)

sqlserver/tests/test_integration.py

@@ -758,7 +758,7 @@ def test_database_instance_metadata(aggregator, dd_run_check, instance_docker, d
     assert event['dbms'] == "sqlserver"
     assert event['tags'] == ['optional:tag1']
     assert event['integration_version'] == __version__
-    assert event['collection_interval'] == 1800
+    assert event['collection_interval'] == 300
     assert event['metadata'] == {
         'dbm': dbm_enabled,
         'connection_host': instance_docker['host'],