Stop using `Tracer.Instance` if we don't need to #7744

andrewlock · 2025-10-30T17:41:59Z

Summary of changes

Updates a couple of places where we're calling Tracer.Instance where we don't need to

Reason for change

In one of my other PRs I accidentally broke something that should only have affected integration tests, but a bunch of unit tests broke. It highlighted where they were using Tracer.Instance and setting the global tracer for tests. In other places, it revealed that code that tests that looked independent of other tests really wasn't...

Calling Tracer.Instance potentially does a lot of work, as it initializes the tracer. It's also hard to follow if we're making static calls out in places we don't need to. So just pass through the settings we want instead.

Implementation details

Instead of calling Tracer.Instance.Settings, use the value of Tracer or TracerSettings that's already available wherever possible. It makes the tests cleaner too.

Test coverage

Same coverage, just a bit cleaner

Other details

Included as part of the config stack, just because I already refactored some of this code, and can't be bothered to faff with merge conflicts:

https://datadoghq.atlassian.net/browse/LANGPLAT-819

andrewlock · 2025-10-30T17:43:40Z

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/DbScopeFactory.cs

                CommandType = typeof(TCommand);

-                if (TryGetIntegrationDetails(CommandType.FullName, out var integrationId, out var dbTypeName))
+                if (TryGetIntegrationDetails(Tracer.Instance.Settings.DisabledAdoNetCommandTypes, CommandType.FullName, out var integrationId, out var dbTypeName))


This one is actually kind of annoying. As it's in a static cctor, we can't pass it in anywhere, which means there's one DbScopeFactoryTests test which will use this and end up initializing the global tracer. Oh well.

:sorry: pretty sure this was me

Hmm. I understand that we want to minimize work but I feel like we should calculate all DbCommands regardless of config (i.e. no dependency here) and then we do the config check on the hot path, which allows this setting to be hot-reloadable or "config at runtime" ready

Concretely, I'm suggesting that we remove the TryGetIntegrationDetails call in the static constructor of Cache<TCommand> and refactor the other call in CreateDbCommandScope a bit. Perhaps in a separate PR

I can see arguments both ways tbh.

The only downside to @zacharycmontoya's proposal would be more work to do for custom DbCommands (ones that we don't explicitly know about), which are also marked as disabled initially, and which customers have marked as disabled. The question I would have is whether that's ok - e.g. if they're disabled because we're erroring out literally running TryGetIntegrationDetails, and that's why they disabled it, then that could be a problem. If it's just an optimization, then yes, it probably is fine.

That said, this actually is technically already hot-reloadable. The DisabledAdoNetCommandTypes setting passed in here is used to decide whether to populate the cache for custom types, but if we don't populate the cache, then we run TryGetIntegrationDetails() and check DisabledAdoNetCommandTypes at runtime anyway. So if this changes, then the result changes, it will just never be cached in that scenario.

So on that basis, I think removing the TryGetIntegrationDetails has a small amount of risk (if customer disabled adonet due to errors - not sure if that's really possible, but I can believe it), means a small bit more work (calculating values which will never be used), and doesn't change how hot-reloadable we are in general (though if we made it hot reloadable, we'd have to rethink how caching works). The plus side is it removes the static access to Tracer.Instance which is better for tests.

So yeah, I'm torn 🤷‍♂️ I'd say separate PR either way, given the questions, as the current behaviour in this PR is identical to the existing. But it's worth thinking about

datadog-datadog-prod-us1 · 2025-10-30T18:31:23Z

⚠️ Tests

⚠️ Warnings

🧪 128 Tests failed

SubmitsOtlpMetrics from Datadog.Trace.ClrProfiler.IntegrationTests.OpenTelemetrySdkTests (Datadog)

Results do not match.
Differences:
Received: OpenTelemetrySdkTests.SubmitsOtlpMetrics.received.txt
Verified: OpenTelemetrySdkTests.SubmitsOtlpMetrics.verified.txt
Compare Result:
  [
    {
      "resource_metrics": [
        {
          "resource": {
...

SubmitsOtlpMetrics from Datadog.Trace.ClrProfiler.IntegrationTests.OpenTelemetrySdkTests (Datadog)

Results do not match.
Differences:
Received: OpenTelemetrySdkTests.SubmitsOtlpMetrics_up_to_1_7_0.NET_7_8.received.txt
Verified: OpenTelemetrySdkTests.SubmitsOtlpMetrics_up_to_1_7_0.NET_7_8.verified.txt
Compare Result:
  [
    {
      "resource_metrics": [
        {
          "resource": {
...

❄️ Known flaky: SubmitsOtlpMetrics from Datadog.Trace.ClrProfiler.IntegrationTests.OpenTelemetrySdkTests (Datadog)

Results do not match.
Differences:
Received: OpenTelemetrySdkTests.SubmitsOtlpMetrics.received.txt
Verified: OpenTelemetrySdkTests.SubmitsOtlpMetrics.verified.txt
Compare Result:
  [
    {
      "resource_metrics": [
        {
          "resource": {
...

View all

ℹ️ Info

❄️ No new flaky tests detected

_{This comment will be updated automatically if new data arrives.

🔗 Commit SHA: 8a3aee6 | Docs | Datadog PR Page | Was this helpful? Give us feedback!}

bouwkast · 2025-10-30T18:43:51Z

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/DbScopeFactory.cs

                CommandType = typeof(TCommand);

-                if (TryGetIntegrationDetails(CommandType.FullName, out var integrationId, out var dbTypeName))
+                if (TryGetIntegrationDetails(Tracer.Instance.Settings.DisabledAdoNetCommandTypes, CommandType.FullName, out var integrationId, out var dbTypeName))


:sorry: pretty sure this was me

bouwkast · 2025-10-30T18:44:40Z

tracer/test/Datadog.Trace.Tests/DataStreamsMonitoring/DataStreamsContextPropagatorTests.cs

-        [Fact]
-        public void CanRoundTripPathwayContext()
+        [Theory]
+        [CombinatorialData]


dd-trace-dotnet-ci-bot · 2025-10-30T19:08:38Z

Execution-Time Benchmarks Report ⏱️

Execution-time results for samples comparing the following branches/commits:

Execution-time benchmarks measure the whole time it takes to execute a program. And are intended to measure the one-off costs. Cases where the execution time results for the PR are worse than latest master results are shown in red. The following thresholds were used for comparing the execution times:

Welch test with statistical test for significance of 5%
Only results indicating a difference greater than 5% and 5 ms are considered.

Note that these results are based on a single point-in-time result for each branch. For full results, see the dashboard.

Graphs show the p99 interval based on the mean and StdDev of the test run, as well as the mean value of the run (shown as a diamond below the graph).

gantt
    title Execution time (ms) FakeDbCommand (.NET Framework 4.8) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Bailout
    This PR (7744) - mean (83ms)  : 75, 90
     .   : milestone, 83,
    master - mean (80ms)  : 77, 83
     .   : milestone, 80,

    section Baseline
    This PR (7744) - mean (78ms)  : 72, 83
     .   : milestone, 78,
    master - mean (75ms)  : 71, 79
     .   : milestone, 75,

    section CallTarget+Inlining+NGEN
    This PR (7744) - mean (1,195ms)  : crit, 1144, 1246
     .   : crit, milestone, 1195,
    master - mean (1,099ms)  : 1039, 1160
     .   : milestone, 1099,

gantt
    title Execution time (ms) FakeDbCommand (.NET Core 3.1) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Bailout
    This PR (7744) - mean (118ms)  : 114, 122
     .   : milestone, 118,
    master - mean (118ms)  : 115, 122
     .   : milestone, 118,

    section Baseline
    This PR (7744) - mean (116ms)  : 111, 121
     .   : milestone, 116,
    master - mean (117ms)  : 112, 121
     .   : milestone, 117,

    section CallTarget+Inlining+NGEN
    This PR (7744) - mean (899ms)  : crit, 857, 942
     .   : crit, milestone, 899,
    master - mean (798ms)  : 773, 823
     .   : milestone, 798,

gantt
    title Execution time (ms) FakeDbCommand (.NET 6) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Bailout
    This PR (7744) - mean (104ms)  : 100, 107
     .   : milestone, 104,
    master - mean (105ms)  : 101, 109
     .   : milestone, 105,

    section Baseline
    This PR (7744) - mean (103ms)  : 99, 106
     .   : milestone, 103,
    master - mean (104ms)  : 101, 107
     .   : milestone, 104,

    section CallTarget+Inlining+NGEN
    This PR (7744) - mean (786ms)  : 723, 849
     .   : milestone, 786,
    master - mean (749ms)  : 717, 781
     .   : milestone, 749,

gantt
    title Execution time (ms) FakeDbCommand (.NET 8) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Bailout
    This PR (7744) - mean (102ms)  : 99, 105
     .   : milestone, 102,
    master - mean (103ms)  : 101, 106
     .   : milestone, 103,

    section Baseline
    This PR (7744) - mean (101ms)  : 98, 105
     .   : milestone, 101,
    master - mean (102ms)  : 99, 105
     .   : milestone, 102,

    section CallTarget+Inlining+NGEN
    This PR (7744) - mean (753ms)  : 714, 791
     .   : milestone, 753,
    master - mean (713ms)  : 694, 732
     .   : milestone, 713,

gantt
    title Execution time (ms) HttpMessageHandler (.NET Framework 4.8) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Bailout
    This PR (7744) - mean (197ms)  : 194, 199
     .   : milestone, 197,
    master - mean (197ms)  : 193, 201
     .   : milestone, 197,

    section Baseline
    This PR (7744) - mean (193ms)  : 189, 197
     .   : milestone, 193,
    master - mean (194ms)  : 190, 197
     .   : milestone, 194,

    section CallTarget+Inlining+NGEN
    This PR (7744) - mean (1,258ms)  : crit, 1188, 1327
     .   : crit, milestone, 1258,
    master - mean (1,185ms)  : 1112, 1259
     .   : milestone, 1185,

gantt
    title Execution time (ms) HttpMessageHandler (.NET Core 3.1) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Bailout
    This PR (7744) - mean (278ms)  : 274, 283
     .   : milestone, 278,
    master - mean (277ms)  : 273, 282
     .   : milestone, 277,

    section Baseline
    This PR (7744) - mean (278ms)  : 273, 283
     .   : milestone, 278,
    master - mean (277ms)  : 272, 283
     .   : milestone, 277,

    section CallTarget+Inlining+NGEN
    This PR (7744) - mean (1,005ms)  : crit, 933, 1078
     .   : crit, milestone, 1005,
    master - mean (947ms)  : 906, 988
     .   : milestone, 947,

gantt
    title Execution time (ms) HttpMessageHandler (.NET 6) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Bailout
    This PR (7744) - mean (269ms)  : 266, 273
     .   : milestone, 269,
    master - mean (270ms)  : 264, 275
     .   : milestone, 270,

    section Baseline
    This PR (7744) - mean (272ms)  : 266, 277
     .   : milestone, 272,
    master - mean (277ms)  : 260, 293
     .   : milestone, 277,

    section CallTarget+Inlining+NGEN
    This PR (7744) - mean (979ms)  : 935, 1024
     .   : milestone, 979,
    master - mean (940ms)  : 876, 1003
     .   : milestone, 940,

gantt
    title Execution time (ms) HttpMessageHandler (.NET 8) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Bailout
    This PR (7744) - mean (269ms)  : 266, 273
     .   : milestone, 269,
    master - mean (270ms)  : 266, 275
     .   : milestone, 270,

    section Baseline
    This PR (7744) - mean (270ms)  : 264, 277
     .   : milestone, 270,
    master - mean (271ms)  : 260, 282
     .   : milestone, 271,

    section CallTarget+Inlining+NGEN
    This PR (7744) - mean (947ms)  : crit, 900, 994
     .   : crit, milestone, 947,
    master - mean (860ms)  : 838, 882
     .   : milestone, 860,

andrewlock added 2 commits October 30, 2025 17:35

Make TracerSettings dependency explicit

88d134a

Update DSM to stop using the global tracer instance

8a3aee6

andrewlock requested review from a team as code owners October 30, 2025 17:42

andrewlock added area:tracer The core tracer library (Datadog.Trace, does not include OpenTracing, native code, or integrations) area:tests unit tests, integration tests type:reliability area:data-streams-monitoring labels Oct 30, 2025

andrewlock commented Oct 30, 2025

View reviewed changes

bouwkast approved these changes Oct 30, 2025

View reviewed changes

zacharycmontoya approved these changes Oct 30, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Stop using `Tracer.Instance` if we don't need to #7744

Stop using `Tracer.Instance` if we don't need to #7744

andrewlock commented Oct 30, 2025 •

edited

Loading

Uh oh!

andrewlock Oct 30, 2025

Uh oh!

bouwkast Oct 30, 2025 •

edited

Loading

Uh oh!

zacharycmontoya Oct 30, 2025

Uh oh!

zacharycmontoya Oct 30, 2025 •

edited

Loading

Uh oh!

andrewlock Oct 31, 2025

Uh oh!

datadog-datadog-prod-us1 bot commented Oct 30, 2025 •

edited by datadog-official bot

Loading

Uh oh!

bouwkast Oct 30, 2025 •

edited

Loading

Uh oh!

bouwkast Oct 30, 2025

Uh oh!

dd-trace-dotnet-ci-bot bot commented Oct 30, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Stop using Tracer.Instance if we don't need to #7744

Are you sure you want to change the base?

Stop using Tracer.Instance if we don't need to #7744

Conversation

andrewlock commented Oct 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary of changes

Reason for change

Implementation details

Test coverage

Other details

Uh oh!

andrewlock Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

bouwkast Oct 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zacharycmontoya Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

zacharycmontoya Oct 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

andrewlock Oct 31, 2025

Choose a reason for hiding this comment

Uh oh!

datadog-datadog-prod-us1 bot commented Oct 30, 2025 • edited by datadog-official bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

⚠️ Warnings

ℹ️ Info

Uh oh!

bouwkast Oct 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bouwkast Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

dd-trace-dotnet-ci-bot bot commented Oct 30, 2025

Execution-Time Benchmarks Report ⏱️

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Stop using `Tracer.Instance` if we don't need to #7744

Stop using `Tracer.Instance` if we don't need to #7744

andrewlock commented Oct 30, 2025 •

edited

Loading

bouwkast Oct 30, 2025 •

edited

Loading

zacharycmontoya Oct 30, 2025 •

edited

Loading

datadog-datadog-prod-us1 bot commented Oct 30, 2025 •

edited by datadog-official bot

Loading

bouwkast Oct 30, 2025 •

edited

Loading