Move SpanContextPropagator to TracerManager #6511

kevingosse · 2025-01-08T13:43:10Z

Summary of changes

Store the SpanContextPropagator on the TracerManager instead of using it as a singleton.

Reason for change

SpanContextPropagator was used as a singleton (through SpanContextPropagator.Instance) even though it is dependent on the current tracer configuration. Because of that, some unit tests were impacting other tests despite using a scoped tracer.

Implementation details

Added a SpanContextPropagator property on TracerManager and updated all usages. When possible, I reused the available instance of tracer, otherwise I used TracerManager.Instance.

In the process I discovered that DistributedContextExtractor isn't used anymore so I removed it.

Other details

Discovered while trying to randomize the order of the tests.

datadog-ddstaging · 2025-01-08T14:27:12Z

Datadog Report

Branch report: kevin/spaninjector
Commit report: 4ed7de6
Test service: dd-trace-dotnet

✅ 0 Failed, 584370 Passed, 3887 Skipped, 35h 46m 20.19s Total Time
❄️ 2 New Flaky

New Flaky Tests (2)

NoFilter - Datadog.Trace.Tools.Runner.Tests.CoverageRewriteTests - Last Failure
Expand for error
```
 
 Parameter name: formatllException : Value cannot be null.1.Main
```
NoFilter - Datadog.Trace.Tools.Runner.Tests.CoverageRewriteTests - Last Failure
Expand for error
```
 
 Parameter name: fileName
```

andrewlock · 2025-01-08T14:28:18Z

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.6.2) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6511) - mean (68ms)  : 66, 71
     .   : milestone, 68,
    master - mean (68ms)  : 66, 71
     .   : milestone, 68,

    section CallTarget+Inlining+NGEN
    This PR (6511) - mean (981ms)  : 950, 1012
     .   : milestone, 981,
    master - mean (979ms)  : 948, 1010
     .   : milestone, 979,

gantt
    title Execution time (ms) FakeDbCommand (.NET Core 3.1) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6511) - mean (107ms)  : 104, 110
     .   : milestone, 107,
    master - mean (107ms)  : 105, 109
     .   : milestone, 107,

    section CallTarget+Inlining+NGEN
    This PR (6511) - mean (676ms)  : 659, 694
     .   : milestone, 676,
    master - mean (678ms)  : 664, 693
     .   : milestone, 678,

gantt
    title Execution time (ms) FakeDbCommand (.NET 6) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6511) - mean (91ms)  : 89, 93
     .   : milestone, 91,
    master - mean (91ms)  : 89, 93
     .   : milestone, 91,

    section CallTarget+Inlining+NGEN
    This PR (6511) - mean (628ms)  : 615, 641
     .   : milestone, 628,
    master - mean (635ms)  : 620, 649
     .   : milestone, 635,

gantt
    title Execution time (ms) HttpMessageHandler (.NET Framework 4.6.2) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6511) - mean (193ms)  : 189, 197
     .   : milestone, 193,
    master - mean (194ms)  : 190, 198
     .   : milestone, 194,

    section CallTarget+Inlining+NGEN
    This PR (6511) - mean (1,099ms)  : 1066, 1131
     .   : milestone, 1099,
    master - mean (1,103ms)  : 1066, 1140
     .   : milestone, 1103,

gantt
    title Execution time (ms) HttpMessageHandler (.NET Core 3.1) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6511) - mean (279ms)  : 275, 283
     .   : milestone, 279,
    master - mean (277ms)  : 274, 281
     .   : milestone, 277,

    section CallTarget+Inlining+NGEN
    This PR (6511) - mean (873ms)  : 841, 906
     .   : milestone, 873,
    master - mean (870ms)  : 843, 897
     .   : milestone, 870,

gantt
    title Execution time (ms) HttpMessageHandler (.NET 6) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6511) - mean (267ms)  : 263, 272
     .   : milestone, 267,
    master - mean (267ms)  : 263, 271
     .   : milestone, 267,

    section CallTarget+Inlining+NGEN
    This PR (6511) - mean (849ms)  : 804, 894
     .   : milestone, 849,
    master - mean (852ms)  : 825, 878
     .   : milestone, 852,

andrewlock · 2025-01-08T14:50:00Z

Benchmarks Report for appsec 🐌

Benchmarks for #6511 compared to master:

1 benchmarks are faster, with geometric mean 1.157
1 benchmarks are slower, with geometric mean 1.140
1 benchmarks have fewer allocations
1 benchmarks have more allocations

The following thresholds were used for comparing the benchmark speeds:

Mann–Whitney U test with statistical test for significance of 5%
Only results indicating a difference greater than 10% and 0.3 ns are considered.

Allocation changes below 0.5% are ignored.

Benchmark details

Benchmarks.Trace.Asm.AppSecBodyBenchmark - Slower ⚠️ Same allocations ✔️

Slower ⚠️ in #6511

Benchmark	diff/base	Base Median (ns)	Diff Median (ns)	Modality
Benchmarks.Trace.Asm.AppSecBodyBenchmark.ObjectExtractorSimpleBody‑netcoreapp3.1	1.140	191.16	217.83

Faster 🎉 in #6511

Benchmark	base/diff	Base Median (ns)	Diff Median (ns)	Modality
Benchmarks.Trace.Asm.AppSecBodyBenchmark.ObjectExtractorSimpleBody‑net6.0	1.157	167.39	144.67

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Gen 1	Allocated
master	`AllCycleSimpleBody`	net6.0	202μs	105ns	392ns	2.64	0	188.76 KB
master	`AllCycleSimpleBody`	netcoreapp3.1	308μs	152ns	587ns	2.64	0	196.09 KB
master	`AllCycleSimpleBody`	net472	268μs	148ns	572ns	35.8	2	225.78 KB
master	`AllCycleMoreComplexBody`	net6.0	208μs	95.7ns	371ns	2.71	0	192.26 KB
master	`AllCycleMoreComplexBody`	netcoreapp3.1	317μs	88.6ns	332ns	2.69	0	199.51 KB
master	`AllCycleMoreComplexBody`	net472	278μs	182ns	704ns	36.3	2.08	229.3 KB
master	`ObjectExtractorSimpleBody`	net6.0	167ns	0.119ns	0.445ns	0.00398	0	280 B
master	`ObjectExtractorSimpleBody`	netcoreapp3.1	191ns	0.0949ns	0.329ns	0.00368	0	272 B
master	`ObjectExtractorSimpleBody`	net472	166ns	0.242ns	0.938ns	0.0446	0	281 B
master	`ObjectExtractorMoreComplexBody`	net6.0	2.9μs	1.84ns	6.88ns	0.0533	0	3.78 KB
master	`ObjectExtractorMoreComplexBody`	netcoreapp3.1	3.92μs	1.86ns	6.71ns	0.0492	0	3.69 KB
master	`ObjectExtractorMoreComplexBody`	net472	3.61μs	3.29ns	12.3ns	0.603	0.00543	3.8 KB
#6511	`AllCycleSimpleBody`	net6.0	205μs	229ns	885ns	2.66	0	188.76 KB
#6511	`AllCycleSimpleBody`	netcoreapp3.1	313μs	159ns	550ns	2.67	0	196.09 KB
#6511	`AllCycleSimpleBody`	net472	273μs	383ns	1.48μs	35.8	2.06	225.78 KB
#6511	`AllCycleMoreComplexBody`	net6.0	212μs	148ns	555ns	2.64	0	192.26 KB
#6511	`AllCycleMoreComplexBody`	netcoreapp3.1	321μs	133ns	497ns	2.71	0	199.51 KB
#6511	`AllCycleMoreComplexBody`	net472	276μs	176ns	681ns	36.4	2.07	229.3 KB
#6511	`ObjectExtractorSimpleBody`	net6.0	145ns	0.12ns	0.448ns	0.00393	0	280 B
#6511	`ObjectExtractorSimpleBody`	netcoreapp3.1	218ns	0.159ns	0.614ns	0.00374	0	272 B
#6511	`ObjectExtractorSimpleBody`	net472	166ns	0.442ns	1.71ns	0.0446	0	281 B
#6511	`ObjectExtractorMoreComplexBody`	net6.0	2.9μs	2.33ns	8.72ns	0.0524	0	3.78 KB
#6511	`ObjectExtractorMoreComplexBody`	netcoreapp3.1	3.86μs	12.5ns	48.3ns	0.0512	0	3.69 KB
#6511	`ObjectExtractorMoreComplexBody`	net472	3.7μs	6.11ns	23.7ns	0.602	0.00556	3.8 KB

Benchmarks.Trace.Asm.AppSecEncoderBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Gen 1	Allocated
master	`EncodeArgs`	net6.0	37.7μs	19.9ns	77ns	0.451	0	32.4 KB
master	`EncodeArgs`	netcoreapp3.1	54.5μs	40.2ns	145ns	0.431	0	32.4 KB
master	`EncodeArgs`	net472	66.4μs	67.7ns	262ns	5.13	0.0658	32.5 KB
master	`EncodeLegacyArgs`	net6.0	73μs	23ns	82.8ns	0.0367	0	2.14 KB
master	`EncodeLegacyArgs`	netcoreapp3.1	107μs	217ns	842ns	0	0	2.14 KB
master	`EncodeLegacyArgs`	net472	156μs	123ns	475ns	0.314	0	2.15 KB
#6511	`EncodeArgs`	net6.0	36.8μs	20.4ns	79.1ns	0.458	0	32.4 KB
#6511	`EncodeArgs`	netcoreapp3.1	53.8μs	48.1ns	180ns	0.429	0	32.4 KB
#6511	`EncodeArgs`	net472	66.3μs	26.2ns	94.6ns	5.15	0.066	32.5 KB
#6511	`EncodeLegacyArgs`	net6.0	73.2μs	21.4ns	77ns	0	0	2.14 KB
#6511	`EncodeLegacyArgs`	netcoreapp3.1	107μs	404ns	1.56μs	0	0	2.14 KB
#6511	`EncodeLegacyArgs`	net472	154μs	86.3ns	334ns	0.307	0	2.15 KB

Benchmarks.Trace.Asm.AppSecWafBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`RunWafRealisticBenchmark`	net6.0	174μs	72.5ns	281ns	0	2.44 KB
master	`RunWafRealisticBenchmark`	netcoreapp3.1	190μs	186ns	698ns	0	2.39 KB
master	`RunWafRealisticBenchmark`	net472	201μs	79.1ns	306ns	0.301	2.46 KB
master	`RunWafRealisticBenchmarkWithAttack`	net6.0	115μs	35.3ns	132ns	0	1.47 KB
master	`RunWafRealisticBenchmarkWithAttack`	netcoreapp3.1	125μs	189ns	733ns	0	1.46 KB
master	`RunWafRealisticBenchmarkWithAttack`	net472	132μs	44.1ns	159ns	0.198	1.49 KB
#6511	`RunWafRealisticBenchmark`	net6.0	175μs	120ns	463ns	0	2.44 KB
#6511	`RunWafRealisticBenchmark`	netcoreapp3.1	187μs	240ns	928ns	0	2.39 KB
#6511	`RunWafRealisticBenchmark`	net472	204μs	206ns	796ns	0.303	2.46 KB
#6511	`RunWafRealisticBenchmarkWithAttack`	net6.0	115μs	138ns	536ns	0	1.47 KB
#6511	`RunWafRealisticBenchmarkWithAttack`	netcoreapp3.1	124μs	199ns	771ns	0	1.46 KB
#6511	`RunWafRealisticBenchmarkWithAttack`	net472	133μs	68.5ns	265ns	0.199	1.49 KB

Benchmarks.Trace.Iast.StringAspectsBenchmark - Same speed ✔️ More allocations ⚠️

More allocations ⚠️ in #6511

Benchmark	Base Allocated	Diff Allocated	Change	Change %
Benchmarks.Trace.Iast.StringAspectsBenchmark.StringConcatAspectBenchmark‑netcoreapp3.1	254.8 KB	262.71 KB	7.91 KB	3.11%

Fewer allocations 🎉 in #6511

Benchmark	Base Allocated	Diff Allocated	Change	Change %
Benchmarks.Trace.Iast.StringAspectsBenchmark.StringConcatBenchmark‑net472	59.07 KB	57.33 KB	-1.74 KB	-2.95%

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Allocated
master	`StringConcatBenchmark`	net6.0	58.7μs	684ns	6.84μs	43.44 KB
master	`StringConcatBenchmark`	netcoreapp3.1	59.8μs	711ns	7μs	42.64 KB
master	`StringConcatBenchmark`	net472	37.7μs	170ns	637ns	59.07 KB
master	`StringConcatAspectBenchmark`	net6.0	304μs	1.45μs	5.81μs	253.93 KB
master	`StringConcatAspectBenchmark`	netcoreapp3.1	343μs	2.71μs	26μs	254.8 KB
master	`StringConcatAspectBenchmark`	net472	289μs	7.04μs	67.8μs	278.53 KB
#6511	`StringConcatBenchmark`	net6.0	61.9μs	733ns	7.26μs	43.44 KB
#6511	`StringConcatBenchmark`	netcoreapp3.1	57μs	319ns	1.91μs	42.64 KB
#6511	`StringConcatBenchmark`	net472	39.3μs	212ns	1.16μs	57.33 KB
#6511	`StringConcatAspectBenchmark`	net6.0	301μs	5.26μs	51.2μs	254.2 KB
#6511	`StringConcatAspectBenchmark`	netcoreapp3.1	350μs	1.91μs	11.1μs	262.71 KB
#6511	`StringConcatAspectBenchmark`	net472	311μs	7.04μs	68.3μs	278.53 KB

…Manager

andrewlock · 2025-01-08T21:08:42Z

Benchmarks Report for tracer 🐌

Benchmarks for #6511 compared to master:

1 benchmarks are faster, with geometric mean 1.133
All benchmarks have the same allocations

The following thresholds were used for comparing the benchmark speeds:

Mann–Whitney U test with statistical test for significance of 5%
Only results indicating a difference greater than 10% and 0.3 ns are considered.

Allocation changes below 0.5% are ignored.

Benchmark details

Benchmarks.Trace.ActivityBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Gen 1	Gen 2	Allocated
master	`StartStopWithChild`	net6.0	7.95μs	44.4ns	270ns	0.0159	0.00796	0	5.61 KB
master	`StartStopWithChild`	netcoreapp3.1	10.5μs	57ns	347ns	0.0217	0.0109	0	5.81 KB
master	`StartStopWithChild`	net472	16.4μs	45.5ns	170ns	1.05	0.313	0.107	6.21 KB
#6511	`StartStopWithChild`	net6.0	7.95μs	44ns	278ns	0.0167	0.00834	0	5.61 KB
#6511	`StartStopWithChild`	netcoreapp3.1	10.3μs	57.2ns	352ns	0.0203	0.0102	0	5.8 KB
#6511	`StartStopWithChild`	net472	16.5μs	48.1ns	180ns	1.05	0.314	0.099	6.21 KB

Benchmarks.Trace.AgentWriterBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`WriteAndFlushEnrichedTraces`	net6.0	484μs	460ns	1.78μs	0	2.7 KB
master	`WriteAndFlushEnrichedTraces`	netcoreapp3.1	656μs	489ns	1.9μs	0	2.7 KB
master	`WriteAndFlushEnrichedTraces`	net472	856μs	557ns	2.08μs	0.428	3.3 KB
#6511	`WriteAndFlushEnrichedTraces`	net6.0	501μs	393ns	1.47μs	0	2.7 KB
#6511	`WriteAndFlushEnrichedTraces`	netcoreapp3.1	662μs	708ns	2.65μs	0	2.7 KB
#6511	`WriteAndFlushEnrichedTraces`	net472	851μs	590ns	2.28μs	0.425	3.3 KB

Benchmarks.Trace.AspNetCoreBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`SendRequest`	net6.0	157μs	1.25μs	12.5μs	0.15	14.47 KB
master	`SendRequest`	netcoreapp3.1	172μs	1.23μs	12.3μs	0.161	17.27 KB
master	`SendRequest`	net472	0.00587ns	0.00219ns	0.00848ns	0	0 b
#6511	`SendRequest`	net6.0	152μs	845ns	7.51μs	0.147	14.47 KB
#6511	`SendRequest`	netcoreapp3.1	169μs	968ns	7.37μs	0.17	17.27 KB
#6511	`SendRequest`	net472	0.00417ns	0.0012ns	0.00434ns	0	0 b

Benchmarks.Trace.CIVisibilityProtocolWriterBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Gen 1	Gen 2	Allocated
master	`WriteAndFlushEnrichedTraces`	net6.0	558μs	2.96μs	18.5μs	0.546	0	0	41.52 KB
master	`WriteAndFlushEnrichedTraces`	netcoreapp3.1	673μs	3.71μs	22μs	0.322	0	0	41.87 KB
master	`WriteAndFlushEnrichedTraces`	net472	868μs	3.7μs	14.3μs	8.08	2.55	0.425	53.37 KB
#6511	`WriteAndFlushEnrichedTraces`	net6.0	584μs	2.81μs	11.9μs	0.278	0	0	41.7 KB
#6511	`WriteAndFlushEnrichedTraces`	netcoreapp3.1	691μs	3.23μs	12.9μs	0.357	0	0	41.83 KB
#6511	`WriteAndFlushEnrichedTraces`	net472	847μs	2.72μs	10.6μs	8.12	2.44	0.406	53.28 KB

Benchmarks.Trace.DbCommandBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Gen 1	Allocated
master	`ExecuteNonQuery`	net6.0	1.29μs	1.97ns	7.36ns	0.0141	0	1.02 KB
master	`ExecuteNonQuery`	netcoreapp3.1	1.8μs	1.88ns	7.27ns	0.0134	0	1.02 KB
master	`ExecuteNonQuery`	net472	2.17μs	2.45ns	9.16ns	0.156	0.00109	987 B
#6511	`ExecuteNonQuery`	net6.0	1.23μs	1.87ns	7.23ns	0.0143	0	1.02 KB
#6511	`ExecuteNonQuery`	netcoreapp3.1	1.81μs	1.32ns	5.1ns	0.0132	0	1.02 KB
#6511	`ExecuteNonQuery`	net472	2.11μs	2.51ns	9.38ns	0.157	0.00105	987 B

Benchmarks.Trace.ElasticsearchBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`CallElasticsearch`	net6.0	1.29μs	0.484ns	1.81ns	0.0136	976 B
master	`CallElasticsearch`	netcoreapp3.1	1.59μs	0.572ns	1.98ns	0.0127	976 B
master	`CallElasticsearch`	net472	2.61μs	2ns	7.48ns	0.158	995 B
master	`CallElasticsearchAsync`	net6.0	1.26μs	0.365ns	1.32ns	0.0133	952 B
master	`CallElasticsearchAsync`	netcoreapp3.1	1.63μs	0.714ns	2.67ns	0.0136	1.02 KB
master	`CallElasticsearchAsync`	net472	2.63μs	1.57ns	5.89ns	0.166	1.05 KB
#6511	`CallElasticsearch`	net6.0	1.2μs	0.706ns	2.73ns	0.0138	976 B
#6511	`CallElasticsearch`	netcoreapp3.1	1.49μs	0.857ns	3.32ns	0.0134	976 B
#6511	`CallElasticsearch`	net472	2.59μs	3.43ns	13.3ns	0.157	995 B
#6511	`CallElasticsearchAsync`	net6.0	1.36μs	0.573ns	2.15ns	0.013	952 B
#6511	`CallElasticsearchAsync`	netcoreapp3.1	1.69μs	0.969ns	3.62ns	0.0135	1.02 KB
#6511	`CallElasticsearchAsync`	net472	2.58μs	1.9ns	7.35ns	0.166	1.05 KB

Benchmarks.Trace.GraphQLBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`ExecuteAsync`	net6.0	1.25μs	0.563ns	2.18ns	0.0137	952 B
master	`ExecuteAsync`	netcoreapp3.1	1.59μs	1.57ns	5.89ns	0.0126	952 B
master	`ExecuteAsync`	net472	1.82μs	0.481ns	1.86ns	0.145	915 B
#6511	`ExecuteAsync`	net6.0	1.33μs	0.518ns	2.01ns	0.0133	952 B
#6511	`ExecuteAsync`	netcoreapp3.1	1.64μs	3.94ns	14.7ns	0.013	952 B
#6511	`ExecuteAsync`	net472	1.76μs	0.397ns	1.49ns	0.145	915 B

Benchmarks.Trace.HttpClientBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`SendAsync`	net6.0	4.44μs	1.41ns	5.44ns	0.031	2.31 KB
master	`SendAsync`	netcoreapp3.1	5.24μs	2.31ns	8.65ns	0.0368	2.85 KB
master	`SendAsync`	net472	7.35μs	2.37ns	9.18ns	0.496	3.12 KB
#6511	`SendAsync`	net6.0	4.38μs	1.2ns	4.32ns	0.0327	2.31 KB
#6511	`SendAsync`	netcoreapp3.1	5.28μs	2.68ns	10ns	0.037	2.85 KB
#6511	`SendAsync`	net472	7.39μs	1.23ns	4.62ns	0.493	3.12 KB

Benchmarks.Trace.ILoggerBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`EnrichedLog`	net6.0	1.5μs	0.85ns	3.06ns	0.0233	1.64 KB
master	`EnrichedLog`	netcoreapp3.1	2.2μs	1.56ns	6.05ns	0.0221	1.64 KB
master	`EnrichedLog`	net472	2.66μs	1.51ns	5.85ns	0.249	1.57 KB
#6511	`EnrichedLog`	net6.0	1.49μs	0.437ns	1.51ns	0.0231	1.64 KB
#6511	`EnrichedLog`	netcoreapp3.1	2.17μs	5.92ns	22.9ns	0.0217	1.64 KB
#6511	`EnrichedLog`	net472	2.82μs	1.7ns	6.35ns	0.249	1.57 KB

Benchmarks.Trace.Log4netBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Gen 1	Allocated
master	`EnrichedLog`	net6.0	115μs	119ns	460ns	0.0576	0	4.28 KB
master	`EnrichedLog`	netcoreapp3.1	125μs	358ns	1.39μs	0	0	4.28 KB
master	`EnrichedLog`	net472	150μs	194ns	753ns	0.673	0.224	4.46 KB
#6511	`EnrichedLog`	net6.0	120μs	146ns	567ns	0	0	4.28 KB
#6511	`EnrichedLog`	netcoreapp3.1	122μs	339ns	1.31μs	0.0605	0	4.28 KB
#6511	`EnrichedLog`	net472	153μs	179ns	692ns	0.687	0.229	4.46 KB

Benchmarks.Trace.NLogBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`EnrichedLog`	net6.0	2.99μs	0.901ns	3.37ns	0.0314	2.2 KB
master	`EnrichedLog`	netcoreapp3.1	4.24μs	0.972ns	3.77ns	0.0297	2.2 KB
master	`EnrichedLog`	net472	4.87μs	0.983ns	3.54ns	0.32	2.02 KB
#6511	`EnrichedLog`	net6.0	3.03μs	0.946ns	3.54ns	0.0302	2.2 KB
#6511	`EnrichedLog`	netcoreapp3.1	4.23μs	0.984ns	3.68ns	0.0298	2.2 KB
#6511	`EnrichedLog`	net472	4.77μs	0.858ns	3.09ns	0.319	2.02 KB

Benchmarks.Trace.RedisBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`SendReceive`	net6.0	1.44μs	0.935ns	3.5ns	0.0158	1.14 KB
master	`SendReceive`	netcoreapp3.1	1.71μs	0.653ns	2.44ns	0.0154	1.14 KB
master	`SendReceive`	net472	2.09μs	2.17ns	7.81ns	0.184	1.16 KB
#6511	`SendReceive`	net6.0	1.41μs	1.44ns	5.21ns	0.0162	1.14 KB
#6511	`SendReceive`	netcoreapp3.1	1.69μs	3.78ns	14.6ns	0.0152	1.14 KB
#6511	`SendReceive`	net472	2.08μs	1.43ns	5.36ns	0.183	1.16 KB

Benchmarks.Trace.SerilogBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`EnrichedLog`	net6.0	2.63μs	1.09ns	4.22ns	0.0224	1.6 KB
master	`EnrichedLog`	netcoreapp3.1	4.08μs	1.32ns	4.76ns	0.0224	1.65 KB
master	`EnrichedLog`	net472	4.35μs	2.68ns	10ns	0.324	2.04 KB
#6511	`EnrichedLog`	net6.0	2.61μs	0.681ns	2.55ns	0.0222	1.6 KB
#6511	`EnrichedLog`	netcoreapp3.1	3.84μs	4.31ns	16.7ns	0.0207	1.65 KB
#6511	`EnrichedLog`	net472	4.53μs	4.06ns	15.7ns	0.324	2.04 KB

Benchmarks.Trace.SpanBenchmark - Faster 🎉 Same allocations ✔️

Faster 🎉 in #6511

Benchmark	base/diff	Base Median (ns)	Diff Median (ns)	Modality
Benchmarks.Trace.SpanBenchmark.StartFinishScope‑net6.0	1.133	560.08	494.32

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`StartFinishSpan`	net6.0	397ns	0.224ns	0.868ns	0.00799	576 B
master	`StartFinishSpan`	netcoreapp3.1	589ns	0.407ns	1.52ns	0.00775	576 B
master	`StartFinishSpan`	net472	681ns	0.441ns	1.71ns	0.0917	578 B
master	`StartFinishScope`	net6.0	560ns	0.431ns	1.67ns	0.00976	696 B
master	`StartFinishScope`	netcoreapp3.1	676ns	1.03ns	3.7ns	0.00919	696 B
master	`StartFinishScope`	net472	851ns	0.809ns	3.13ns	0.104	658 B
#6511	`StartFinishSpan`	net6.0	401ns	0.204ns	0.791ns	0.00809	576 B
#6511	`StartFinishSpan`	netcoreapp3.1	560ns	0.417ns	1.56ns	0.00766	576 B
#6511	`StartFinishSpan`	net472	697ns	0.479ns	1.66ns	0.0917	578 B
#6511	`StartFinishScope`	net6.0	494ns	0.279ns	1.08ns	0.00962	696 B
#6511	`StartFinishScope`	netcoreapp3.1	658ns	0.637ns	2.47ns	0.00918	696 B
#6511	`StartFinishScope`	net472	913ns	0.607ns	2.35ns	0.104	658 B

Benchmarks.Trace.TraceAnnotationsBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`RunOnMethodBegin`	net6.0	685ns	0.378ns	1.46ns	0.00958	696 B
master	`RunOnMethodBegin`	netcoreapp3.1	1μs	0.795ns	3.08ns	0.00912	696 B
master	`RunOnMethodBegin`	net472	1.13μs	0.361ns	1.4ns	0.104	658 B
#6511	`RunOnMethodBegin`	net6.0	637ns	0.318ns	1.19ns	0.0096	696 B
#6511	`RunOnMethodBegin`	netcoreapp3.1	958ns	1.22ns	4.73ns	0.00944	696 B
#6511	`RunOnMethodBegin`	net472	1.08μs	0.79ns	3.06ns	0.104	658 B

lucaspimentel · 2025-01-13T16:14:14Z

tracer/src/Datadog.Trace/Propagators/SpanContextPropagator.cs

@@ -38,45 +35,6 @@ internal SpanContextPropagator(
            _extractors = extractors?.ToArray() ?? [];
        }

-        public static SpanContextPropagator Instance


Removing this property is causing most of code changes in this PR and a less discoverable API ("How do I get the SpanContextPropagator?").

What do you think of leaving SpanContextPropagator.Instance as a get-only helper?

public static SpanContextPropagator Instance => Tracer.Instance.TracerManager.SpanContextPropagator;

I'd rather have the dependency on the tracer be explicit. When you have a local instance of the tracer you should use it instead of Tracer.Instance, having SpanContextPropagator.Instance encourages to do the wrong thing.

I believe @andrewlock would agree (we had a somewhat similar discussion before)

When you have a local instance of the tracer you should use it instead of Tracer.Instance

Yeah, agreed.

And adding a Tracer.Instance.SpanContextPropagator => Tracer.Instance.TracerManager.SpanContextPropagator helper isn't that helpful. Thanks.

andrewlock

🙇

robertpi

The (very small) change in the appsec part is fine.

e-n-0

😄

## Summary of changes Randomize the order of the tests. ## Reason for change Flaky tests are much harder to fix when we discover them long after they have been written. By randomizing the order of the tests, I'm hoping to make them fail earlier. In practice, this could temporarily increase the overall flakiness, but I expect this will reduce the overall effort spent on fixing tests. ## Implementation details In `CustomTestFramework`, randomize the list of all tests in each collections, and the collections themselves. The seed is displayed in the output. When a test order causes tests to fail, this allows to deterministically reproduce that test order. ## Other details Four other issues were found thanks to this: #6535, #6532, #6511, #6509

kevingosse requested review from a team as code owners January 8, 2025 13:43

kevingosse added the area:tracer The core tracer library (Datadog.Trace, does not include OpenTracing, native code, or integrations) label Jan 8, 2025

kevingosse added 3 commits January 8, 2025 17:04

Remove the SpanContextPropagator singleton and store it on the Tracer…

abe9268

…Manager

Fix compilation

43d7cdd

Cleanup

bc50f3e

kevingosse force-pushed the kevin/spaninjector branch from f0311a0 to bc50f3e Compare January 8, 2025 16:04

kevingosse added 6 commits January 9, 2025 11:34

Try not using the tracer

02d6066

Try not using the tracer

77c476b

More

86593a2

Actual fix

309b1cc

Don't use static where appropriate

b440f2a

Stop using TracerManager.Instance

4ed7de6

lucaspimentel reviewed Jan 13, 2025

View reviewed changes

andrewlock approved these changes Jan 14, 2025

View reviewed changes

vandonr approved these changes Jan 14, 2025

View reviewed changes

robertpi approved these changes Jan 14, 2025

View reviewed changes

e-n-0 approved these changes Jan 14, 2025

View reviewed changes

kevingosse merged commit 152be15 into master Jan 14, 2025
105 of 107 checks passed

kevingosse deleted the kevin/spaninjector branch January 14, 2025 11:15

github-actions bot added this to the vNext-v3 milestone Jan 14, 2025

kevingosse mentioned this pull request Jan 14, 2025

Randomize the order of tests #5831

Merged

andrewlock added the type:refactor label Jan 22, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move SpanContextPropagator to TracerManager #6511

Move SpanContextPropagator to TracerManager #6511

kevingosse commented Jan 8, 2025

datadog-ddstaging bot commented Jan 8, 2025 •

edited

Loading

andrewlock commented Jan 8, 2025 •

edited

Loading

andrewlock commented Jan 8, 2025 •

edited

Loading

Slower ⚠️ in #6511

Faster 🎉 in #6511

Raw results

Raw results

Raw results

More allocations ⚠️ in #6511

Fewer allocations 🎉 in #6511

Raw results

andrewlock commented Jan 8, 2025 •

edited

Loading

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Faster 🎉 in #6511

Raw results

Raw results

lucaspimentel Jan 13, 2025 •

edited

Loading

kevingosse Jan 13, 2025

lucaspimentel Jan 13, 2025

andrewlock left a comment

robertpi left a comment

e-n-0 left a comment

Move SpanContextPropagator to TracerManager #6511

Move SpanContextPropagator to TracerManager #6511

Conversation

kevingosse commented Jan 8, 2025

Summary of changes

Reason for change

Implementation details

Other details

datadog-ddstaging bot commented Jan 8, 2025 • edited Loading

Datadog Report

New Flaky Tests (2)

andrewlock commented Jan 8, 2025 • edited Loading

Execution-Time Benchmarks Report ⏱️

andrewlock commented Jan 8, 2025 • edited Loading

Benchmarks Report for appsec 🐌

Benchmark details

Slower ⚠️ in #6511

Faster 🎉 in #6511

Raw results

Raw results

Raw results

More allocations ⚠️ in #6511

Fewer allocations 🎉 in #6511

Raw results

andrewlock commented Jan 8, 2025 • edited Loading

Benchmarks Report for tracer 🐌

Benchmark details

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Faster 🎉 in #6511

Raw results

Raw results

lucaspimentel Jan 13, 2025 • edited Loading

Choose a reason for hiding this comment

kevingosse Jan 13, 2025

Choose a reason for hiding this comment

lucaspimentel Jan 13, 2025

Choose a reason for hiding this comment

andrewlock left a comment

Choose a reason for hiding this comment

robertpi left a comment

Choose a reason for hiding this comment

e-n-0 left a comment

Choose a reason for hiding this comment

datadog-ddstaging bot commented Jan 8, 2025 •

edited

Loading

andrewlock commented Jan 8, 2025 •

edited

Loading

andrewlock commented Jan 8, 2025 •

edited

Loading

andrewlock commented Jan 8, 2025 •

edited

Loading

lucaspimentel Jan 13, 2025 •

edited

Loading