Add SQLSever 2025 to CI (DataDog#22794)

* always emit session_id as integer

* Add SQLSever 2025 to CI

* Hatch

* Validate

* Hatch

* Validate

* Image

* add 60 sec lookback window

* move lookback window seting to specific failing test only

* Add -C flag to sqlcmd in sqlserver-entrypoint.ps1

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* make test less flaky by relaxing lower bound

* linter

---------

Co-authored-by: Allen Zhou <allen.zhou@datadoghq.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: 3 people

.github/workflows/test-all-windows.yml

@@ -362,9 +362,23 @@ jobs:
       agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
       test-py2: ${{ inputs.test-py2 }}
       test-py3: ${{ inputs.test-py3 }}
+      target-env: ${{ matrix.target-env }}
       minimum-base-package: ${{ inputs.minimum-base-package }}
       pytest-args: ${{ inputs.pytest-args }}
     secrets: inherit
+    strategy:
+      matrix:
+        target-env:
+        - py3.13-windows-SQLOLEDB-2019-single
+        - py3.13-windows-SQLOLEDB-2022-single
+        - py3.13-windows-SQLOLEDB-2025-single
+        - py3.13-windows-MSOLEDBSQL-2019-single
+        - py3.13-windows-MSOLEDBSQL-2022-single
+        - py3.13-windows-MSOLEDBSQL-2025-single
+        - py3.13-windows-odbc-2019-single
+        - py3.13-windows-odbc-2022-single
+        - py3.13-windows-odbc-2025-single
+      fail-fast: false
   j87dbe3f:
     uses: ./.github/workflows/test-target.yml
     with:

.github/workflows/test-all.yml

@@ -3638,10 +3638,14 @@ jobs:
         - py3.13-linux-FreeTDS-2019-ha
         - py3.13-linux-FreeTDS-2022-single
         - py3.13-linux-FreeTDS-2022-ha
+        - py3.13-linux-FreeTDS-2025-single
+        - py3.13-linux-FreeTDS-2025-ha
         - py3.13-linux-odbc-2019-single
         - py3.13-linux-odbc-2019-ha
         - py3.13-linux-odbc-2022-single
         - py3.13-linux-odbc-2022-ha
+        - py3.13-linux-odbc-2025-single
+        - py3.13-linux-odbc-2025-ha
         - py3.13-linux-2022-newyork
         - py3.13-linux-2022-tokyo
       fail-fast: false

sqlserver/hatch.toml

@@ -5,7 +5,7 @@ base-package-features = ["deps", "db", "json"]
 python = ["3.13"]
 os = ["linux"]
 driver = ["FreeTDS", "odbc"]
-version = ["2019", "2022"]
+version = ["2019", "2022", "2025"]
 setup = ["single", "ha"]
 
 # test the compatibility of sqlserver running on non-utc timezone
@@ -23,7 +23,7 @@ tz = ["newyork", "tokyo"]
 python = ["3.13"]
 os = ["windows"]
 driver = ["SQLOLEDB", "MSOLEDBSQL", "odbc"]
-version = ["2019", "2022"]
+version = ["2019", "2022", "2025"]
 setup = ["single"]
 
 # The high cardinality environment is meant to be used for local dev/testing
@@ -60,6 +60,7 @@ matrix.version.env-vars = [
   { key = "SQLSERVER_YEAR" },
   { key = "SQLSERVER_ENGINE_EDITION", value = "express" },
   # Map years to major versions
+  { key = "SQLSERVER_MAJOR_VERSION", value="17", if = ["2025"] },
   { key = "SQLSERVER_MAJOR_VERSION", value="16", if = ["2022"] },
   { key = "SQLSERVER_MAJOR_VERSION", value="15", if = ["2019"] },
   { key = "SQLSERVER_MAJOR_VERSION", value="14", if = ["2017"] },
@@ -68,6 +69,7 @@ matrix.version.env-vars = [
   { key = "SQLSERVER_IMAGE_TAG", value = "2017-CU31-GDR2-ubuntu-18.04", if = ["2017"], platform = ["linux"] },
   { key = "SQLSERVER_IMAGE_TAG", value = "2019-CU28-GDR1-ubuntu-20.04", if = ["2019"], platform = ["linux"] },
   { key = "SQLSERVER_IMAGE_TAG", value = "2022-CU12-GDR1-ubuntu-20.04", if = ["2022"], platform = ["linux"] },
+  { key = "SQLSERVER_IMAGE_TAG", value = "2025-CU2-ubuntu-24.04", if = ["2025"], platform = ["linux"] },
   { key = "SQLSERVER_BASE_IMAGE", value = "datadog/docker-library:sqlserver_{matrix:version}", platform = ["windows"] },
 ]
 matrix.driver.env-vars = [
@@ -80,4 +82,5 @@ matrix.tz.env-vars = [
 ]
 name.linux-odbc-2019-high-cardinality.env-vars = "COMPOSE_FOLDER=compose-high-cardinality"
 name.linux-odbc-2022-high-cardinality.env-vars = "COMPOSE_FOLDER=compose-high-cardinality"
+name.linux-odbc-2025-high-cardinality.env-vars = "COMPOSE_FOLDER=compose-high-cardinality"
 name.windows-odbc-2019-high-cardinality.env-vars = "COMPOSE_FOLDER=compose-high-cardinality-windows"

sqlserver/tests/compose-windows/sqlserver-entrypoint.ps1

@@ -17,7 +17,7 @@ $smo.Settings.LoginMode = "Mixed"
 $smo.Alter()
 
 echo "INFO: running setup.sql for integration tests"
-sqlcmd -d master -i setup.sql -b -f 65001
+sqlcmd -d master -i setup.sql -b -f 65001 -C
 if (-Not $?) {
     throw "ERROR: setup.sql failed"
 }

sqlserver/tests/test_activity.py

@@ -875,10 +875,11 @@ def test_activity_collection_rate_limit(aggregator, dd_run_check, dbm_instance):
     dd_run_check(check)
     sleep_time = 1
     time.sleep(sleep_time)
-    max_collections = int(1 / collection_interval * sleep_time) + 1
+    max_collections = int(sleep_time / collection_interval) + 1
+    min_collections = sleep_time  # at minimum, one collection per second
     check.cancel()
     metrics = aggregator.metrics("dd.sqlserver.activity.collect_activity.payload_size")
-    assert max_collections / 2.0 <= len(metrics) <= max_collections
+    assert min_collections <= len(metrics) <= max_collections
 
 
 def _load_test_activity_json(filename):

sqlserver/tests/test_statements.py

@@ -596,6 +596,10 @@ def test_statement_metrics_limit(
 def test_statement_metadata(
     aggregator, dd_run_check, dbm_instance, bob_conn, datadog_agent, metadata, expected_metadata_payload
 ):
+    # The near-zero collection_interval produces a ~1s lookback window (math.ceil(~0 * 2) = 1).
+    # Set an explicit lookback_window so the test query isn't missed when the check's preliminary
+    # steps take longer than 1 second (e.g. on SQL Server 2025).
+    dbm_instance['query_metrics']['lookback_window'] = 60
     check = SQLServer(CHECK_NAME, {}, [dbm_instance])
 
     query = "select * from sys.databases /* service='datadog-agent' */"