Fix builds on release/2.x (#5826 -> master) #5828

andrewlock · 2024-07-30T16:10:56Z

Summary of changes

Fix PRs targeting release/2.x

Reason for change

PRs targeting release/2.x currently don't work

Implementation details

Make sure we merge to the correct branch

Test coverage

Tested in #5826

## Summary of changes Fix PRs targeting `release/2.x` ## Reason for change PRs targeting `release/2.x` currently don't work ## Implementation details Make sure we merge to the correct branch ## Test coverage This is the test ## Other details Will cherry pick to master afterwards, but easier to check here. --------- Co-authored-by: Lucas Pimentel <lucas.pimentel@datadoghq.com>

datadog-ddstaging · 2024-07-30T16:31:35Z

Datadog Report

Branch report: andrew/ci/fix-release-targets/rebase
Commit report: 27c38e1
Test service: dd-trace-dotnet

✅ 0 Failed, 345157 Passed, 1752 Skipped, 15h 55m 44.51s Total Time
❄️ 2 New Flaky
⌛ 2 Performance Regressions

New Flaky Tests (2)

NoExceptions - Datadog.Trace.ClrProfiler.IntegrationTests.SmokeTests.RuntimeMetricsShutdownSmokeTest - Last Failure

Expand for error

 Expected no errors in smoke test: open(/proc/1210/mem) FAILED 2 (No such file or directory)
 
 Expected: True
 Actual:   False

SeparatesLogsIntoBatches - Datadog.Trace.Tests.Telemetry.Collectors.RedactedErrorLogCollectorTests - Last Failure
Expand for error
```
 Expected logs.Sum(x => x.Count) to be 556, but found 555 (difference of -1).
```

⌛ Performance Regressions vs Default Branch (2)

Baseline - Samples.HttpMessageHandler.windows.net462.json.scenarios 199.15ms (+6.83ms, +4%) - Details
Baseline - Samples.HttpMessageHandler.windows.netcoreapp31.json.scenarios 280.65ms (+4.43ms, +2%) - Details

andrewlock · 2024-07-30T16:46:32Z

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 (5828) - mean (74ms)  : 65, 83
     .   : milestone, 74,
    master - mean (70ms)  : 67, 74
     .   : milestone, 70,

    section CallTarget+Inlining+NGEN
    This PR (5828) - mean (1,055ms)  : 1028, 1082
     .   : milestone, 1055,
    master - mean (1,047ms)  : 1020, 1075
     .   : milestone, 1047,

gantt
    title Execution time (ms) FakeDbCommand (.NET Core 3.1) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (5828) - mean (111ms)  : 107, 114
     .   : milestone, 111,
    master - mean (110ms)  : 106, 113
     .   : milestone, 110,

    section CallTarget+Inlining+NGEN
    This PR (5828) - mean (737ms)  : 712, 762
     .   : milestone, 737,
    master - mean (736ms)  : 708, 765
     .   : milestone, 736,

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

    section CallTarget+Inlining+NGEN
    This PR (5828) - mean (686ms)  : 662, 710
     .   : milestone, 686,
    master - mean (681ms)  : 658, 704
     .   : milestone, 681,

gantt
    title Execution time (ms) HttpMessageHandler (.NET Framework 4.6.2) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (5828) - mean (199ms)  : 191, 208
     .   : milestone, 199,
    master - mean (191ms)  : 189, 194
     .   : milestone, 191,

    section CallTarget+Inlining+NGEN
    This PR (5828) - mean (1,164ms)  : 1122, 1205
     .   : milestone, 1164,
    master - mean (1,145ms)  : 1121, 1169
     .   : milestone, 1145,

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

    section CallTarget+Inlining+NGEN
    This PR (5828) - mean (918ms)  : 869, 968
     .   : milestone, 918,
    master - mean (904ms)  : 872, 936
     .   : milestone, 904,

gantt
    title Execution time (ms) HttpMessageHandler (.NET 6) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (5828) - mean (270ms)  : 258, 281
     .   : milestone, 270,
    master - mean (265ms)  : 261, 270
     .   : milestone, 265,

    section CallTarget+Inlining+NGEN
    This PR (5828) - mean (898ms)  : 871, 925
     .   : milestone, 898,
    master - mean (884ms)  : 858, 911
     .   : milestone, 884,

andrewlock · 2024-07-30T22:10:05Z

Benchmarks Report for tracer 🐌

Benchmarks for #5828 compared to master:

All benchmarks have the same speed
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.77μs	42.9ns	257ns	0.0157	0.00392	0	5.43 KB
master	`StartStopWithChild`	netcoreapp3.1	10.1μs	55.5ns	351ns	0.0195	0.00976	0	5.62 KB
master	`StartStopWithChild`	net472	16μs	51.4ns	199ns	1.02	0.311	0.112	6.07 KB
#5828	`StartStopWithChild`	net6.0	7.75μs	44.1ns	305ns	0.0145	0.00727	0	5.43 KB
#5828	`StartStopWithChild`	netcoreapp3.1	10.1μs	56.1ns	350ns	0.0156	0.00521	0	5.62 KB
#5828	`StartStopWithChild`	net472	15.9μs	30.6ns	119ns	1.02	0.314	0.102	6.06 KB

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

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`WriteAndFlushEnrichedTraces`	net6.0	481μs	285ns	1.1μs	0	2.7 KB
master	`WriteAndFlushEnrichedTraces`	netcoreapp3.1	626μs	568ns	2.13μs	0	2.7 KB
master	`WriteAndFlushEnrichedTraces`	net472	842μs	705ns	2.64μs	0.419	3.3 KB
#5828	`WriteAndFlushEnrichedTraces`	net6.0	465μs	224ns	809ns	0	2.7 KB
#5828	`WriteAndFlushEnrichedTraces`	netcoreapp3.1	632μs	312ns	1.21μs	0	2.7 KB
#5828	`WriteAndFlushEnrichedTraces`	net472	850μs	530ns	2.05μ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	205μs	1.2μs	11.1μs	0.202	18.45 KB
master	`SendRequest`	netcoreapp3.1	224μs	1.5μs	15μs	0.208	20.61 KB
master	`SendRequest`	net472	0.000183ns	0.000178ns	0.000642ns	0	0 b
#5828	`SendRequest`	net6.0	197μs	1.04μs	7.8μs	0.19	18.45 KB
#5828	`SendRequest`	netcoreapp3.1	213μs	1.19μs	7.65μs	0.243	20.61 KB
#5828	`SendRequest`	net472	0.00232ns	0.000787ns	0.00305ns	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	583μs	2.93μs	13.8μs	0.571	0	0	41.6 KB
master	`WriteAndFlushEnrichedTraces`	netcoreapp3.1	682μs	3.53μs	16.6μs	0.343	0	0	41.9 KB
master	`WriteAndFlushEnrichedTraces`	net472	879μs	4.18μs	16.2μs	8.13	2.57	0.428	53.29 KB
#5828	`WriteAndFlushEnrichedTraces`	net6.0	576μs	2.26μs	8.45μs	0.561	0	0	41.63 KB
#5828	`WriteAndFlushEnrichedTraces`	netcoreapp3.1	668μs	3.44μs	17.5μs	0.326	0	0	41.77 KB
#5828	`WriteAndFlushEnrichedTraces`	net472	877μs	4.35μs	18.9μs	8.3	2.62	0.437	53.29 KB

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

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`ExecuteNonQuery`	net6.0	1.27μs	1.17ns	4.55ns	0.0147	1.02 KB
master	`ExecuteNonQuery`	netcoreapp3.1	1.69μs	1.95ns	7.54ns	0.0135	1.02 KB
master	`ExecuteNonQuery`	net472	1.93μs	1.5ns	5.83ns	0.157	987 B
#5828	`ExecuteNonQuery`	net6.0	1.36μs	0.687ns	2.57ns	0.0144	1.02 KB
#5828	`ExecuteNonQuery`	netcoreapp3.1	1.66μs	1.08ns	4.19ns	0.0133	1.02 KB
#5828	`ExecuteNonQuery`	net472	2.06μs	5.7ns	22.1ns	0.156	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.15μs	0.58ns	2.25ns	0.0138	976 B
master	`CallElasticsearch`	netcoreapp3.1	1.5μs	0.545ns	1.96ns	0.0131	976 B
master	`CallElasticsearch`	net472	2.51μs	1.73ns	6.46ns	0.157	995 B
master	`CallElasticsearchAsync`	net6.0	1.29μs	1.31ns	4.89ns	0.013	952 B
master	`CallElasticsearchAsync`	netcoreapp3.1	1.68μs	0.639ns	2.47ns	0.0134	1.02 KB
master	`CallElasticsearchAsync`	net472	2.57μs	2.74ns	10.6ns	0.166	1.05 KB
#5828	`CallElasticsearch`	net6.0	1.25μs	0.629ns	2.35ns	0.0139	976 B
#5828	`CallElasticsearch`	netcoreapp3.1	1.55μs	0.588ns	2.28ns	0.0132	976 B
#5828	`CallElasticsearch`	net472	2.54μs	2.35ns	9.1ns	0.157	995 B
#5828	`CallElasticsearchAsync`	net6.0	1.35μs	0.475ns	1.78ns	0.0129	952 B
#5828	`CallElasticsearchAsync`	netcoreapp3.1	1.64μs	0.679ns	2.63ns	0.0132	1.02 KB
#5828	`CallElasticsearchAsync`	net472	2.64μs	1.66ns	6.45ns	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.21μs	2.25ns	8.41ns	0.0133	952 B
master	`ExecuteAsync`	netcoreapp3.1	1.57μs	1.35ns	5.06ns	0.0125	952 B
master	`ExecuteAsync`	net472	1.82μs	0.441ns	1.59ns	0.145	915 B
#5828	`ExecuteAsync`	net6.0	1.24μs	0.245ns	0.918ns	0.0131	952 B
#5828	`ExecuteAsync`	netcoreapp3.1	1.66μs	3.45ns	13.4ns	0.0124	952 B
#5828	`ExecuteAsync`	net472	1.68μs	1.19ns	4.46ns	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.09μs	1.49ns	5.56ns	0.0307	2.22 KB
master	`SendAsync`	netcoreapp3.1	5.09μs	3.19ns	12.4ns	0.0358	2.76 KB
master	`SendAsync`	net472	7.77μs	2.24ns	8.67ns	0.496	3.15 KB
#5828	`SendAsync`	net6.0	4.18μs	2.6ns	10.1ns	0.0312	2.22 KB
#5828	`SendAsync`	netcoreapp3.1	4.97μs	2.7ns	10.1ns	0.0372	2.76 KB
#5828	`SendAsync`	net472	7.83μs	2.69ns	10.1ns	0.497	3.15 KB

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

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`EnrichedLog`	net6.0	1.61μs	1.44ns	5.59ns	0.0231	1.64 KB
master	`EnrichedLog`	netcoreapp3.1	2.13μs	1.6ns	5.97ns	0.0224	1.64 KB
master	`EnrichedLog`	net472	2.65μs	1.09ns	4.23ns	0.25	1.57 KB
#5828	`EnrichedLog`	net6.0	1.46μs	1.21ns	4.69ns	0.0231	1.64 KB
#5828	`EnrichedLog`	netcoreapp3.1	2.12μs	2.56ns	9.93ns	0.0221	1.64 KB
#5828	`EnrichedLog`	net472	2.62μs	2.75ns	10.3ns	0.25	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	116μs	299ns	1.16μs	0.0569	0	4.28 KB
master	`EnrichedLog`	netcoreapp3.1	122μs	200ns	747ns	0	0	4.28 KB
master	`EnrichedLog`	net472	148μs	164ns	636ns	0.662	0.221	4.46 KB
#5828	`EnrichedLog`	net6.0	115μs	176ns	680ns	0.057	0	4.28 KB
#5828	`EnrichedLog`	netcoreapp3.1	120μs	232ns	898ns	0.0599	0	4.28 KB
#5828	`EnrichedLog`	net472	148μs	158ns	592ns	0.66	0.22	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	3.15μs	0.677ns	2.62ns	0.03	2.2 KB
master	`EnrichedLog`	netcoreapp3.1	4.11μs	12.2ns	47.4ns	0.0301	2.2 KB
master	`EnrichedLog`	net472	4.83μs	1.48ns	5.74ns	0.32	2.02 KB
#5828	`EnrichedLog`	net6.0	3.26μs	1.43ns	5.52ns	0.031	2.2 KB
#5828	`EnrichedLog`	netcoreapp3.1	4.2μs	1.43ns	5.35ns	0.0291	2.2 KB
#5828	`EnrichedLog`	net472	4.74μs	1.52ns	5.68ns	0.32	2.02 KB

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

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Gen 1	Allocated
master	`SendReceive`	net6.0	1.36μs	1.02ns	3.95ns	0.0162	0	1.14 KB
master	`SendReceive`	netcoreapp3.1	1.78μs	0.994ns	3.72ns	0.0153	0	1.14 KB
master	`SendReceive`	net472	2.19μs	4.15ns	16.1ns	0.183	0	1.16 KB
#5828	`SendReceive`	net6.0	1.4μs	0.847ns	3.28ns	0.0161	0	1.14 KB
#5828	`SendReceive`	netcoreapp3.1	1.69μs	1.25ns	4.83ns	0.0152	0	1.14 KB
#5828	`SendReceive`	net472	2.1μs	2.12ns	8.22ns	0.183	0.00105	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.74μs	1.5ns	5.61ns	0.022	1.6 KB
master	`EnrichedLog`	netcoreapp3.1	3.91μs	1.47ns	5.52ns	0.0214	1.65 KB
master	`EnrichedLog`	net472	4.45μs	10.6ns	40.9ns	0.322	2.04 KB
#5828	`EnrichedLog`	net6.0	2.65μs	0.64ns	2.48ns	0.0225	1.6 KB
#5828	`EnrichedLog`	netcoreapp3.1	3.84μs	2.01ns	7.8ns	0.0211	1.65 KB
#5828	`EnrichedLog`	net472	4.27μs	2.06ns	7.42ns	0.323	2.04 KB

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

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`StartFinishSpan`	net6.0	433ns	0.154ns	0.598ns	0.00815	576 B
master	`StartFinishSpan`	netcoreapp3.1	580ns	0.459ns	1.78ns	0.00776	576 B
master	`StartFinishSpan`	net472	696ns	0.424ns	1.64ns	0.0918	578 B
master	`StartFinishScope`	net6.0	489ns	0.179ns	0.695ns	0.00979	696 B
master	`StartFinishScope`	netcoreapp3.1	674ns	1.14ns	4.43ns	0.00935	696 B
master	`StartFinishScope`	net472	835ns	0.277ns	1.04ns	0.104	658 B
#5828	`StartFinishSpan`	net6.0	398ns	0.0723ns	0.261ns	0.008	576 B
#5828	`StartFinishSpan`	netcoreapp3.1	550ns	0.237ns	0.888ns	0.00769	576 B
#5828	`StartFinishSpan`	net472	649ns	0.221ns	0.857ns	0.0915	578 B
#5828	`StartFinishScope`	net6.0	507ns	0.125ns	0.483ns	0.00965	696 B
#5828	`StartFinishScope`	netcoreapp3.1	723ns	0.257ns	0.994ns	0.00913	696 B
#5828	`StartFinishScope`	net472	840ns	0.374ns	1.45ns	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	662ns	0.197ns	0.764ns	0.00967	696 B
master	`RunOnMethodBegin`	netcoreapp3.1	993ns	0.488ns	1.89ns	0.00943	696 B
master	`RunOnMethodBegin`	net472	1.1μs	0.083ns	0.321ns	0.105	658 B
#5828	`RunOnMethodBegin`	net6.0	672ns	0.2ns	0.774ns	0.00971	696 B
#5828	`RunOnMethodBegin`	netcoreapp3.1	958ns	3.57ns	13.8ns	0.00949	696 B
#5828	`RunOnMethodBegin`	net472	1.13μs	0.462ns	1.79ns	0.104	658 B

andrewlock added the area:builds project files, build scripts, pipelines, versioning, releases, packages label Jul 30, 2024

andrewlock requested a review from a team as a code owner July 30, 2024 16:10

lucaspimentel approved these changes Jul 30, 2024

View reviewed changes

andrewlock merged commit 96ccec4 into master Jul 31, 2024
67 of 69 checks passed

andrewlock deleted the andrew/ci/fix-release-targets/rebase branch July 31, 2024 11:54

github-actions bot added this to the vNext-v3 milestone Jul 31, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix builds on release/2.x (#5826 -> master) #5828

Fix builds on release/2.x (#5826 -> master) #5828

andrewlock commented Jul 30, 2024

datadog-ddstaging bot commented Jul 30, 2024 •

edited

Loading

andrewlock commented Jul 30, 2024

andrewlock commented Jul 30, 2024

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

Raw results

Raw results

Fix builds on release/2.x (#5826 -> master) #5828

Fix builds on release/2.x (#5826 -> master) #5828

Conversation

andrewlock commented Jul 30, 2024

Summary of changes

Reason for change

Implementation details

Test coverage

datadog-ddstaging bot commented Jul 30, 2024 • edited Loading

Datadog Report

New Flaky Tests (2)

⌛ Performance Regressions vs Default Branch (2)

andrewlock commented Jul 30, 2024

Execution-Time Benchmarks Report ⏱️

andrewlock commented Jul 30, 2024

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

Raw results

Raw results

datadog-ddstaging bot commented Jul 30, 2024 •

edited

Loading