[sqlserver] Enable schema collection for database features

sqlserver/assets/configuration/spec.yaml

@@ -1103,7 +1103,8 @@ files:
       options:
         - name: enabled
           description: |
-            Enable schema collection. Requires `dbm: true`. Defaults to false.
+            Enable schema collection. Requires either `dbm: true` or `data_observability.enabled: true`.
+            Defaults to false.
           value:
             type: boolean
             example: false
@@ -1144,7 +1145,8 @@ files:
       options:
         - name: enabled
           description: |
-            Enable schema collection. Requires `dbm: true`. Defaults to false.
+            Enable schema collection. Requires either `dbm: true` or `data_observability.enabled: true`.
+            Defaults to false.
           value:
             type: boolean
             example: false

sqlserver/changelog.d/24946.fixed

@@ -0,0 +1 @@
+Allow schema collection when Data Observability is enabled.

sqlserver/datadog_checks/sqlserver/data/conf.yaml.example

@@ -798,7 +798,8 @@ instances:
     # collect_schemas:
 
         ## @param enabled - boolean - optional - default: false
-        ## Enable schema collection. Requires `dbm: true`. Defaults to false.
+        ## Enable schema collection. Requires either `dbm: true` or `data_observability.enabled: true`.
+        ## Defaults to false.
         #
         # enabled: false
 
@@ -837,7 +838,8 @@ instances:
     # schemas_collection:
 
         ## @param enabled - boolean - optional - default: false
-        ## Enable schema collection. Requires `dbm: true`. Defaults to false.
+        ## Enable schema collection. Requires either `dbm: true` or `data_observability.enabled: true`.
+        ## Defaults to false.
         #
         # enabled: false
 

sqlserver/datadog_checks/sqlserver/sqlserver.py

@@ -910,7 +910,6 @@ def check(self, _):
                 self.statement_metrics.run_job_loop(self.tag_manager.get_tags())
                 self.procedure_metrics.run_job_loop(self.tag_manager.get_tags())
                 self.activity.run_job_loop(self.tag_manager.get_tags())
-                self.sql_metadata.run_job_loop(self.tag_manager.get_tags())
                 self.deadlocks.run_job_loop(self.tag_manager.get_tags())
 
                 # Run XE session handlers
@@ -920,6 +919,9 @@ def check(self, _):
                     except Exception as e:
                         self.log.error("Error running XE session handler for %s: %s", handler.session_name, e)
 
+            if self._config.dbm_enabled or self._config.data_observability.enabled:
+                self.sql_metadata.run_job_loop(self.tag_manager.get_tags())
+
             if self._config.data_observability.enabled:
                 self.data_observability.run_job_loop(self.tag_manager.get_tags())
 

sqlserver/tests/test_data_observability.py

@@ -118,6 +118,25 @@ def _create_check(instance):
     return check
 
 
+def test_data_observability_schedules_schema_collection():
+    instance = _make_do_instance(
+        queries=[],
+        extra={'collect_schemas': {'enabled': True}},
+    )
+    check = _create_check(instance)
+    check._submit_initialization_health_event = MagicMock()
+    check.load_static_information = MagicMock()
+    check._query_manager = MagicMock()
+    check._send_database_instance_metadata = MagicMock()
+    check.collect_metrics = MagicMock()
+    check.sql_metadata.run_job_loop = MagicMock()
+    check.data_observability.run_job_loop = MagicMock()
+
+    check.check(instance)
+
+    check.sql_metadata.run_job_loop.assert_called_once_with(check.tag_manager.get_tags())
+
+
 def _setup_and_run(instance=None, queries=None, mock_cursor=None):
     if instance is None:
         instance = _make_do_instance(queries=queries)