Fixes

Author: edengorevoy

sqlserver/datadog_checks/sqlserver/sqlserver.py

@@ -833,12 +833,12 @@ def check(self, _):
                 self._query_manager.compile_queries()
 
             self._send_database_instance_metadata()
-            
+
             if self._config.proc:
                 self.do_stored_procedure_check()
             else:
                 self.collect_metrics()
-            
+
             self.log.error("[EG] I am right here!!!! blub")
             if self._config.autodiscovery and self._config.autodiscovery_db_service_check:
                 self._check_database_conns()
@@ -976,14 +976,13 @@ def load_basic_metrics(self, cursor):
                     else:
                         metric.fetch_metric(rows, cols)
 
-
     def collect_metrics(self):
         """Fetch the metrics from all the associated database tables."""
         with self.connection.open_managed_default_connection():
             if not self._config.only_custom_queries:
                 with self.connection.get_managed_cursor() as cursor:
                     self.load_basic_metrics(cursor)
-            
+
             # Neither pyodbc nor adodbapi are able to read results of a query if the number of rows affected
             # statement are returned as part of the result set, so we disable for the entire connection
             # this is important mostly for custom_queries or the stored_procedure feature
@@ -999,7 +998,7 @@ def collect_metrics(self):
                             for database_metric in self.database_metrics:
                                 database_metric.execute()
 
-                # reuse the connection for custom queries 
+                # reuse the connection for custom queries
                 self._query_manager.execute()
             finally:
                 with self.connection.get_managed_cursor() as cursor:

sqlserver/tests/test_integration.py

@@ -4,7 +4,6 @@
 import logging
 import re
 from copy import copy, deepcopy
-from tkinter.constants import TRUE
 
 import mock
 import pytest
@@ -507,6 +506,34 @@ def test_custom_queries(aggregator, dd_run_check, instance_docker, custom_query,
         aggregator.assert_metric(metric_name, **kwargs)
 
 
+@pytest.mark.integration
+@pytest.mark.usefixtures('dd_environment')
+@pytest.mark.parametrize(
+    "custom_query, assert_metrics",
+    [
+        (
+            {
+                'query': "SELECT letter, num FROM (VALUES (97, 'a'), (98, 'b')) AS t (num,letter)",
+                'columns': [{'name': 'customtag', 'type': 'tag'}, {'name': 'num', 'type': 'gauge'}],
+                'tags': ['query:custom'],
+            },
+            [
+                ("sqlserver.num", {"value": 97, "tags": ["customtag:a", "query:custom"]}),
+                ("sqlserver.num", {"value": 98, "tags": ["customtag:b", "query:custom"]}),
+            ],
+        ),
+        (
+            {
+                'query': "EXEC exampleProcWithoutNocount",
+                'columns': [{'name': 'value', 'type': 'gauge'}],
+                'tags': ['hello:there'],
+            },
+            [
+                ("sqlserver.value", {"value": 1, "tags": ["hello:there"]}),
+            ],
+        ),
+    ],
+)
 def test_custom_queries_only(aggregator, dd_run_check, instance_docker, custom_query, assert_metrics):
     instance = copy(instance_docker)
     instance['custom_queries'] = [custom_query]
@@ -531,6 +558,7 @@ def test_custom_queries_only(aggregator, dd_run_check, instance_docker, custom_q
         )
         aggregator.assert_metric(metric_name, **kwargs)
 
+
 @pytest.mark.integration
 @pytest.mark.usefixtures('dd_environment')
 def test_load_static_information(aggregator, dd_run_check, instance_docker):