Fix GeneratePackageVersions#6094
Conversation
|
|
||
| [SkippableTheory] | ||
| [MemberData(nameof(PackageVersions.MSTest), MemberType = typeof(PackageVersions))] | ||
| [MemberData(nameof(PackageVersions.MSTest2Retries), MemberType = typeof(PackageVersions))] |
There was a problem hiding this comment.
@tonyredondo Is this right? Wasn't sure as it was using MSTest (I think they map to the same versions though)
| #if NET8_0 | ||
| new object[] { "2.0.0" }, | ||
| new object[] { "2.2.10" }, | ||
| new object[] { "3.5.2" }, |
There was a problem hiding this comment.
Oops didn't catch this version bump to 3.6.0, hopefully okay?
There was a problem hiding this comment.
Oops didn't catch this version bump to 3.6.0, hopefully okay?
Yeah, that should be fine, we merged support for 3.6.0 already. Though why aren't the other ones bumped to 3.6.0 too 🤔
There was a problem hiding this comment.
Yes, this is weird, I wonder if is something to do with running the generator on mac or something...
There was a problem hiding this comment.
Updated the other ones - I was on a different branch so I deleted a previous commit which is why the others weren't updated either
| #if NET8_0 | ||
| new object[] { "2.0.0" }, | ||
| new object[] { "2.2.10" }, | ||
| new object[] { "3.5.2" }, |
There was a problem hiding this comment.
Oops didn't catch this version bump to 3.6.0, hopefully okay?
Yeah, that should be fine, we merged support for 3.6.0 already. Though why aren't the other ones bumped to 3.6.0 too 🤔
Datadog ReportBranch report: ✅ 0 Failed, 369777 Passed, 2103 Skipped, 15h 33m 27.72s Total Time ⌛ Performance Regressions vs Default Branch (1)
|
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:
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 (6094) - mean (70ms) : 68, 73
. : milestone, 70,
master - mean (71ms) : 68, 73
. : milestone, 71,
section CallTarget+Inlining+NGEN
This PR (6094) - mean (1,109ms) : 1086, 1133
. : milestone, 1109,
master - mean (1,108ms) : 1087, 1130
. : milestone, 1108,
gantt
title Execution time (ms) FakeDbCommand (.NET Core 3.1)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (6094) - mean (109ms) : 106, 112
. : milestone, 109,
master - mean (110ms) : 106, 113
. : milestone, 110,
section CallTarget+Inlining+NGEN
This PR (6094) - mean (772ms) : 751, 793
. : milestone, 772,
master - mean (776ms) : 759, 793
. : milestone, 776,
gantt
title Execution time (ms) FakeDbCommand (.NET 6)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (6094) - mean (93ms) : 90, 96
. : milestone, 93,
master - mean (93ms) : 90, 97
. : milestone, 93,
section CallTarget+Inlining+NGEN
This PR (6094) - mean (730ms) : 712, 748
. : milestone, 730,
master - mean (733ms) : 715, 752
. : milestone, 733,
gantt
title Execution time (ms) HttpMessageHandler (.NET Framework 4.6.2)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (6094) - mean (190ms) : 188, 193
. : milestone, 190,
master - mean (191ms) : 187, 194
. : milestone, 191,
section CallTarget+Inlining+NGEN
This PR (6094) - mean (1,200ms) : 1175, 1225
. : milestone, 1200,
master - mean (1,198ms) : 1175, 1222
. : milestone, 1198,
gantt
title Execution time (ms) HttpMessageHandler (.NET Core 3.1)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (6094) - mean (276ms) : 272, 280
. : milestone, 276,
master - mean (277ms) : 273, 280
. : milestone, 277,
section CallTarget+Inlining+NGEN
This PR (6094) - mean (942ms) : 925, 959
. : milestone, 942,
master - mean (941ms) : 924, 959
. : milestone, 941,
gantt
title Execution time (ms) HttpMessageHandler (.NET 6)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (6094) - mean (265ms) : 261, 268
. : milestone, 265,
master - mean (265ms) : 262, 269
. : milestone, 265,
section CallTarget+Inlining+NGEN
This PR (6094) - mean (928ms) : 909, 946
. : milestone, 928,
master - mean (926ms) : 904, 947
. : milestone, 926,
|
Benchmarks Report for tracer 🐌Benchmarks for #6094 compared to master:
The following thresholds were used for comparing the benchmark speeds:
Allocation changes below 0.5% are ignored. Benchmark detailsBenchmarks.Trace.ActivityBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.AgentWriterBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.AspNetCoreBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.CIVisibilityProtocolWriterBenchmark - Same speed ✔️ Fewer allocations 🎉
|
| Benchmark | Base Allocated | Diff Allocated | Change | Change % |
|---|---|---|---|---|
| Benchmarks.Trace.CIVisibilityProtocolWriterBenchmark.WriteAndFlushEnrichedTraces‑net6.0 | 41.76 KB | 41.52 KB | -238 B | -0.57% |
Raw results
| Branch | Method | Toolchain | Mean | StdError | StdDev | Gen 0 | Gen 1 | Gen 2 | Allocated |
|---|---|---|---|---|---|---|---|---|---|
| master | WriteAndFlushEnrichedTraces |
net6.0 | 569μs | 2.31μs | 8.93μs | 0.571 | 0 | 0 | 41.76 KB |
| master | WriteAndFlushEnrichedTraces |
netcoreapp3.1 | 676μs | 3.48μs | 20μs | 0.327 | 0 | 0 | 41.78 KB |
| master | WriteAndFlushEnrichedTraces |
net472 | 864μs | 4.29μs | 17.7μs | 8.42 | 2.66 | 0.443 | 53.33 KB |
| #6094 | WriteAndFlushEnrichedTraces |
net6.0 | 562μs | 1.56μs | 5.63μs | 0.553 | 0 | 0 | 41.52 KB |
| #6094 | WriteAndFlushEnrichedTraces |
netcoreapp3.1 | 686μs | 2.03μs | 7.59μs | 0.342 | 0 | 0 | 41.71 KB |
| #6094 | WriteAndFlushEnrichedTraces |
net472 | 837μs | 3.68μs | 14.3μs | 8.33 | 2.5 | 0.417 | 53.28 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.28μs | 1ns | 3.89ns | 0.0142 | 0 | 0 | 1.02 KB |
| master | ExecuteNonQuery |
netcoreapp3.1 | 1.78μs | 1.6ns | 5.76ns | 0.0135 | 0 | 0 | 1.02 KB |
| master | ExecuteNonQuery |
net472 | 2.12μs | 2.36ns | 9.12ns | 0.156 | 0 | 0 | 987 B |
| #6094 | ExecuteNonQuery |
net6.0 | 1.26μs | 1.11ns | 4.01ns | 0.0145 | 0 | 0 | 1.02 KB |
| #6094 | ExecuteNonQuery |
netcoreapp3.1 | 1.78μs | 1.95ns | 7.54ns | 0.0133 | 0 | 0 | 1.02 KB |
| #6094 | ExecuteNonQuery |
net472 | 2.11μs | 1.94ns | 7.53ns | 0.156 | 0 | 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.28μs | 0.84ns | 3.14ns | 0.0136 | 0 | 0 | 976 B |
| master | CallElasticsearch |
netcoreapp3.1 | 1.52μs | 0.613ns | 2.29ns | 0.013 | 0 | 0 | 976 B |
| master | CallElasticsearch |
net472 | 2.49μs | 4.48ns | 17.4ns | 0.158 | 0 | 0 | 995 B |
| master | CallElasticsearchAsync |
net6.0 | 1.33μs | 1.11ns | 4.15ns | 0.0133 | 0 | 0 | 952 B |
| master | CallElasticsearchAsync |
netcoreapp3.1 | 1.61μs | 0.68ns | 2.45ns | 0.0138 | 0 | 0 | 1.02 KB |
| master | CallElasticsearchAsync |
net472 | 2.51μs | 0.892ns | 3.34ns | 0.167 | 0 | 0 | 1.05 KB |
| #6094 | CallElasticsearch |
net6.0 | 1.21μs | 0.264ns | 0.953ns | 0.014 | 0 | 0 | 976 B |
| #6094 | CallElasticsearch |
netcoreapp3.1 | 1.54μs | 0.619ns | 2.32ns | 0.0131 | 0 | 0 | 976 B |
| #6094 | CallElasticsearch |
net472 | 2.47μs | 4.74ns | 17.7ns | 0.157 | 0 | 0 | 995 B |
| #6094 | CallElasticsearchAsync |
net6.0 | 1.3μs | 0.587ns | 2.2ns | 0.013 | 0 | 0 | 952 B |
| #6094 | CallElasticsearchAsync |
netcoreapp3.1 | 1.67μs | 1.24ns | 4.48ns | 0.0133 | 0 | 0 | 1.02 KB |
| #6094 | CallElasticsearchAsync |
net472 | 2.59μs | 0.678ns | 2.54ns | 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.36μs | 0.705ns | 2.64ns | 0.0128 | 0 | 0 | 952 B |
| master | ExecuteAsync |
netcoreapp3.1 | 1.66μs | 0.896ns | 3.47ns | 0.0124 | 0 | 0 | 952 B |
| master | ExecuteAsync |
net472 | 1.73μs | 0.987ns | 3.82ns | 0.145 | 0 | 0 | 915 B |
| #6094 | ExecuteAsync |
net6.0 | 1.34μs | 1.82ns | 6.58ns | 0.0133 | 0 | 0 | 952 B |
| #6094 | ExecuteAsync |
netcoreapp3.1 | 1.63μs | 0.909ns | 3.4ns | 0.0122 | 0 | 0 | 952 B |
| #6094 | ExecuteAsync |
net472 | 1.79μs | 1.34ns | 5.2ns | 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.17μs | 2.36ns | 8.85ns | 0.0295 | 0 | 0 | 2.22 KB |
| master | SendAsync |
netcoreapp3.1 | 5.24μs | 1.98ns | 7.41ns | 0.0367 | 0 | 0 | 2.76 KB |
| master | SendAsync |
net472 | 7.73μs | 1.67ns | 6.24ns | 0.498 | 0 | 0 | 3.15 KB |
| #6094 | SendAsync |
net6.0 | 4.07μs | 1.84ns | 6.87ns | 0.0309 | 0 | 0 | 2.22 KB |
| #6094 | SendAsync |
netcoreapp3.1 | 5.14μs | 2.96ns | 11.5ns | 0.036 | 0 | 0 | 2.76 KB |
| #6094 | SendAsync |
net472 | 7.74μs | 3.61ns | 14ns | 0.497 | 0 | 0 | 3.15 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.46μs | 0.876ns | 3.28ns | 0.0229 | 0 | 0 | 1.64 KB |
| master | EnrichedLog |
netcoreapp3.1 | 2.2μs | 1.7ns | 6.36ns | 0.0214 | 0 | 0 | 1.64 KB |
| master | EnrichedLog |
net472 | 2.51μs | 1.12ns | 4.34ns | 0.249 | 0 | 0 | 1.57 KB |
| #6094 | EnrichedLog |
net6.0 | 1.43μs | 1.06ns | 4.09ns | 0.023 | 0 | 0 | 1.64 KB |
| #6094 | EnrichedLog |
netcoreapp3.1 | 2.2μs | 0.685ns | 4.33ns | 0.0218 | 0 | 0 | 1.64 KB |
| #6094 | EnrichedLog |
net472 | 2.45μs | 0.686ns | 2.66ns | 0.249 | 0 | 0 | 1.57 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 | 113μs | 200ns | 748ns | 0.0566 | 0 | 0 | 4.28 KB |
| master | EnrichedLog |
netcoreapp3.1 | 118μs | 90.1ns | 325ns | 0 | 0 | 0 | 4.28 KB |
| master | EnrichedLog |
net472 | 146μs | 128ns | 497ns | 0.654 | 0.218 | 0 | 4.46 KB |
| #6094 | EnrichedLog |
net6.0 | 115μs | 96.9ns | 375ns | 0 | 0 | 0 | 4.28 KB |
| #6094 | EnrichedLog |
netcoreapp3.1 | 119μs | 141ns | 545ns | 0 | 0 | 0 | 4.28 KB |
| #6094 | EnrichedLog |
net472 | 147μs | 213ns | 827ns | 0.657 | 0.219 | 0 | 4.46 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 | 3.19μs | 0.64ns | 2.31ns | 0.0303 | 0 | 0 | 2.2 KB |
| master | EnrichedLog |
netcoreapp3.1 | 4.14μs | 1.96ns | 7.57ns | 0.0289 | 0 | 0 | 2.2 KB |
| master | EnrichedLog |
net472 | 4.96μs | 1.55ns | 5.81ns | 0.319 | 0 | 0 | 2.02 KB |
| #6094 | EnrichedLog |
net6.0 | 3.08μs | 1.03ns | 3.87ns | 0.0307 | 0 | 0 | 2.2 KB |
| #6094 | EnrichedLog |
netcoreapp3.1 | 4.29μs | 0.634ns | 2.46ns | 0.0279 | 0 | 0 | 2.2 KB |
| #6094 | EnrichedLog |
net472 | 4.86μs | 2.05ns | 7.93ns | 0.319 | 0 | 0 | 2.02 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.4μs | 0.987ns | 3.82ns | 0.0161 | 0 | 0 | 1.14 KB |
| master | SendReceive |
netcoreapp3.1 | 1.73μs | 0.848ns | 3.29ns | 0.0154 | 0 | 0 | 1.14 KB |
| master | SendReceive |
net472 | 2.19μs | 0.726ns | 2.81ns | 0.184 | 0.00109 | 0 | 1.16 KB |
| #6094 | SendReceive |
net6.0 | 1.37μs | 1.72ns | 6.64ns | 0.0158 | 0 | 0 | 1.14 KB |
| #6094 | SendReceive |
netcoreapp3.1 | 1.78μs | 1.69ns | 6.54ns | 0.015 | 0 | 0 | 1.14 KB |
| #6094 | SendReceive |
net472 | 2.13μs | 0.743ns | 2.88ns | 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.87μs | 4.15ns | 16.1ns | 0.0217 | 0 | 0 | 1.6 KB |
| master | EnrichedLog |
netcoreapp3.1 | 3.91μs | 1.31ns | 4.9ns | 0.0216 | 0 | 0 | 1.65 KB |
| master | EnrichedLog |
net472 | 4.59μs | 2.34ns | 8.77ns | 0.324 | 0 | 0 | 2.04 KB |
| #6094 | EnrichedLog |
net6.0 | 2.77μs | 1.15ns | 4.47ns | 0.0223 | 0 | 0 | 1.6 KB |
| #6094 | EnrichedLog |
netcoreapp3.1 | 3.9μs | 2.79ns | 10.4ns | 0.0213 | 0 | 0 | 1.65 KB |
| #6094 | EnrichedLog |
net472 | 4.5μs | 1.23ns | 4.75ns | 0.324 | 0 | 0 | 2.04 KB |
Benchmarks.Trace.SpanBenchmark - Slower ⚠️ Same allocations ✔️
Slower ⚠️ in #6094
Benchmark
diff/base
Base Median (ns)
Diff Median (ns)
Modality
Benchmarks.Trace.SpanBenchmark.StartFinishScope‑netcoreapp3.1
1.182
658.10
778.09
Faster 🎉 in #6094
Benchmark
base/diff
Base Median (ns)
Diff Median (ns)
Modality
Benchmarks.Trace.SpanBenchmark.StartFinishSpan‑net472
1.159
712.74
614.76
| Benchmark | diff/base | Base Median (ns) | Diff Median (ns) | Modality |
|---|---|---|---|---|
| Benchmarks.Trace.SpanBenchmark.StartFinishScope‑netcoreapp3.1 | 1.182 | 658.10 | 778.09 |
| Benchmark | base/diff | Base Median (ns) | Diff Median (ns) | Modality |
|---|---|---|---|---|
| Benchmarks.Trace.SpanBenchmark.StartFinishSpan‑net472 | 1.159 | 712.74 | 614.76 |
Raw results
| Branch | Method | Toolchain | Mean | StdError | StdDev | Gen 0 | Gen 1 | Gen 2 | Allocated |
|---|---|---|---|---|---|---|---|---|---|
| master | StartFinishSpan |
net6.0 | 408ns | 0.311ns | 1.2ns | 0.00798 | 0 | 0 | 576 B |
| master | StartFinishSpan |
netcoreapp3.1 | 553ns | 0.485ns | 1.88ns | 0.00784 | 0 | 0 | 576 B |
| master | StartFinishSpan |
net472 | 714ns | 0.782ns | 3.03ns | 0.0918 | 0 | 0 | 578 B |
| master | StartFinishScope |
net6.0 | 498ns | 1.88ns | 7.27ns | 0.00982 | 0 | 0 | 696 B |
| master | StartFinishScope |
netcoreapp3.1 | 658ns | 0.426ns | 1.65ns | 0.00927 | 0 | 0 | 696 B |
| master | StartFinishScope |
net472 | 841ns | 0.486ns | 1.88ns | 0.104 | 0 | 0 | 658 B |
| #6094 | StartFinishSpan |
net6.0 | 413ns | 0.209ns | 0.808ns | 0.00802 | 0 | 0 | 576 B |
| #6094 | StartFinishSpan |
netcoreapp3.1 | 545ns | 0.465ns | 1.8ns | 0.00789 | 0 | 0 | 576 B |
| #6094 | StartFinishSpan |
net472 | 614ns | 0.435ns | 1.63ns | 0.0917 | 0 | 0 | 578 B |
| #6094 | StartFinishScope |
net6.0 | 550ns | 1.09ns | 3.93ns | 0.0098 | 0 | 0 | 696 B |
| #6094 | StartFinishScope |
netcoreapp3.1 | 778ns | 0.525ns | 2.03ns | 0.00922 | 0 | 0 | 696 B |
| #6094 | StartFinishScope |
net472 | 910ns | 0.725ns | 2.71ns | 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 | 652ns | 0.315ns | 1.22ns | 0.00978 | 0 | 0 | 696 B |
| master | RunOnMethodBegin |
netcoreapp3.1 | 1.02μs | 1.84ns | 7.12ns | 0.00924 | 0 | 0 | 696 B |
| master | RunOnMethodBegin |
net472 | 1.16μs | 3.31ns | 12.8ns | 0.104 | 0 | 0 | 658 B |
| #6094 | RunOnMethodBegin |
net6.0 | 605ns | 0.78ns | 3.02ns | 0.00987 | 0 | 0 | 696 B |
| #6094 | RunOnMethodBegin |
netcoreapp3.1 | 922ns | 0.574ns | 2.22ns | 0.00961 | 0 | 0 | 696 B |
| #6094 | RunOnMethodBegin |
net472 | 1.11μs | 0.681ns | 2.55ns | 0.104 | 0 | 0 | 658 B |
## Summary of changes
Adds new integration names for PackageVersions as they must be unique.
## Reason for change
Errors
## Implementation details
Added `Retries` postfix
## Test coverage
- tracer/build.ps1 GeneratePackageVersions
## Other details
<!-- Fixes #{issue} -->
<!-- ⚠️ Note: where possible, please obtain 2 approvals prior to
merging. Unless CODEOWNERS specifies otherwise, for external teams it is
typically best to have one review from a team member, and one review
from apm-dotnet. Trivial changes do not require 2 reviews. -->
Summary of changes
Adds new integration names for PackageVersions as they must be unique.
Reason for change
Errors
Implementation details
Added
RetriespostfixTest coverage
Other details