Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable the merge queue #6780

Merged
merged 1 commit into from
Mar 19, 2025
Merged

Disable the merge queue #6780

merged 1 commit into from
Mar 19, 2025
+4 −0

Conversation

bouwkast
Copy link
Collaborator

@bouwkast bouwkast commented Mar 19, 2025 •
edited
Loading

Summary of changes

Disables the merge queue

Reason for change

We don't want it.

It hits our CI very hard and doesn't work very well for us, we prefer to use the manual button to merge the PRs

Implementation details

Added the file, also saw that https://github.com/DataDog/dd-trace-go/blob/main/repository.datadog.yml has it as well so I think this should be good.

Test coverage

None

Other details

@bouwkast bouwkast requested a review from a team as a code owner March 19, 2025 17:53
andrewlock
andrewlock approved these changes Mar 19, 2025
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.

🙇‍♂️

@datadog-datadog-prod-us1
Copy link

datadog-datadog-prod-us1 bot commented Mar 19, 2025 •
edited
Loading

Datadog Report

Branch report: steven/disable-mergequeue
Commit report: ee89342
Test service: dd-trace-dotnet

❌ 1 Failed (0 Known Flaky), 248597 Passed, 2393 Skipped, 20h 32m 36.43s Total Time

❌ Failed Tests (1)

  • HttpClient_SubmitsTraces - Datadog.Trace.ClrProfiler.IntegrationTests.HttpMessageHandlerTests - Details

    Expand for error 
     Expected exit code: 0, actual exit code: 139.

@andrewlock
Copy link
Member

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).
Loading 
gantt
    title Execution time (ms) FakeDbCommand (.NET Framework 4.6.2) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6780) - mean (80ms)  : 74, 86
     .   : milestone, 80,
    master - mean (69ms)  : 65, 74
     .   : milestone, 69,

    section CallTarget+Inlining+NGEN
    This PR (6780) - mean (1,094ms)  : crit, 1060, 1128
     .   : crit, milestone, 1094,
    master - mean (1,002ms)  : 977, 1026
     .   : milestone, 1002,
Loading 
gantt
    title Execution time (ms) FakeDbCommand (.NET Core 3.1) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6780) - mean (117ms)  : 111, 123
     .   : milestone, 117,
    master - mean (102ms)  : 100, 104
     .   : milestone, 102,

    section CallTarget+Inlining+NGEN
    This PR (6780) - mean (753ms)  : crit, 731, 775
     .   : crit, milestone, 753,
    master - mean (686ms)  : 665, 706
     .   : milestone, 686,
Loading 
gantt
    title Execution time (ms) FakeDbCommand (.NET 6) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6780) - mean (103ms)  : 98, 109
     .   : milestone, 103,
    master - mean (89ms)  : 87, 91
     .   : milestone, 89,

    section CallTarget+Inlining+NGEN
    This PR (6780) - mean (705ms)  : crit, 682, 728
     .   : crit, milestone, 705,
    master - mean (642ms)  : 626, 659
     .   : milestone, 642,
Loading 
gantt
    title Execution time (ms) HttpMessageHandler (.NET Framework 4.6.2) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6780) - mean (190ms)  : 187, 194
     .   : milestone, 190,
    master - mean (190ms)  : 186, 195
     .   : milestone, 190,

    section CallTarget+Inlining+NGEN
    This PR (6780) - mean (1,112ms)  : 1087, 1138
     .   : milestone, 1112,
    master - mean (1,109ms)  : 1078, 1139
     .   : milestone, 1109,
Loading 
gantt
    title Execution time (ms) HttpMessageHandler (.NET Core 3.1) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6780) - mean (269ms)  : 265, 273
     .   : milestone, 269,
    master - mean (269ms)  : 265, 274
     .   : milestone, 269,

    section CallTarget+Inlining+NGEN
    This PR (6780) - mean (875ms)  : 849, 902
     .   : milestone, 875,
    master - mean (876ms)  : 847, 904
     .   : milestone, 876,
Loading 
gantt
    title Execution time (ms) HttpMessageHandler (.NET 6) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6780) - mean (263ms)  : 259, 268
     .   : milestone, 263,
    master - mean (262ms)  : 258, 265
     .   : milestone, 262,

    section CallTarget+Inlining+NGEN
    This PR (6780) - mean (858ms)  : 825, 891
     .   : milestone, 858,
    master - mean (861ms)  : 824, 898
     .   : milestone, 861,

@andrewlock
Copy link
Member

Benchmarks Report for tracer 🐌

Benchmarks for #6780 compared to master:

  • 1 benchmarks are faster, with geometric mean 1.127
  • 1 benchmarks are slower, with geometric mean 1.137
  • 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.91μs 42.9ns 231ns 0.0124 0.00412 0 5.61 KB
master StartStopWithChild netcoreapp3.1 10.3μs 55.4ns 323ns 0.0243 0.0097 0 5.81 KB
master StartStopWithChild net472 16.1μs 44.3ns 166ns 1.04 0.304 0.0962 6.22 KB
#6780 StartStopWithChild net6.0 7.99μs 45.7ns 333ns 0.0158 0.00791 0 5.62 KB
#6780 StartStopWithChild netcoreapp3.1 10.2μs 57.1ns 361ns 0.01 0.005 0 5.8 KB
#6780 StartStopWithChild net472 16.3μs 37.5ns 145ns 1.05 0.313 0.0962 6.21 KB
Benchmarks.Trace.AgentWriterBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master WriteAndFlushEnrichedTraces net6.0 517μs 280ns 969ns 0 0 0 2.7 KB
master WriteAndFlushEnrichedTraces netcoreapp3.1 658μs 407ns 1.52μs 0 0 0 2.7 KB
master WriteAndFlushEnrichedTraces net472 844μs 471ns 1.83μs 0.422 0 0 3.3 KB
#6780 WriteAndFlushEnrichedTraces net6.0 481μs 575ns 2.23μs 0 0 0 2.7 KB
#6780 WriteAndFlushEnrichedTraces netcoreapp3.1 645μs 397ns 1.54μs 0 0 0 2.7 KB
#6780 WriteAndFlushEnrichedTraces net472 839μs 932ns 3.61μs 0.419 0 0 3.3 KB
Benchmarks.Trace.AspNetCoreBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master SendRequest net6.0 129μs 565ns 2.19μs 0.194 0 0 14.47 KB
master SendRequest netcoreapp3.1 148μs 131ns 490ns 0.223 0 0 17.27 KB
master SendRequest net472 0.000427ns 0.000245ns 0.000918ns 0 0 0 0 b
#6780 SendRequest net6.0 131μs 533ns 2.06μs 0.196 0 0 14.47 KB
#6780 SendRequest netcoreapp3.1 148μs 230ns 891ns 0.221 0 0 17.27 KB
#6780 SendRequest net472 0.000511ns 0.000208ns 0.000804ns 0 0 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 597μs 3.88μs 37.8μs 0.604 0 0 41.7 KB
master WriteAndFlushEnrichedTraces netcoreapp3.1 682μs 2.83μs 10.2μs 0.332 0 0 41.7 KB
master WriteAndFlushEnrichedTraces net472 851μs 4.11μs 15.9μs 8.08 2.55 0.425 53.32 KB
#6780 WriteAndFlushEnrichedTraces net6.0 584μs 3.13μs 17.1μs 0.306 0 0 41.64 KB
#6780 WriteAndFlushEnrichedTraces netcoreapp3.1 671μs 3.38μs 15.8μs 0.342 0 0 41.81 KB
#6780 WriteAndFlushEnrichedTraces net472 858μs 3.75μs 15μs 8.33 2.5 0.417 53.29 KB
Benchmarks.Trace.DbCommandBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master ExecuteNonQuery net6.0 1.34μs 1.54ns 5.77ns 0.0142 0 0 1.02 KB
master ExecuteNonQuery netcoreapp3.1 1.79μs 1.82ns 7.06ns 0.0136 0 0 1.02 KB
master ExecuteNonQuery net472 2.06μs 2.46ns 9.52ns 0.156 0.00103 0 987 B
#6780 ExecuteNonQuery net6.0 1.35μs 1.17ns 4.53ns 0.0142 0 0 1.02 KB
#6780 ExecuteNonQuery netcoreapp3.1 1.79μs 3ns 11.6ns 0.0133 0 0 1.02 KB
#6780 ExecuteNonQuery net472 2.15μs 3.02ns 11.7ns 0.156 0.00107 0 987 B
Benchmarks.Trace.ElasticsearchBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master CallElasticsearch net6.0 1.24μs 0.25ns 0.936ns 0.0136 0 0 976 B
master CallElasticsearch netcoreapp3.1 1.59μs 2.22ns 8.32ns 0.0135 0 0 976 B
master CallElasticsearch net472 2.71μs 1.55ns 5.81ns 0.157 0 0 995 B
master CallElasticsearchAsync net6.0 1.32μs 0.547ns 2.05ns 0.0132 0 0 952 B
master CallElasticsearchAsync netcoreapp3.1 1.63μs 0.495ns 1.92ns 0.0143 0 0 1.02 KB
master CallElasticsearchAsync net472 2.71μs 1.18ns 4.41ns 0.167 0 0 1.05 KB
#6780 CallElasticsearch net6.0 1.14μs 2.95ns 11ns 0.0139 0 0 976 B
#6780 CallElasticsearch netcoreapp3.1 1.58μs 0.911ns 3.53ns 0.0134 0 0 976 B
#6780 CallElasticsearch net472 2.53μs 2.27ns 8.78ns 0.158 0 0 995 B
#6780 CallElasticsearchAsync net6.0 1.22μs 0.392ns 1.47ns 0.0134 0 0 952 B
#6780 CallElasticsearchAsync netcoreapp3.1 1.58μs 0.492ns 1.9ns 0.0136 0 0 1.02 KB
#6780 CallElasticsearchAsync net472 2.64μs 1.25ns 4.85ns 0.167 0 0 1.05 KB
Benchmarks.Trace.GraphQLBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master ExecuteAsync net6.0 1.32μs 0.707ns 2.64ns 0.0131 0 0 952 B
master ExecuteAsync netcoreapp3.1 1.63μs 2.42ns 9.04ns 0.0128 0 0 952 B
master ExecuteAsync net472 1.78μs 0.353ns 1.32ns 0.145 0 0 915 B
#6780 ExecuteAsync net6.0 1.41μs 0.417ns 1.56ns 0.0134 0 0 952 B
#6780 ExecuteAsync netcoreapp3.1 1.61μs 1.1ns 4.27ns 0.0129 0 0 952 B
#6780 ExecuteAsync net472 1.8μs 0.386ns 1.44ns 0.145 0 0 915 B
Benchmarks.Trace.HttpClientBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master SendAsync net6.0 4.43μs 1.83ns 6.86ns 0.031 0 0 2.31 KB
master SendAsync netcoreapp3.1 5.36μs 1.44ns 5.57ns 0.0375 0 0 2.85 KB
master SendAsync net472 7.55μs 2.14ns 8ns 0.496 0 0 3.12 KB
#6780 SendAsync net6.0 4.38μs 1.16ns 4.17ns 0.0328 0 0 2.31 KB
#6780 SendAsync netcoreapp3.1 5.35μs 1.18ns 4.58ns 0.0373 0 0 2.85 KB
#6780 SendAsync net472 7.42μs 1.46ns 5.45ns 0.493 0 0 3.12 KB
Benchmarks.Trace.ILoggerBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master EnrichedLog net6.0 1.62μs 1.01ns 3.78ns 0.0238 0 0 1.69 KB
master EnrichedLog netcoreapp3.1 2.35μs 1.11ns 4.29ns 0.0224 0 0 1.69 KB
master EnrichedLog net472 2.57μs 1.6ns 6ns 0.257 0 0 1.62 KB
#6780 EnrichedLog net6.0 1.48μs 0.592ns 2.13ns 0.0238 0 0 1.69 KB
#6780 EnrichedLog netcoreapp3.1 2.12μs 0.609ns 2.36ns 0.0223 0 0 1.69 KB
#6780 EnrichedLog net472 2.52μs 0.915ns 3.54ns 0.258 0 0 1.62 KB
Benchmarks.Trace.Log4netBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master EnrichedLog net6.0 111μs 80.5ns 301ns 0.0557 0 0 4.3 KB
master EnrichedLog netcoreapp3.1 117μs 157ns 607ns 0.0581 0 0 4.3 KB
master EnrichedLog net472 152μs 157ns 609ns 0.685 0.228 0 4.49 KB
#6780 EnrichedLog net6.0 114μs 76.5ns 286ns 0.0558 0 0 4.3 KB
#6780 EnrichedLog netcoreapp3.1 115μs 98.4ns 368ns 0 0 0 4.3 KB
#6780 EnrichedLog net472 152μs 131ns 491ns 0.682 0.227 0 4.49 KB
Benchmarks.Trace.NLogBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master EnrichedLog net6.0 2.96μs 1.47ns 5.51ns 0.0312 0 0 2.25 KB
master EnrichedLog netcoreapp3.1 4.17μs 4.88ns 18.9ns 0.0289 0 0 2.25 KB
master EnrichedLog net472 4.76μs 2.5ns 9.69ns 0.328 0 0 2.07 KB
#6780 EnrichedLog net6.0 3.08μs 1.51ns 5.67ns 0.0308 0 0 2.25 KB
#6780 EnrichedLog netcoreapp3.1 4.29μs 7.45ns 28.8ns 0.0301 0 0 2.25 KB
#6780 EnrichedLog net472 5.12μs 5.46ns 21.1ns 0.328 0 0 2.07 KB
Benchmarks.Trace.RedisBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master SendReceive net6.0 1.31μs 1.43ns 5.14ns 0.0163 0 0 1.14 KB
master SendReceive netcoreapp3.1 1.85μs 0.713ns 2.67ns 0.0158 0 0 1.14 KB
master SendReceive net472 2.06μs 0.874ns 3.27ns 0.183 0 0 1.16 KB
#6780 SendReceive net6.0 1.4μs 0.677ns 2.53ns 0.0161 0 0 1.14 KB
#6780 SendReceive netcoreapp3.1 1.77μs 2.33ns 9.02ns 0.015 0 0 1.14 KB
#6780 SendReceive net472 2.09μs 0.568ns 2.12ns 0.183 0 0 1.16 KB
Benchmarks.Trace.SerilogBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master EnrichedLog net6.0 2.85μs 1.13ns 4.07ns 0.0227 0 0 1.62 KB
master EnrichedLog netcoreapp3.1 3.83μs 0.963ns 3.73ns 0.023 0 0 1.67 KB
master EnrichedLog net472 4.37μs 2.49ns 9.31ns 0.328 0 0 2.07 KB
#6780 EnrichedLog net6.0 2.77μs 1.05ns 4.07ns 0.0222 0 0 1.62 KB
#6780 EnrichedLog netcoreapp3.1 4.02μs 3.24ns 12.6ns 0.0219 0 0 1.67 KB
#6780 EnrichedLog net472 4.38μs 2.51ns 9.72ns 0.328 0 0 2.07 KB
Benchmarks.Trace.SpanBenchmark - Slower ⚠️ Same allocations ✔️

Slower ⚠️ in #6780

Benchmark diff/base Base Median (ns) Diff Median (ns) Modality
Benchmarks.Trace.SpanBenchmark.StartFinishSpan‑netcoreapp3.1 1.137 591.89 672.97

Faster 🎉 in #6780

Benchmark base/diff Base Median (ns) Diff Median (ns) Modality
Benchmarks.Trace.SpanBenchmark.StartFinishScope‑net6.0 1.127 554.09 491.85

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master StartFinishSpan net6.0 396ns 0.121ns 0.471ns 0.0081 0 0 576 B
master StartFinishSpan netcoreapp3.1 592ns 0.366ns 1.37ns 0.00774 0 0 576 B
master StartFinishSpan net472 594ns 0.319ns 1.23ns 0.0916 0 0 578 B
master StartFinishScope net6.0 554ns 0.151ns 0.523ns 0.00986 0 0 696 B
master StartFinishScope netcoreapp3.1 722ns 0.372ns 1.39ns 0.00937 0 0 696 B
master StartFinishScope net472 896ns 0.264ns 1.02ns 0.105 0 0 658 B
#6780 StartFinishSpan net6.0 399ns 0.0734ns 0.275ns 0.0081 0 0 576 B
#6780 StartFinishSpan netcoreapp3.1 673ns 0.382ns 1.48ns 0.00765 0 0 576 B
#6780 StartFinishSpan net472 660ns 0.659ns 2.55ns 0.0915 0 0 578 B
#6780 StartFinishScope net6.0 492ns 0.128ns 0.495ns 0.00986 0 0 696 B
#6780 StartFinishScope netcoreapp3.1 686ns 0.429ns 1.66ns 0.0094 0 0 696 B
#6780 StartFinishScope net472 889ns 0.656ns 2.54ns 0.104 0 0 658 B
Benchmarks.Trace.TraceAnnotationsBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master RunOnMethodBegin net6.0 595ns 0.146ns 0.526ns 0.00989 0 0 696 B
master RunOnMethodBegin netcoreapp3.1 938ns 0.635ns 2.46ns 0.00918 0 0 696 B
master RunOnMethodBegin net472 1.07μs 0.232ns 0.898ns 0.104 0 0 658 B
#6780 RunOnMethodBegin net6.0 616ns 0.189ns 0.707ns 0.00989 0 0 696 B
#6780 RunOnMethodBegin netcoreapp3.1 969ns 0.311ns 1.16ns 0.00928 0 0 696 B
#6780 RunOnMethodBegin net472 1.09μs 0.214ns 0.8ns 0.105 0 0 658 B

@bouwkast bouwkast merged commit 07867ee into master Mar 19, 2025
127 of 130 checks passed
@bouwkast bouwkast deleted the steven/disable-mergequeue branch March 19, 2025 21:35
@github-actions github-actions bot added this to the vNext-v3 milestone Mar 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrewlock andrewlock

@link04 link04

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
vNext-v3
Development

Successfully merging this pull request may close these issues.
3 participants
@bouwkast @andrewlock @link04