SQL Server: recover DBM<>APM correlation comment for non-procedure statements

[pierreln-dd]

What does this PR do?

Fixes a bug in the SQL Server check's activity and query metrics collection where a DBM<>APM correlation comment (for example, a sqlcommenter-style /*dddbs=...*/ tag) prepended to a query is silently dropped for ordinary non-stored-procedure statements, breaking the "Calling Service" correlation panel.

SQL Server's statement_start_offset/statement_end_offset DMV mechanics exclude the RPC parameter declaration and any leading comment from statement_text. The untouched batch text (row['text']) retains both, but the integration only re-obfuscated that text for stored-procedure context. This PR also inspects differing full text for ordinary statements and merges its comments. Procedure signatures, content, and names remain gated behind the existing procedure context.

The Activity and Query Metrics unit tests reproduce the observed RPC shape, (@P1 int)/*dddbs=...*/ SELECT ..., and assert that the correlation comment is recovered without adding procedure metadata.

Motivation

Confirmed via direct reproduction with a real SQL Server engine, both a raw ad-hoc query and the actual dd-trace-go v2 SDK, that this affects DBM<>APM correlation for SQL Server universally, not just OpenTelemetry-instrumented clients as originally reported. See SDBM-2891.

Review checklist (to be filled by reviewers)

• Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
• Add qa/required if this PR needs QA validation, or qa/skip-qa if it does not. Exactly one of the two is required.
• If you need to backport this PR to another branch, you can add the backport/<branch-name> label to the PR and it will automatically open a backport PR once this one is merged

[cit-pr-commenter-54b7da]

evalya-impact-summary

evalya impact analysis

Impact analysis: 0 selected, 0 skipped (of 0 test tasks)
Publish tasks:   1 (always emitted)
Diff (5 files):
  sqlserver/changelog.d/24899.fixed
  sqlserver/datadog_checks/sqlserver/activity.py
  sqlserver/datadog_checks/sqlserver/statements.py
  sqlserver/tests/test_activity.py
  sqlserver/tests/test_statements.py

Debug a specific task: evalya plan impact --path <path> --task <task>

Learn more about CI impact filtering

[datadog-prod-us1-6]

 

🎉 All green!

🧪 All tests passed
❄️ No new flaky tests detected

🎯 Code Coverage (details)
• Patch Coverage: 91.78%
• Overall Coverage: 90.84% (+2.26%)

_{This comment will be updated automatically if new data arrives.
🔗 Commit SHA: 00d3676 | Docs | View more details | Give us feedback!}

[dd-octo-sts]

Validation Report

All 21 validations passed.

Show details

Validation	Description	Status
agent-reqs	Verify check versions match the Agent requirements file	✅
ci	Validate CI configuration and code coverage settings	✅
codeowners	Validate every integration has a CODEOWNERS entry	✅
config	Validate default configuration files against spec.yaml	✅
dep	Verify dependency pins are consistent and Agent-compatible	✅
http	Validate integrations use the HTTP wrapper correctly	✅
imports	Validate check imports do not use deprecated modules	✅
integration-style	Validate check code style conventions	✅
jmx-metrics	Validate JMX metrics definition files and config	✅
labeler	Validate PR labeler config matches integration directories	✅
legacy-signature	Validate no integration uses the legacy Agent check signature	✅
license-headers	Validate Python files have proper license headers	✅
licenses	Validate third-party license attribution list	✅
metadata	Validate metadata.csv metric definitions	✅
models	Validate configuration data models match spec.yaml	✅
openmetrics	Validate OpenMetrics integrations disable the metric limit	✅
package	Validate Python package metadata and naming	✅
qa-label	Validate the pull request declares whether it needs QA for the next Agent release	✅
readmes	Validate README files have required sections	✅
saved-views	Validate saved view JSON file structure and fields	✅
version	Validate version consistency between package and changelog	✅

View full run