Skip to content

Use built-in .NET runtime types instead of vendored types when possible#6726

Merged
dudikeleti merged 17 commits intomasterfrom
lpimentel/use-built-in-types-2-global-usings
Feb 11, 2026
Merged

Use built-in .NET runtime types instead of vendored types when possible#6726
dudikeleti merged 17 commits intomasterfrom
lpimentel/use-built-in-types-2-global-usings

Conversation

@lucaspimentel
Copy link
Member

@lucaspimentel lucaspimentel commented Feb 27, 2025 •
edited by andrewlock
Loading

Summary of changes

When targeting .NET Core >= 3.1, do not include the files copied ("vendored") from the .NET runtime. Instead, use the built-in types.

Reason for change

  • main goal is smaller artifacts for .NET Core 3.1 and above, where these type are built-in
  • secondary goal is consistency in our code base: we currently have different ways of choosing built-in types vs vendored types: sometimes we always use the vendored type, sometimes we choose based on target runtime (TFM)
  • there might also be small performance differences between using built-in types vs our own (ours need to be JIT-compiled at runtime, and the JIT compiler may also have special optimizations for some of these type that it may not be able to apply to our copies)

Implementation details

  • Remove most references to these namespaces from individual files.
  • In GlobalUsings.cs, use #if NETCOREAPP3_1_OR_GREATER and global using to choose namespaces based on target runtime (TFM)
  • Replace the use of some internal .NET runtime APIs with their public counterparts, for example:
    • ArrayMemoryPool ➡️ MemoryPool
    • new ImmutableArray<LocalScope>.Builder() ➡️ ImmutableArray.CreateBuilder<LocalScope>()
  • When targeting netcoreapp3.1 or net6.0, exclude most of the files in:
Vendors/System.Collections.Immutable;
Vendors/System.Memory;
Vendors/System.Runtime.CompilerServices.Unsafe;

Note that this PR keeps the files in Vendors/System.Reflection.Metadata for now because we access non-public members from that namespace. Unfortunately, this namespace makes up about 60% of the bytes in Vendors/System.*. We can try to tackle this in a future PR.

This PR also keeps a file which is used elsewhere:

Vendors/System.Private.CoreLib/SR.cs

and otherwise deletes the vendored System.Private.CoreLib attributes, because they don't "work":

  • The nullable attributes don't, they need to be in the correct namespace, and we already polyfill those, and including them just means you accidentally can use the wrong ones
  • The [LibraryImport] attribute drives a source generator, but that generator is only present in .NET 7+, so it does nothing here.

Test coverage

No behavior changes expected. All tests should still pass, except for assembly reference changes:

  • We're now using the built-in System.Collections.Immutable in .NET 6 instead of the vendored, so assembly reference added there
  • We're now consistently using the vendored Unsafe in .NET Core 3.1 (and < .NET6), so removed that reference
    • We need it because there's one method we use, Unsafe.IsNullRef which is only available in .NET 5
    • We could extract that method specifically for .NET Core 3.1 and use the built-in Unsafe for everything else

Other details

Assembly size comparison

Runtime Before After Diff %
netcoreapp3.1 8,247 KB 7,914 KB -333 KB -4.04%
net6.0 8,340 KB 8,007 KB -333 KB -3.99%

Estimated size per namespace

Before (net6.0)

VendoredMicrosoftCode 5.51 MB (100.0%)
└── System 5.51 MB (100.0%)
    ├── Reflection 3.28 MB (59.6%)
    ├── Collections 1.15 MB (20.8%)
    ├── Buffers 0.46 MB (8.4%)
    ├── Runtime 0.07 MB (1.3%)
    ├── Linq 0.06 MB (1.0%)
    ├── Diagnostics 0.02 MB (0.4%)
    ├── Memory 0.02 MB (0.3%)
    └── Numerics < 0.01 MB (< 0.1%)

After (net6.0)

VendoredMicrosoftCode 5.22 MB (100.0%)
└── System 5.22 MB (100.0%)
    ├── Reflection 5.01 MB (96.0%)
    ├── Runtime 0.06 MB (1.2%)
    └── Diagnostics < 0.01 MB (< 0.1%)

@lucaspimentel lucaspimentel force-pushed the lpimentel/use-built-in-types-2-global-usings branch from 1f37cc8 to 6dd35fd Compare February 27, 2025 16:01
@datadog-datadog-prod-us1

This comment has been minimized.

Sign in to view
@andrewlock

This comment was marked as outdated.

Sign in to view
@lucaspimentel lucaspimentel force-pushed the lpimentel/use-built-in-types-2-global-usings branch 3 times, most recently from d09bc2e to 0b047b0 Compare March 7, 2025 19:44
@lucaspimentel lucaspimentel force-pushed the lpimentel/use-built-in-types-2-global-usings branch 2 times, most recently from 55471b6 to 539552b Compare March 27, 2025 14:37
@lucaspimentel lucaspimentel force-pushed the lpimentel/use-built-in-types-2-global-usings branch from 539552b to b00f219 Compare April 15, 2025 21:23
@lucaspimentel lucaspimentel force-pushed the lpimentel/use-built-in-types-2-global-usings branch 2 times, most recently from d2f9b4c to 0153f8e Compare May 5, 2025 16:29
@lucaspimentel lucaspimentel force-pushed the lpimentel/use-built-in-types-2-global-usings branch 3 times, most recently from c9cdab8 to e440e8d Compare May 30, 2025 17:14
@lucaspimentel lucaspimentel force-pushed the lpimentel/use-built-in-types-2-global-usings branch 3 times, most recently from 4fdc3e6 to 628ae33 Compare June 6, 2025 20:18
@lucaspimentel lucaspimentel force-pushed the lpimentel/use-built-in-types-2-global-usings branch 2 times, most recently from c8960e5 to fba1250 Compare June 13, 2025 16:37
@lucaspimentel lucaspimentel changed the title [WIP] use built-in .NET runtime types instead of vendored types when possible [WIP] use built-in .NET runtime types instead of vendored types when possible, part 2 Jun 18, 2025
@lucaspimentel lucaspimentel force-pushed the lpimentel/use-built-in-types-2-global-usings branch from fba1250 to a006f05 Compare June 23, 2025 19:02
@lucaspimentel lucaspimentel changed the title [WIP] use built-in .NET runtime types instead of vendored types when possible, part 2 [WIP] use built-in .NET runtime types instead of vendored types when possible Jun 23, 2025
@lucaspimentel lucaspimentel mentioned this pull request Jul 10, 2025
Merged
@lucaspimentel lucaspimentel force-pushed the lpimentel/use-built-in-types-2-global-usings branch from a006f05 to 3acc23d Compare October 6, 2025 20:00
@lucaspimentel lucaspimentel mentioned this pull request Dec 17, 2025
Merged
@lucaspimentel lucaspimentel force-pushed the lpimentel/use-built-in-types-2-global-usings branch from 3acc23d to e68663f Compare February 2, 2026 19:48
@pr-commenter
Copy link

pr-commenter bot commented Feb 2, 2026 •
edited
Loading

Benchmarks

Benchmark execution time: 2026-02-04 10:25:44

Comparing candidate commit 56adc55 in PR branch lpimentel/use-built-in-types-2-global-usings with baseline commit 723078c in branch master.

Found 10 performance improvements and 8 performance regressions! Performance is the same for 158 metrics, 16 unstable metrics.

scenario:Benchmarks.Trace.AgentWriterBenchmark.WriteAndFlushEnrichedTraces net6.0

  • 🟩 execution_time [-19.099ms; -18.968ms] or [-15.949%; -15.840%]

scenario:Benchmarks.Trace.Asm.AppSecBodyBenchmark.AllCycleSimpleBody netcoreapp3.1

  • 🟥 execution_time [+15.561ms; +21.912ms] or [+7.889%; +11.109%]

scenario:Benchmarks.Trace.Asm.AppSecEncoderBenchmark.EncodeLegacyArgs net6.0

  • 🟩 execution_time [-23.528ms; -23.006ms] or [-11.516%; -11.261%]

scenario:Benchmarks.Trace.Asm.AppSecEncoderBenchmark.EncodeLegacyArgs netcoreapp3.1

  • 🟥 execution_time [+19.532ms; +20.876ms] or [+10.776%; +11.517%]

scenario:Benchmarks.Trace.CIVisibilityProtocolWriterBenchmark.WriteAndFlushEnrichedTraces net472

  • 🟥 execution_time [+19.478ms; +22.550ms] or [+10.377%; +12.013%]

scenario:Benchmarks.Trace.CIVisibilityProtocolWriterBenchmark.WriteAndFlushEnrichedTraces netcoreapp3.1

  • 🟥 execution_time [+56.252ms; +57.995ms] or [+35.725%; +36.832%]

scenario:Benchmarks.Trace.CharSliceBenchmark.OptimizedCharSliceWithPool net6.0

  • 🟩 execution_time [-139.072µs; -131.182µs] or [-11.904%; -11.228%]
  • 🟩 throughput [+108.780op/s; +115.097op/s] or [+12.709%; +13.447%]

scenario:Benchmarks.Trace.DbCommandBenchmark.ExecuteNonQuery net6.0

  • 🟩 throughput [+33953.642op/s; +40709.821op/s] or [+6.716%; +8.053%]

scenario:Benchmarks.Trace.GraphQLBenchmark.ExecuteAsync net472

  • 🟩 throughput [+36988.719op/s; +40018.069op/s] or [+9.739%; +10.536%]

scenario:Benchmarks.Trace.GraphQLBenchmark.ExecuteAsync netcoreapp3.1

  • 🟥 throughput [-28643.204op/s; -22403.117op/s] or [-6.745%; -5.276%]

scenario:Benchmarks.Trace.ILoggerBenchmark.EnrichedLog net6.0

  • 🟩 execution_time [-18.064ms; -13.816ms] or [-8.539%; -6.531%]

scenario:Benchmarks.Trace.Log4netBenchmark.EnrichedLog net472

  • 🟩 execution_time [-10.733ms; -10.373ms] or [-5.347%; -5.167%]

scenario:Benchmarks.Trace.RedisBenchmark.SendReceive netcoreapp3.1

  • 🟥 throughput [-46325.822op/s; -39652.981op/s] or [-11.588%; -9.919%]
  • 🟩 execution_time [-17.133ms; -13.618ms] or [-8.127%; -6.460%]

scenario:Benchmarks.Trace.SingleSpanAspNetCoreBenchmark.SingleSpanAspNetCore netcoreapp3.1

  • 🟩 throughput [+23798732.416op/s; +25240086.108op/s] or [+11.004%; +11.670%]

scenario:Benchmarks.Trace.SpanBenchmark.StartFinishSpan net6.0

  • 🟥 throughput [-111272.614op/s; -79875.051op/s] or [-8.546%; -6.135%]

scenario:Benchmarks.Trace.SpanBenchmark.StartFinishSpan netcoreapp3.1

  • 🟥 execution_time [+13.254ms; +18.132ms] or [+6.708%; +9.177%]

@andrewlock andrewlock force-pushed the lpimentel/use-built-in-types-2-global-usings branch from 429f902 to 43aaa8e Compare February 3, 2026 11:19
@dd-trace-dotnet-ci-bot
Copy link

dd-trace-dotnet-ci-bot bot commented Feb 3, 2026 •
edited
Loading

Execution-Time Benchmarks Report ⏱️

Execution-time results for samples comparing This PR (6726) and master.

✅ No regressions detected - check the details below

Full Metrics Comparison

FakeDbCommand

Metric Master (Mean ± 95% CI) Current (Mean ± 95% CI) Change Status
.NET Framework 4.8 - Baseline
duration73.30 ± (73.22 - 73.50) ms72.55 ± (72.50 - 72.75) ms-1.0%✅
.NET Framework 4.8 - Bailout
duration77.63 ± (77.47 - 77.82) ms76.87 ± (76.75 - 77.03) ms-1.0%✅
.NET Framework 4.8 - CallTarget+Inlining+NGEN
duration1060.19 ± (1062.61 - 1070.00) ms1061.54 ± (1063.17 - 1072.05) ms+0.1%✅⬆️
.NET Core 3.1 - Baseline
process.internal_duration_ms23.36 ± (23.31 - 23.41) ms23.19 ± (23.15 - 23.23) ms-0.7%✅
process.time_to_main_ms93.44 ± (93.27 - 93.61) ms92.61 ± (92.45 - 92.78) ms-0.9%✅
runtime.dotnet.exceptions.count0 ± (0 - 0)0 ± (0 - 0)+0.0%✅
runtime.dotnet.mem.committed15.52 ± (15.51 - 15.52) MB15.53 ± (15.53 - 15.54) MB+0.1%✅⬆️
runtime.dotnet.threads.count12 ± (12 - 12)12 ± (12 - 12)+0.0%✅
.NET Core 3.1 - Bailout
process.internal_duration_ms23.29 ± (23.24 - 23.33) ms23.12 ± (23.07 - 23.17) ms-0.7%✅
process.time_to_main_ms94.78 ± (94.55 - 95.02) ms93.82 ± (93.69 - 93.96) ms-1.0%✅
runtime.dotnet.exceptions.count0 ± (0 - 0)0 ± (0 - 0)+0.0%✅
runtime.dotnet.mem.committed15.59 ± (15.58 - 15.59) MB15.57 ± (15.56 - 15.57) MB-0.1%✅
runtime.dotnet.threads.count13 ± (13 - 13)13 ± (13 - 13)+0.0%✅
.NET Core 3.1 - CallTarget+Inlining+NGEN
process.internal_duration_ms270.24 ± (266.95 - 273.52) ms267.32 ± (264.18 - 270.46) ms-1.1%✅
process.time_to_main_ms525.66 ± (525.00 - 526.33) ms513.72 ± (513.08 - 514.37) ms-2.3%✅
runtime.dotnet.exceptions.count0 ± (0 - 0)0 ± (0 - 0)+0.0%✅
runtime.dotnet.mem.committed53.24 ± (53.22 - 53.26) MB52.28 ± (52.26 - 52.30) MB-1.8%✅
runtime.dotnet.threads.count28 ± (28 - 28)28 ± (28 - 28)+0.0%✅
.NET 6 - Baseline
process.internal_duration_ms21.47 ± (21.43 - 21.51) ms21.64 ± (21.60 - 21.68) ms+0.8%✅⬆️
process.time_to_main_ms74.25 ± (74.06 - 74.44) ms79.57 ± (79.42 - 79.73) ms+7.2%✅⬆️
runtime.dotnet.exceptions.count0 ± (0 - 0)0 ± (0 - 0)+0.0%✅
runtime.dotnet.mem.committed10.67 ± (10.66 - 10.67) MB15.23 ± (15.23 - 15.24) MB+42.8%✅⬆️
runtime.dotnet.threads.count10 ± (10 - 10)10 ± (10 - 10)+0.0%✅
.NET 6 - Bailout
process.internal_duration_ms21.45 ± (21.41 - 21.49) ms21.57 ± (21.53 - 21.60) ms+0.5%✅⬆️
process.time_to_main_ms75.09 ± (74.91 - 75.28) ms80.81 ± (80.64 - 80.98) ms+7.6%✅⬆️
runtime.dotnet.exceptions.count0 ± (0 - 0)0 ± (0 - 0)+0.0%✅
runtime.dotnet.mem.committed10.72 ± (10.72 - 10.73) MB15.34 ± (15.34 - 15.35) MB+43.1%✅⬆️
runtime.dotnet.threads.count11 ± (11 - 11)11 ± (11 - 11)+0.0%✅
.NET 6 - CallTarget+Inlining+NGEN
process.internal_duration_ms231.31 ± (227.35 - 235.28) ms264.78 ± (263.93 - 265.64) ms+14.5%✅⬆️
process.time_to_main_ms474.27 ± (473.59 - 474.95) ms487.20 ± (486.40 - 487.99) ms+2.7%✅⬆️
runtime.dotnet.exceptions.count0 ± (0 - 0)0 ± (0 - 0)+0.0%✅
runtime.dotnet.mem.committed49.27 ± (49.25 - 49.30) MB52.96 ± (52.94 - 52.98) MB+7.5%✅⬆️
runtime.dotnet.threads.count28 ± (28 - 28)28 ± (28 - 28)+0.3%✅⬆️
.NET 8 - Baseline
process.internal_duration_ms19.89 ± (19.86 - 19.93) ms19.91 ± (19.88 - 19.95) ms+0.1%✅⬆️
process.time_to_main_ms79.24 ± (79.07 - 79.41) ms79.12 ± (78.94 - 79.30) ms-0.2%✅
runtime.dotnet.exceptions.count0 ± (0 - 0)0 ± (0 - 0)+0.0%✅
runtime.dotnet.mem.committed12.26 ± (12.26 - 12.27) MB12.29 ± (12.28 - 12.30) MB+0.2%✅⬆️
runtime.dotnet.threads.count10 ± (10 - 10)10 ± (10 - 10)+0.0%✅
.NET 8 - Bailout
process.internal_duration_ms19.80 ± (19.77 - 19.84) ms19.79 ± (19.75 - 19.83) ms-0.1%✅
process.time_to_main_ms80.12 ± (79.97 - 80.27) ms80.20 ± (80.03 - 80.36) ms+0.1%✅⬆️
runtime.dotnet.exceptions.count0 ± (0 - 0)0 ± (0 - 0)+0.0%✅
runtime.dotnet.mem.committed12.33 ± (12.32 - 12.35) MB12.34 ± (12.33 - 12.35) MB+0.0%✅⬆️
runtime.dotnet.threads.count11 ± (11 - 11)11 ± (11 - 11)+0.0%✅
.NET 8 - CallTarget+Inlining+NGEN
process.internal_duration_ms190.55 ± (189.68 - 191.41) ms190.04 ± (189.13 - 190.96) ms-0.3%✅
process.time_to_main_ms479.80 ± (478.92 - 480.67) ms468.49 ± (467.66 - 469.32) ms-2.4%✅
runtime.dotnet.exceptions.count0 ± (0 - 0)0 ± (0 - 0)+0.0%✅
runtime.dotnet.mem.committed41.43 ± (41.39 - 41.47) MB40.60 ± (40.56 - 40.65) MB-2.0%✅
runtime.dotnet.threads.count27 ± (27 - 27)27 ± (27 - 27)+0.2%✅⬆️

HttpMessageHandler

Metric Master (Mean ± 95% CI) Current (Mean ± 95% CI) Change Status
.NET Framework 4.8 - Baseline
duration196.92 ± (197.16 - 198.04) ms198.95 ± (198.86 - 199.73) ms+1.0%✅⬆️
.NET Framework 4.8 - Bailout
duration201.04 ± (200.76 - 201.51) ms200.57 ± (200.45 - 201.32) ms-0.2%✅
.NET Framework 4.8 - CallTarget+Inlining+NGEN
duration1161.56 ± (1165.33 - 1174.28) ms1156.80 ± (1159.58 - 1166.63) ms-0.4%✅
.NET Core 3.1 - Baseline
process.internal_duration_ms192.16 ± (191.66 - 192.66) ms195.73 ± (195.33 - 196.13) ms+1.9%✅⬆️
process.time_to_main_ms83.98 ± (83.68 - 84.29) ms90.90 ± (90.64 - 91.17) ms+8.2%✅⬆️
runtime.dotnet.exceptions.count3 ± (3 - 3)3 ± (3 - 3)+0.0%✅
runtime.dotnet.mem.committed16.14 ± (16.12 - 16.16) MB20.76 ± (20.74 - 20.78) MB+28.6%✅⬆️
runtime.dotnet.threads.count20 ± (19 - 20)20 ± (20 - 20)+1.5%✅⬆️
.NET Core 3.1 - Bailout
process.internal_duration_ms191.75 ± (191.25 - 192.25) ms195.35 ± (194.92 - 195.78) ms+1.9%✅⬆️
process.time_to_main_ms84.84 ± (84.67 - 85.01) ms92.26 ± (92.04 - 92.47) ms+8.7%✅⬆️
runtime.dotnet.exceptions.count3 ± (3 - 3)3 ± (3 - 3)+0.0%✅
runtime.dotnet.mem.committed16.24 ± (16.22 - 16.26) MB20.75 ± (20.72 - 20.78) MB+27.8%✅⬆️
runtime.dotnet.threads.count21 ± (21 - 21)21 ± (21 - 21)+0.1%✅⬆️
.NET Core 3.1 - CallTarget+Inlining+NGEN
process.internal_duration_ms427.56 ± (424.05 - 431.06) ms444.05 ± (441.20 - 446.89) ms+3.9%✅⬆️
process.time_to_main_ms491.40 ± (490.36 - 492.44) ms506.13 ± (505.47 - 506.79) ms+3.0%✅⬆️
runtime.dotnet.exceptions.count3 ± (3 - 3)3 ± (3 - 3)+0.0%✅
runtime.dotnet.mem.committed59.15 ± (59.04 - 59.26) MB62.67 ± (62.55 - 62.79) MB+6.0%✅⬆️
runtime.dotnet.threads.count29 ± (29 - 30)29 ± (29 - 29)-0.1%✅
.NET 6 - Baseline
process.internal_duration_ms201.30 ± (200.90 - 201.71) ms200.13 ± (199.73 - 200.54) ms-0.6%✅
process.time_to_main_ms78.79 ± (78.57 - 79.01) ms79.11 ± (78.89 - 79.33) ms+0.4%✅⬆️
runtime.dotnet.exceptions.count4 ± (4 - 4)4 ± (4 - 4)+0.0%✅
runtime.dotnet.mem.committed20.90 ± (20.88 - 20.92) MB20.90 ± (20.88 - 20.92) MB-0.0%✅
runtime.dotnet.threads.count19 ± (19 - 20)19 ± (19 - 20)-0.1%✅
.NET 6 - Bailout
process.internal_duration_ms200.20 ± (199.83 - 200.56) ms198.98 ± (198.60 - 199.36) ms-0.6%✅
process.time_to_main_ms79.85 ± (79.66 - 80.05) ms79.89 ± (79.71 - 80.08) ms+0.0%✅⬆️
runtime.dotnet.exceptions.count4 ± (4 - 4)4 ± (4 - 4)+0.0%✅
runtime.dotnet.mem.committed20.95 ± (20.93 - 20.97) MB21.00 ± (20.97 - 21.02) MB+0.2%✅⬆️
runtime.dotnet.threads.count20 ± (20 - 21)21 ± (20 - 21)+0.1%✅⬆️
.NET 6 - CallTarget+Inlining+NGEN
process.internal_duration_ms468.41 ± (466.73 - 470.10) ms467.30 ± (465.70 - 468.91) ms-0.2%✅
process.time_to_main_ms491.75 ± (491.03 - 492.48) ms482.03 ± (481.41 - 482.66) ms-2.0%✅
runtime.dotnet.exceptions.count4 ± (4 - 4)4 ± (4 - 4)+0.0%✅
runtime.dotnet.mem.committed62.90 ± (62.80 - 63.01) MB61.90 ± (61.80 - 62.00) MB-1.6%✅
runtime.dotnet.threads.count30 ± (30 - 30)30 ± (30 - 30)+0.0%✅
.NET 8 - Baseline
process.internal_duration_ms198.87 ± (198.45 - 199.30) ms198.05 ± (197.66 - 198.44) ms-0.4%✅
process.time_to_main_ms78.14 ± (77.95 - 78.34) ms78.21 ± (77.96 - 78.46) ms+0.1%✅⬆️
runtime.dotnet.exceptions.count4 ± (4 - 4)4 ± (4 - 4)+0.0%✅
runtime.dotnet.mem.committed16.34 ± (16.32 - 16.36) MB16.34 ± (16.32 - 16.36) MB+0.0%✅⬆️
runtime.dotnet.threads.count19 ± (19 - 19)19 ± (19 - 19)-0.2%✅
.NET 8 - Bailout
process.internal_duration_ms198.49 ± (197.99 - 198.99) ms197.30 ± (196.86 - 197.74) ms-0.6%✅
process.time_to_main_ms79.57 ± (79.35 - 79.80) ms79.18 ± (79.03 - 79.33) ms-0.5%✅
runtime.dotnet.exceptions.count4 ± (4 - 4)4 ± (4 - 4)+0.0%✅
runtime.dotnet.mem.committed16.45 ± (16.43 - 16.47) MB16.39 ± (16.37 - 16.41) MB-0.3%✅
runtime.dotnet.threads.count20 ± (20 - 20)20 ± (20 - 20)+0.5%✅⬆️
.NET 8 - CallTarget+Inlining+NGEN
process.internal_duration_ms379.23 ± (377.96 - 380.50) ms379.28 ± (377.97 - 380.59) ms+0.0%✅⬆️
process.time_to_main_ms476.77 ± (476.08 - 477.45) ms466.21 ± (465.59 - 466.83) ms-2.2%✅
runtime.dotnet.exceptions.count4 ± (4 - 4)4 ± (4 - 4)+0.0%✅
runtime.dotnet.mem.committed52.94 ± (52.88 - 53.01) MB52.28 ± (52.20 - 52.37) MB-1.2%✅
runtime.dotnet.threads.count29 ± (29 - 29)29 ± (29 - 29)-0.1%✅
Comparison explanation

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 highlighted 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).

Duration charts
FakeDbCommand (.NET Framework 4.8) 
gantt
    title Execution time (ms) FakeDbCommand (.NET Framework 4.8)
    dateFormat  x
    axisFormat %Q
    todayMarker off
    section Baseline
    This PR (6726) - mean (73ms)  : 71, 74
    master - mean (73ms)  : 71, 75

    section Bailout
    This PR (6726) - mean (77ms)  : 76, 78
    master - mean (78ms)  : 76, 79

    section CallTarget+Inlining+NGEN
    This PR (6726) - mean (1,068ms)  : 1016, 1120
    master - mean (1,066ms)  : 1013, 1119
Loading
FakeDbCommand (.NET Core 3.1) 
gantt
    title Execution time (ms) FakeDbCommand (.NET Core 3.1)
    dateFormat  x
    axisFormat %Q
    todayMarker off
    section Baseline
    This PR (6726) - mean (124ms)  : 121, 126
    master - mean (125ms)  : 120, 129

    section Bailout
    This PR (6726) - mean (125ms)  : 123, 126
    master - mean (126ms)  : 123, 129

    section CallTarget+Inlining+NGEN
    This PR (6726) - mean (819ms)  : 769, 870
    master - mean (833ms)  : 780, 886
Loading
FakeDbCommand (.NET 6) 
gantt
    title Execution time (ms) FakeDbCommand (.NET 6)
    dateFormat  x
    axisFormat %Q
    todayMarker off
    section Baseline
    This PR (6726) - mean (108ms)  : 105, 111
    master - mean (102ms)  : 99, 106

    section Bailout
    This PR (6726) - mean (109ms)  : crit, 107, 112
    master - mean (103ms)  : 100, 106

    section CallTarget+Inlining+NGEN
    This PR (6726) - mean (792ms)  : crit, 770, 814
    master - mean (742ms)  : 666, 817
Loading
FakeDbCommand (.NET 8) 
gantt
    title Execution time (ms) FakeDbCommand (.NET 8)
    dateFormat  x
    axisFormat %Q
    todayMarker off
    section Baseline
    This PR (6726) - mean (107ms)  : 104, 111
    master - mean (108ms)  : 105, 110

    section Bailout
    This PR (6726) - mean (108ms)  : 106, 110
    master - mean (108ms)  : 106, 110

    section CallTarget+Inlining+NGEN
    This PR (6726) - mean (701ms)  : 682, 720
    master - mean (712ms)  : 690, 735
Loading
HttpMessageHandler (.NET Framework 4.8) 
gantt
    title Execution time (ms) HttpMessageHandler (.NET Framework 4.8)
    dateFormat  x
    axisFormat %Q
    todayMarker off
    section Baseline
    This PR (6726) - mean (199ms)  : 195, 204
    master - mean (198ms)  : 192, 204

    section Bailout
    This PR (6726) - mean (201ms)  : 196, 205
    master - mean (201ms)  : 198, 205

    section CallTarget+Inlining+NGEN
    This PR (6726) - mean (1,163ms)  : 1110, 1216
    master - mean (1,170ms)  : 1104, 1235
Loading
HttpMessageHandler (.NET Core 3.1) 
gantt
    title Execution time (ms) HttpMessageHandler (.NET Core 3.1)
    dateFormat  x
    axisFormat %Q
    todayMarker off
    section Baseline
    This PR (6726) - mean (296ms)  : 289, 303
    master - mean (285ms)  : 279, 291

    section Bailout
    This PR (6726) - mean (297ms)  : 292, 302
    master - mean (285ms)  : 278, 293

    section CallTarget+Inlining+NGEN
    This PR (6726) - mean (994ms)  : 949, 1039
    master - mean (960ms)  : 887, 1033
Loading
HttpMessageHandler (.NET 6) 
gantt
    title Execution time (ms) HttpMessageHandler (.NET 6)
    dateFormat  x
    axisFormat %Q
    todayMarker off
    section Baseline
    This PR (6726) - mean (289ms)  : 280, 297
    master - mean (289ms)  : 280, 299

    section Bailout
    This PR (6726) - mean (288ms)  : 281, 295
    master - mean (289ms)  : 285, 294

    section CallTarget+Inlining+NGEN
    This PR (6726) - mean (991ms)  : 950, 1031
    master - mean (998ms)  : 959, 1038
Loading
HttpMessageHandler (.NET 8) 
gantt
    title Execution time (ms) HttpMessageHandler (.NET 8)
    dateFormat  x
    axisFormat %Q
    todayMarker off
    section Baseline
    This PR (6726) - mean (288ms)  : 282, 293
    master - mean (288ms)  : 281, 295

    section Bailout
    This PR (6726) - mean (287ms)  : 280, 294
    master - mean (289ms)  : 282, 295

    section CallTarget+Inlining+NGEN
    This PR (6726) - mean (882ms)  : 848, 916
    master - mean (892ms)  : 861, 922
Loading

andrewlock
andrewlock approved these changes Feb 3, 2026
View reviewed changes
Copy link
Member

@andrewlock andrewlock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, a few questions/nits/improvements. We should almost certainly remove the vendored attributes, but we can address those separately I think

tracer/src/Datadog.Trace/Debugger/Helpers/MemoryExtensions.cs
Comment on lines -19 to +17
var newMemory = ArrayMemoryPool<T>.Shared.Rent(currentSize * 2);
var newMemory = MemoryPool<T>.Shared.Rent(currentSize * 2);
Copy link
Member

@andrewlock andrewlock Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For reviewers, this looks like it might be a change to worry about given that ArrayMemoryPool derives from MemoryPool. But the MemoryPool<T>.Shared instance is actually an instance of ArrayMemoryPool<T> so this whole code is effectively identical

Copy link
Member Author

@lucaspimentel lucaspimentel Feb 4, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The static Shared property is actually on the MemoryPool<T> type and you can't override static members, so we were always using that one. This would compile to MemoryPool<T>.Shared.

tracer/src/Datadog.Trace/Util/BitConverterShim.cs
#nullable enable

#if !NETCOREAPP
#if !NETCOREAPP3_1_OR_GREATER
Copy link
Member

@andrewlock andrewlock Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a potential future where we don't ship a netstandard dll, and instead ship a .NET Core 2.x dll. In that future, this code path won't be hit, whereas it would otherwise, so setting the "real" minimum level is generally preferable. Is this really .NET Core 3.1+, or really .NET Core 2.x+?

Copy link
Member Author

@lucaspimentel lucaspimentel Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just like the NETCOREAPP3_0_OR_GREATER comment elsewhere, I was just trying to be consistent. Also, we're talking about .NET Core 2.x, so... meh?

Copy link
Member Author

@lucaspimentel lucaspimentel Feb 4, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fwiw it looks like we don't need this #if at all anymore? it looks like GlobalUsings.cs is handling this correctly.

Copy link
Member Author

@lucaspimentel lucaspimentel Feb 4, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...ish. It's still using the vendored Unsafe.ReadUnaligned in .NET Core 3.1 even though that method was added in .NET Core 3.0. It might be a similar issue to UnSafe.IsNullRef() which was added in .NET 5.

Copy link
Member

@andrewlock andrewlock Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, we're talking about .NET Core 2.x,

Yeah, I mean... that was the original 3.x plan 😅 Because it's actually a big improvement over netstandard, but you know, reasons...

It's still using the vendored Unsafe.ReadUnaligned in .NET Core 3.1

I mean, we're using the vendored Unsafe everywhere for 3.1 now 😉

Copy link
Member Author

@lucaspimentel lucaspimentel Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh right

.../System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/EnumerableExtensions.cs
/// </summary>
internal static class EnumerableExtensions
{
public static T? FirstOrDefault<T>(this ImmutableArray<T> collection, Func<T, bool> predicate)
Copy link
Member

@andrewlock andrewlock Feb 3, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For reviewers: These two are deleted for the reasons described in the comment above:

/// <summary>
/// Replacements for System.Linq to avoid an unnecessary dependency.
/// Parameter and return types strengthened to actual internal usage as an optimization.
/// </summary>

Seeing as we do reference System.Linq, they're both unecessary, and cause ambiguity. Also, they're trivial implementations, so doesn't seem like we're really losing anything there

lucaspimentel and others added 11 commits February 4, 2026 09:43
@lucaspimentel @andrewlock
exclude vendored files
b6d15aa
@lucaspimentel @andrewlock
skip irrelevant tests
04a0906
@lucaspimentel @andrewlock
fix compiler errors after rebasing on master
37d829e
@lucaspimentel @andrewlock
"Below this point is reserved for vendor items"
9c3e184
@lucaspimentel @andrewlock
keep System.Runtime.CompilerServices.Unsafe for Unsafe.IsNullRef()
548d1ac
@andrewlock
Fix incorrect use of vendored attribute
bf506f5
@andrewlock
Apply suggestions from code review
9b6ee1a
@andrewlock
Apply suggestion from @andrewlock
ffdb33a
@andrewlock
Fix description
f4892d7
@andrewlock
Remove (now unused) assembly
9a2c0dc
@andrewlock
Delete vendored attributes which shouldn't have been vendored
56adc55 
- The nullable attributes won't actually work, they need to be in the correct namespace, and we already polyfill those
- The LibraryImport attribute drives a source generator, but that generator is only present in .NET 7+, so it does nothing here.
- This also simplifies the vendoring in general
@andrewlock andrewlock force-pushed the lpimentel/use-built-in-types-2-global-usings branch from 6039658 to 56adc55 Compare February 4, 2026 09:43
@andrewlock andrewlock marked this pull request as ready for review February 4, 2026 09:50
@andrewlock andrewlock requested review from a team as code owners February 4, 2026 09:50
@andrewlock andrewlock changed the title [WIP] use built-in .NET runtime types instead of vendored types when possible Use built-in .NET runtime types instead of vendored types when possible Feb 4, 2026
tonyredondo
tonyredondo approved these changes Feb 4, 2026
View reviewed changes
Copy link
Member

@tonyredondo tonyredondo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh this is nice!

daniel-romano-DD
daniel-romano-DD approved these changes Feb 9, 2026
View reviewed changes
Copy link
Contributor

@daniel-romano-DD daniel-romano-DD left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot!

@dudikeleti dudikeleti requested a review from Copilot February 9, 2026 14:43
Copilot AI reviewed Feb 9, 2026
View reviewed changes
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the tracer to prefer built-in .NET runtime types (e.g., System.Buffers, System.Collections.Immutable, MemoryPool<T>, Unsafe) on .NET Core 3.1+ and reduce artifact size by excluding vendored runtime sources when they’re already available in the target runtime.

Changes:

  • Centralized TFM-based selection of built-in vs vendored BCL types via GlobalUsings.cs.
  • Updated code to use public BCL APIs (MemoryPool<T>, ImmutableArray.CreateBuilder<T>(), Unsafe.IsNullRef) and added/updated reference snapshots.
  • Adjusted build/trimming configuration to exclude vendored runtime sources on netcoreapp3.1+ while keeping System.Reflection.Metadata vendored for internal-member access.

Reviewed changes

Copilot reviewed 129 out of 131 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
tracer/test/Datadog.Trace.Tests/VendoredCodeTests.cs Adjusts Unsafe vendored-vs-built-in verification tests by TFM.
tracer/test/Datadog.Trace.Tests/Snapshots/PublicApiTests.Datadog.Trace.AssemblyReferencesHaveNotChanged.netcoreapp3.1.verified.txt Updates expected assembly references after switching to built-in System.Collections.Immutable on netcoreapp3.1.
tracer/test/Datadog.Trace.Tests/Snapshots/PublicApiTests.Datadog.Trace.AssemblyReferencesHaveNotChanged.net6.0.verified.txt Updates expected assembly references to include built-in System.Collections.Immutable on net6.0.
tracer/test/Datadog.Trace.Tests/Debugger/EndpointDetectorTests.cs Uses built-in System.Collections.Immutable on netcoreapp3.1+ and vendored otherwise.
tracer/test/Datadog.Trace.Debugger.IntegrationTests/LineProbeResolverTest.cs Uses built-in System.Collections.Immutable on netcoreapp3.1+ and vendored otherwise.
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Throw.cs Switches from vendored CodeAnalysis to built-in System.Diagnostics.CodeAnalysis.
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEReader.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEMemoryBlock.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEHeaders.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEBuilder.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/ManagedPEBuilder.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/DebugDirectory/PdbChecksumDebugDirectoryData.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/DebugDirectory/DebugDirectoryBuilder.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeSystem/TypeDefinition.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeSystem/StandaloneSignature.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeSystem/PropertyDefinition.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeSystem/NamespaceDefinition.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeSystem/MethodSpecification.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeSystem/EventDefinition.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeSystem/16HandleCollections.TypeSystem.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeSystem/15HandleCollections.TypeSystem.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/Signatures/MethodSignature.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/Signatures/CustomAttributeValue.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/Signatures/ArrayShape.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/PortablePdb/DebugMetadataHeader.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataReaderProvider.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataReader.netstandard.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/Internal/NamespaceData.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/Internal/NamespaceCache.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/Internal/MetadataWriterUtilities.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/IL/MethodBodyBlock.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/Ecma335/SignatureDecoder.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/Ecma335/SerializedMetadataHeaps.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/Ecma335/PortablePdbBuilder.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/Ecma335/MetadataSizes.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/Ecma335/MetadataRootBuilder.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/Ecma335/MetadataBuilder.cs Switches helper usage to LINQ (adds System.Linq) and removes vendored immutable import.
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/Ecma335/MetadataAggregator.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/Ecma335/Encoding/ControlFlowBuilder.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/Ecma335/Encoding/5BlobEncoders.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/Ecma335/Encoding/21BlobEncoders.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/Ecma335/CustomAttributeDecoder.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/Decoding/IConstructedTypeProvider.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/BlobWriter.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/BlobContentId.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Metadata/BlobBuilder.cs Switches helper usage to LINQ (adds System.Linq) and removes vendored immutable import.
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/Interop.cs Drops vendored interop import and removes unused LibraryImport attribute usage.
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/ImmutableMemoryStream.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/ImmutableByteArrayInterop.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/EnumerableExtensions.cs Removes custom LINQ-like helpers and vendored immutable import.
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/ByteSequenceComparer.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/BlobUtilities.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/ByteArrayMemoryProvider.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/ByteArrayMemoryBlock.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/AbstractMemoryBlock.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Private.CoreLib/src/System/Runtime/InteropServices/StringMarshalling.cs Deletes unused vendored StringMarshalling enum.
tracer/src/Datadog.Trace/Vendors/System.Private.CoreLib/src/System/Runtime/InteropServices/LibraryImportAttribute.cs Deletes unused vendored LibraryImportAttribute.
tracer/src/Datadog.Trace/Vendors/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/NullableAttributes.cs Deletes vendored nullable attribute stub (deprecated/unusable).
tracer/src/Datadog.Trace/Vendors/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/9NullableAttributes.cs Deletes vendored nullable attribute stub (deprecated/unusable).
tracer/src/Datadog.Trace/Vendors/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/8NullableAttributes.cs Deletes vendored nullable attribute stub (deprecated/unusable).
tracer/src/Datadog.Trace/Vendors/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/7NullableAttributes.cs Deletes vendored nullable attribute stub (deprecated/unusable).
tracer/src/Datadog.Trace/Vendors/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/6NullableAttributes.cs Deletes vendored nullable attribute stub (deprecated/unusable).
tracer/src/Datadog.Trace/Vendors/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/5NullableAttributes.cs Deletes vendored nullable attribute stub (deprecated/unusable).
tracer/src/Datadog.Trace/Vendors/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/4NullableAttributes.cs Deletes vendored nullable attribute stub (deprecated/unusable).
tracer/src/Datadog.Trace/Vendors/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/3NullableAttributes.cs Deletes vendored nullable attribute stub (deprecated/unusable).
tracer/src/Datadog.Trace/Vendors/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/2NullableAttributes.cs Deletes vendored nullable attribute stub (deprecated/unusable).
tracer/src/Datadog.Trace/Vendors/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/1NullableAttributes.cs Deletes vendored nullable attribute stub (deprecated/unusable).
tracer/src/Datadog.Trace/Vendors/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/10NullableAttributes.cs Deletes vendored nullable attribute stub (deprecated/unusable).
tracer/src/Datadog.Trace/Vendors/System.Memory/Span`1.cs Removes explicit vendored aliases/imports (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Memory/SpanHelpers.cs Removes explicit vendored aliases/imports (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Memory/SpanDebugView`1.cs Removes vendored diagnostics import.
tracer/src/Datadog.Trace/Vendors/System.Memory/Runtime/InteropServices/MemoryMarshal.cs Switches to built-in System.Runtime.InteropServices import usage.
tracer/src/Datadog.Trace/Vendors/System.Memory/ReadOnlySpan`1.cs Removes explicit vendored Unsafe alias (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Memory/ReadOnlyMemory`1.cs Removes explicit vendored aliases/imports (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Memory/Memory`1.cs Removes explicit vendored aliases/imports (relying on global usings).
tracer/src/Datadog.Trace/Vendors/System.Memory/MemoryExtensions.cs Uses built-in System.Runtime.InteropServices import.
tracer/src/Datadog.Trace/Vendors/System.Memory/Buffers/Utilities.cs Uses built-in System.Runtime.InteropServices import and removes vendored aliases.
tracer/src/Datadog.Trace/Vendors/System.Memory/Buffers/Text/Base64.cs Uses built-in System.Runtime.InteropServices import and removes vendored aliases.
tracer/src/Datadog.Trace/Vendors/System.Memory/Buffers/ReadOnlySequence`1.cs Uses built-in System.Runtime.InteropServices import and removes vendored aliases.
tracer/src/Datadog.Trace/Vendors/System.Memory/Buffers/ReadOnlySequenceDebugView`1.cs Removes vendored diagnostics import.
tracer/src/Datadog.Trace/Vendors/System.Collections.Immutable/src/System/Linq/ImmutableArrayExtensions.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Util/Streams/InitiallyBufferedStream.cs Removes vendored System.Buffers import (relying on global usings).
tracer/src/Datadog.Trace/Util/HexString.cs Switches to built-in interop types on netcoreapp3.1+ and shim otherwise.
tracer/src/Datadog.Trace/Util/BitConverterShim.cs Updates shim compilation condition for netcoreapp3.1+ and relies on global usings.
tracer/src/Datadog.Trace/Propagators/W3CBaggagePropagator.cs Removes vendored System.Buffers import (relying on global usings).
tracer/src/Datadog.Trace/PDBs/DatadogMetadataReader.cs Switches to MemoryPool<T> and built-in ImmutableArray builder APIs; keeps vendored metadata.
tracer/src/Datadog.Trace/PDBs/DatadogMetadataReader.Dnlib.cs Switches to MemoryPool<T> and built-in ImmutableArray builder APIs.
tracer/src/Datadog.Trace/HttpOverStreams/ChunkedEncodingReadStream.HexHelpers.cs Removes per-file conditional usings (relying on global usings).
tracer/src/Datadog.Trace/GlobalUsings.cs Adds TFM-based global usings for built-in vs vendored BCL types and Unsafe alias selection.
tracer/src/Datadog.Trace/Debugger/Symbols/Utf8CountingPooledTextWriter.cs Removes vendored System.Buffers import (relying on global usings).
tracer/src/Datadog.Trace/Debugger/Symbols/TypeProvider.cs Removes vendored immutable import; clarifies vendored metadata usage.
tracer/src/Datadog.Trace/Debugger/Symbols/SymbolsUploader.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Debugger/Symbols/SymbolsExtensions.cs Improves nil handle initialization (readonly + default).
tracer/src/Datadog.Trace/Debugger/Symbols/SymbolPdbExtractor.cs Switches to built-in Span/MemoryPool and string span helpers; keeps vendored metadata.
tracer/src/Datadog.Trace/Debugger/Symbols/SymbolExtractor.cs Switches to built-in string span helpers and adjusts compiler-generated detection call.
tracer/src/Datadog.Trace/Debugger/Symbols/AssemblyFilter.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Debugger/SpanCodeOrigin/SpanCodeOrigin.cs Removes vendored imports (relying on global usings).
tracer/src/Datadog.Trace/Debugger/SpanCodeOrigin/EndpointDetector.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Debugger/SignatureParser.cs Removes vendored System.Buffers import (relying on global usings).
tracer/src/Datadog.Trace/Debugger/LineProbeResolver.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Debugger/Instrumentation/MethodDebuggerInvoker.SingleProbe.cs Switches to Unsafe.IsNullRef via global alias.
tracer/src/Datadog.Trace/Debugger/Instrumentation/LineDebuggerInvoker.cs Switches to Unsafe.IsNullRef via global alias.
tracer/src/Datadog.Trace/Debugger/Instrumentation/AsyncMethodDebuggerInvoker.SingleProbe.cs Switches to Unsafe.IsNullRef via global alias.
tracer/src/Datadog.Trace/Debugger/Instrumentation/AsyncLineDebuggerInvoker.cs Switches to Unsafe.IsNullRef via global alias.
tracer/src/Datadog.Trace/Debugger/Helpers/MemoryExtensions.cs Switches buffer growth from ArrayMemoryPool<T> to MemoryPool<T>.
tracer/src/Datadog.Trace/Debugger/Expressions/MethodScopeMembers.cs Removes vendored System.Buffers import (relying on global usings).
tracer/src/Datadog.Trace/Debugger/ExceptionAutoInstrumentation/ThirdParty/ThirdPartyModules.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Debugger/ExceptionAutoInstrumentation/ThirdParty/ThirdPartyConfigurationReader.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Debugger/ExceptionAutoInstrumentation/TestExceptionNormalizer.cs Replaces vendored span types with BCL ReadOnlySpan<char>.
tracer/src/Datadog.Trace/Debugger/ExceptionAutoInstrumentation/StackTraceProcessor.cs Replaces vendored string span helpers with BCL span APIs.
tracer/src/Datadog.Trace/Debugger/ExceptionAutoInstrumentation/FrameFilter.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Debugger/ExceptionAutoInstrumentation/ExceptionNormalizer.cs Replaces vendored string span helpers with BCL span APIs.
tracer/src/Datadog.Trace/Debugger/ExceptionAutoInstrumentation/ExceptionCaseInstrumentationManager.cs Formatting-only change (blank line).
tracer/src/Datadog.Trace/Debugger/DebuggerSettings.cs Removes vendored immutable import (relying on global usings).
tracer/src/Datadog.Trace/Debugger/Caching/DefaultMemoryChecker.cs Uses BCL MemoryMarshal + Utf8Parser and BCL span APIs.
tracer/src/Datadog.Trace/Datadog.Trace.csproj Excludes vendored runtime sources on netcoreapp3.1+ and conditionally re-adds vendored Unsafe.cs for IsNullRef.
tracer/src/Datadog.Trace/DatabaseMonitoring/DatabaseMonitoringPropagator.cs Switches to BCL Span<byte> and BinaryPrimitives.
tracer/src/Datadog.Trace/DataStreamsMonitoring/DataStreamsContextPropagator.cs Removes vendored buffers/text imports (relying on global usings).
tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/Continuations/ContinuationGenerator.cs Removes vendored Unsafe fallback and uses global Unsafe alias.
tracer/src/Datadog.Trace/ClrProfiler/CallTarget/CallTargetRefStruct.cs Updates ref-struct accessors to use unqualified Span<T>/ReadOnlySpan<T> types (via global usings).
tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Testing/XUnit/V3/XUnitTestMethodRunnerBaseRunTestCaseV3Integration.cs Removes vendored Unsafe import (relying on global alias).
tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/IbmMq/IbmMqHeadersAdapter.cs Removes vendored Unsafe import (relying on global alias).
tracer/src/Datadog.Trace/Ci/Net/FileTestOptimizationClient.cs Uses BCL CodeAnalysis attributes and tightens deserialization success check.
tracer/src/Datadog.Trace/Ci/Ipc/IpcDualChannel.cs Removes vendored System.Buffers import (relying on global usings).
tracer/src/Datadog.Trace/Ci/Ipc/CircularChannel.Reader.cs Removes vendored System.Buffers import (relying on global usings).
tracer/src/Datadog.Trace/AppSec/WafEncoding/Encoder.cs Switches to global Unsafe.As alias.
tracer/src/Datadog.Trace/Agent/SpanCollection.cs Removes per-file Unsafe alias selection (relying on global alias).
tracer/src/Datadog.Trace/Agent/MultipartFormItem.cs Uses BCL CodeAnalysis attributes.
tracer/src/Datadog.Trace.Trimming/build/Datadog.Trace.Trimming.xml Updates linker roots for new built-in type dependencies and removes no-longer-needed roots.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

tracer/test/Datadog.Trace.Tests/VendoredCodeTests.cs
Comment on lines 36 to 40
#if DEBUG
throw new Xunit.SkipException("This test requires RELEASE mode and will fail in DEBUG mode on some target frameworks");
#else
#elif !NETCOREAPP3_1_OR_GREATER
var originalType = typeof(System.Runtime.CompilerServices.Unsafe);
var vendoredType = typeof(VendoredMicrosoftCode.System.Runtime.CompilerServices.Unsafe.Unsafe);
Copy link

Copilot AI Feb 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For NETCOREAPP3_1_OR_GREATER in RELEASE, this test method becomes an empty no-op (neither the DEBUG skip nor the non-NETCOREAPP block compiles), so it will silently pass without asserting anything. Add an #else branch that explicitly skips (or wrap the whole [Fact] in the same preprocessor condition) so the test outcome is meaningful on all TFMs.

Copilot uses AI. Check for mistakes.
Copy link
Member Author

@lucaspimentel lucaspimentel Feb 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

makes sense

tracer/src/Datadog.Trace/Datadog.Trace.csproj
<None Remove="AppSec\Waf\ConfigFiles\apisecurity-config.json" />
</ItemGroup>

<!-- we don't need the vendored .NET runtime code when targetting .NET Core 3.1+ -->
Copy link

Copilot AI Feb 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct spelling of 'targetting' to 'targeting' in the project comment.

Suggested change
<!-- we don't need the vendored .NET runtime code when targetting .NET Core 3.1+ -->
<!-- we don't need the vendored .NET runtime code when targeting .NET Core 3.1+ -->

Copilot uses AI. Check for mistakes.
Copy link
Member Author

@lucaspimentel lucaspimentel Feb 10, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TIL some new English rules suggestions (American vs British): https://english.stackexchange.com/questions/205815/is-targetted-a-standard-british-english-spelling

dudikeleti
dudikeleti approved these changes Feb 11, 2026
View reviewed changes
Copy link
Contributor

@dudikeleti dudikeleti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@dudikeleti dudikeleti merged commit f5d4e59 into master Feb 11, 2026
145 checks passed
@dudikeleti dudikeleti deleted the lpimentel/use-built-in-types-2-global-usings branch February 11, 2026 14:43
@github-actions github-actions bot added this to the vNext-v3 milestone Feb 11, 2026
@andrewlock andrewlock mentioned this pull request Feb 11, 2026
Merged
bouwkast pushed a commit that referenced this pull request Feb 11, 2026
@andrewlock
Fix incorrect use of namespace breaking the build (#8192)
9f017b8 
## Summary of changes

Fixes the broken build

## Reason for change

#6726 was merged but needed a rebase, so this slipped in

## Implementation details

Don't use the non-existent "vendored" attributes. Always use the real
ones

## Test coverage

If the build passes, we're good
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@andrewlock andrewlock andrewlock approved these changes

Copilot code review Copilot Copilot left review comments

@tonyredondo tonyredondo tonyredondo approved these changes

@dudikeleti dudikeleti dudikeleti approved these changes

@daniel-romano-DD daniel-romano-DD daniel-romano-DD approved these changes

Assignees

No one assigned

Labels

type:cleanup Minor code clean up type:refactor

Projects

None yet

Milestone

3.38.0

Development

Successfully merging this pull request may close these issues.

6 participants

@lucaspimentel @andrewlock @tonyredondo @dudikeleti @daniel-romano-DD