Fix 2.x smoke test and installer tests #5989
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 64a0bdb.
andrewlock
added
area:builds
Datadog ReportBranch report: ✅ 0 Failed, 347277 Passed, 1803 Skipped, 14h 26m 36.88s Total Time |
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 (5989) - mean (74ms) : 64, 84
. : milestone, 74,
master - mean (69ms) : 67, 71
. : milestone, 69,
section CallTarget+Inlining+NGEN
This PR (5989) - mean (1,036ms) : 1016, 1056
. : milestone, 1036,
master - mean (1,077ms) : 1053, 1101
. : milestone, 1077,
gantt
title Execution time (ms) FakeDbCommand (.NET Core 3.1)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (5989) - mean (109ms) : 105, 114
. : milestone, 109,
master - mean (109ms) : 105, 112
. : milestone, 109,
section CallTarget+Inlining+NGEN
This PR (5989) - mean (722ms) : 698, 745
. : milestone, 722,
master - mean (758ms) : 739, 778
. : milestone, 758,
gantt
title Execution time (ms) FakeDbCommand (.NET 6)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (5989) - mean (93ms) : 89, 96
. : milestone, 93,
master - mean (92ms) : 90, 95
. : milestone, 92,
section CallTarget+Inlining+NGEN
This PR (5989) - mean (673ms) : 651, 696
. : milestone, 673,
master - mean (710ms) : 697, 724
. : milestone, 710,
gantt
title Execution time (ms) HttpMessageHandler (.NET Framework 4.6.2)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (5989) - mean (191ms) : 188, 195
. : milestone, 191,
master - mean (190ms) : 187, 192
. : milestone, 190,
section CallTarget+Inlining+NGEN
This PR (5989) - mean (1,122ms) : 1091, 1153
. : milestone, 1122,
master - mean (1,160ms) : 1137, 1184
. : milestone, 1160,
gantt
title Execution time (ms) HttpMessageHandler (.NET Core 3.1)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (5989) - mean (276ms) : 272, 279
. : milestone, 276,
master - mean (274ms) : 270, 279
. : milestone, 274,
section CallTarget+Inlining+NGEN
This PR (5989) - mean (886ms) : 865, 908
. : milestone, 886,
master - mean (922ms) : 902, 942
. : milestone, 922,
gantt
title Execution time (ms) HttpMessageHandler (.NET 6)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (5989) - mean (265ms) : 261, 269
. : milestone, 265,
master - mean (264ms) : 259, 268
. : milestone, 264,
section CallTarget+Inlining+NGEN
This PR (5989) - mean (870ms) : 848, 893
. : milestone, 870,
master - mean (902ms) : 883, 922
. : milestone, 902,
|
|
Closed in favor of #5994 |
Benchmarks Report for tracer 🐌Benchmarks for #5989 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 ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.DbCommandBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.ElasticsearchBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.GraphQLBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.HttpClientBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.ILoggerBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.Log4netBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.NLogBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.RedisBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.SerilogBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.SpanBenchmark - Faster 🎉 Same allocations ✔️
|
| Benchmark | base/diff | Base Median (ns) | Diff Median (ns) | Modality |
|---|---|---|---|---|
| Benchmarks.Trace.SpanBenchmark.StartFinishScope‑net6.0 | 1.185 | 577.30 | 486.99 |
Raw results
| Branch | Method | Toolchain | Mean | StdError | StdDev | Gen 0 | Gen 1 | Gen 2 | Allocated |
|---|---|---|---|---|---|---|---|---|---|
| master | StartFinishSpan |
net6.0 | 406ns | 0.129ns | 0.499ns | 0.00798 | 0 | 0 | 576 B |
| master | StartFinishSpan |
netcoreapp3.1 | 570ns | 0.198ns | 0.741ns | 0.00788 | 0 | 0 | 576 B |
| master | StartFinishSpan |
net472 | 663ns | 2.62ns | 9.8ns | 0.0917 | 0 | 0 | 578 B |
| master | StartFinishScope |
net6.0 | 577ns | 0.385ns | 1.49ns | 0.00984 | 0 | 0 | 696 B |
| master | StartFinishScope |
netcoreapp3.1 | 766ns | 0.368ns | 1.43ns | 0.00957 | 0 | 0 | 696 B |
| master | StartFinishScope |
net472 | 846ns | 0.994ns | 3.72ns | 0.104 | 0 | 0 | 658 B |
| #5989 | StartFinishSpan |
net6.0 | 417ns | 0.136ns | 0.528ns | 0.00799 | 0 | 0 | 576 B |
| #5989 | StartFinishSpan |
netcoreapp3.1 | 541ns | 0.309ns | 1.2ns | 0.0078 | 0 | 0 | 576 B |
| #5989 | StartFinishSpan |
net472 | 678ns | 0.549ns | 2.05ns | 0.0916 | 0 | 0 | 578 B |
| #5989 | StartFinishScope |
net6.0 | 487ns | 0.234ns | 0.906ns | 0.00976 | 0 | 0 | 696 B |
| #5989 | StartFinishScope |
netcoreapp3.1 | 763ns | 0.519ns | 2.01ns | 0.00918 | 0 | 0 | 696 B |
| #5989 | StartFinishScope |
net472 | 909ns | 0.409ns | 1.53ns | 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 | 680ns | 0.211ns | 0.818ns | 0.00964 | 0 | 0 | 696 B |
| master | RunOnMethodBegin |
netcoreapp3.1 | 965ns | 0.47ns | 1.76ns | 0.00965 | 0 | 0 | 696 B |
| master | RunOnMethodBegin |
net472 | 1.09μs | 1.45ns | 5.62ns | 0.104 | 0 | 0 | 658 B |
| #5989 | RunOnMethodBegin |
net6.0 | 709ns | 0.472ns | 1.83ns | 0.00995 | 0 | 0 | 696 B |
| #5989 | RunOnMethodBegin |
netcoreapp3.1 | 899ns | 0.408ns | 1.47ns | 0.00969 | 0 | 0 | 696 B |
| #5989 | RunOnMethodBegin |
net472 | 1.12μs | 1.63ns | 6.29ns | 0.104 | 0 | 0 | 658 B |
andrewlock
added a commit
that referenced
this pull request
Sep 6, 2024
## Summary of changes - Fix nuget/dd-trace installer tests in 2.x branch - Pin system tests in 2.x branch ## Reason for change The code we were using to install the "local" builds of the NuGet packages added the local source. However the dotnet restore was looking in both the local and nuget.org sources, and installing the highest version it found. That worked fine until we released 3.2.0 publicly and expect to install 2.59.0 of the local build. For system-tests, we had to change how things work to support v3 (DataDog/system-tests#2962), but unfortunately that breaks for v2. ## Implementation details Install an explicit version of the tracer. As this version is never in the public nuget.org source but _is_ in the local source, it uses that. > In #5989 I tried a different approach but it just didn't work. For system tests, just pinning to the specific commit prior to the v3 PR being merged. Having to thread the version through everywhere is kinda horrible, but is the only thing I could find that works. ## Test coverage Running [a full installer run here](https://dev.azure.com/datadoghq/dd-trace-dotnet/_build/results?buildId=163526&view=results) ## Other details The whole approach should be rewritten to be managed by Nuke tbh, if we ever find time This PR also contains a backport of - #5988 for simplicity Supersedes - #5989
andrewlock
added a commit
that referenced
this pull request
Sep 11, 2024
## Summary of changes - Fix nuget/dd-trace installer tests in 2.x branch ## Reason for change The code we were using to install the "local" builds of the NuGet packages added the local source. However the dotnet restore was looking in both the local and nuget.org sources, and installing the highest version it found. That worked fine until we released 3.2.0 publicly and expect to install 2.59.0 of the local build. ## Implementation details Install an explicit version of the tracer. As this version is never in the public nuget.org source but _is_ in the local source, it uses that. > In #5989 I tried a different approach but it just didn't work. Having to thread the version through everywhere is kinda horrible, but is the only thing I could find that works. ## Test coverage Will run a [full installer test](https://dev.azure.com/datadoghq/dd-trace-dotnet/_build/results?buildId=163706&view=results) ## Other details The whole approach should be rewritten to be managed by Nuke tbh, if we ever find time This PR is a "forward port" of - #5994 (the issue was exhibited on the 2.x branch, so this is preemptive for the future)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary of changes
Reason for change
The code we were using to install the "local" builds of the NuGet packages added the local source. However the dotnet restore was looking in both the local and nuget.org sources, and installing the highest version it found. That worked fine until we released 3.2.0 publicly and expect to install 2.59.0 of the local build.
For system-tests, we had to change how things work to support v3 (DataDog/system-tests#2962), but unfortunately that breaks for v2.
Implementation details
Explicitly create a new NuGet.config, disable the nuget.org source, and add our local source instead, install the tool/add the package, then remove the config.
For system tests, just pinning to the specific commit prior to the v3 PR being merged.
Test coverage
Running a full installer run here
Other details
Another way around this would be to explicitly set the version when we do the install. We should potentially do that in a follow up PR, but it would require a lot more effort, and it might be better to move the entire setup to Nuke if we're taking that approach
This PR also contains a backport of
for simplicity