-
Notifications
You must be signed in to change notification settings - Fork 145
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.
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
Add version/license/description to .deb and .rpm packages #4377
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry I thought I had applied it as well. My bad
Datadog ReportBranch report: ❄️ New Flaky Tests (1)
|
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not familiar with this process, but out of interest
- Why do we need to repackage these? Is it just to add the
auto_inject-dotnet.version
file? If so, could we not include that in the original deb - Do we set the url/license/description in the original deb/rpm packages too?
@andrewlock The main changes are:
We created a separate package to move fast while releasing the autoinject tooling. The eventual goal is that there would only be one package created. Here is an excerpt from the relevant doc:
|
@pierotibou or @andrewlock can either of you babysit and merge this? I don't have the appropriate permissions to rerun the unit tests |
We can easily add that to our build steps, so we should probably do that soon 🙂
IMO, if we want to transition customers to the new naming, we should be uploading the new packages to GitHub too. Customers are already primarily installing via GitHub releases (because that's all we had previously), so getting them to use an entirely new install process, while preferable, seems harder than getting them to find-and-replace a different filename in their scripts? The downside is our already-too-long list of installers would get even longer 🤦♂️
Have we done that? Is it "out" yet? 😄
I find it hard to believe essentially any transitional period of time will be sufficient for this not to be massively breaking for customers unfortunately... |
c2c7710
to
47301c8
Compare
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 (4377) - mean (2,990ms) : 2922, 3058
. : milestone, 2990,
master - mean (2,988ms) : 2892, 3084
. : milestone, 2988,
section CallTarget+Inlining+NGEN
This PR (4377) - mean (3,819ms) : 3751, 3887
. : milestone, 3819,
master - mean (3,853ms) : 3753, 3953
. : milestone, 3853,
gantt
title Execution time (ms) FakeDbCommand (.NET Core 3.1)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (4377) - mean (3,112ms) : 3010, 3214
. : milestone, 3112,
master - mean (3,118ms) : 3046, 3190
. : milestone, 3118,
section CallTarget+Inlining+NGEN
This PR (4377) - mean (3,634ms) : 3550, 3718
. : milestone, 3634,
master - mean (3,632ms) : 3581, 3683
. : milestone, 3632,
gantt
title Execution time (ms) FakeDbCommand (.NET 6)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (4377) - mean (3,097ms) : 2999, 3194
. : milestone, 3097,
master - mean (3,085ms) : 2989, 3181
. : milestone, 3085,
section CallTarget+Inlining+NGEN
This PR (4377) - mean (3,606ms) : 3550, 3663
. : milestone, 3606,
master - mean (3,592ms) : 3522, 3663
. : milestone, 3592,
gantt
title Execution time (ms) HttpMessageHandler (.NET Framework 4.6.2)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (4377) - mean (190ms) : 186, 194
. : milestone, 190,
master - mean (191ms) : 187, 195
. : milestone, 191,
section CallTarget+Inlining+NGEN
This PR (4377) - mean (1,127ms) : 1099, 1154
. : milestone, 1127,
master - mean (1,131ms) : 1105, 1157
. : milestone, 1131,
gantt
title Execution time (ms) HttpMessageHandler (.NET Core 3.1)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (4377) - mean (394ms) : 320, 468
. : milestone, 394,
master - mean (374ms) : 369, 379
. : milestone, 374,
section CallTarget+Inlining+NGEN
This PR (4377) - mean (1,191ms) : 1167, 1214
. : milestone, 1191,
master - mean (1,194ms) : 1170, 1218
. : milestone, 1194,
gantt
title Execution time (ms) HttpMessageHandler (.NET 6)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (4377) - mean (363ms) : 355, 370
. : milestone, 363,
master - mean (360ms) : 355, 365
. : milestone, 360,
section CallTarget+Inlining+NGEN
This PR (4377) - mean (1,147ms) : 1118, 1176
. : milestone, 1147,
master - mean (1,140ms) : 1112, 1168
. : milestone, 1140,
|
Benchmarks Report 🐌Benchmarks for #4377 compared to master:
The following thresholds were used for comparing the benchmark speeds:
Allocation changes below 0.5% are ignored. Benchmark detailsBenchmarks.Trace.AgentWriterBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.AppSecBodyBenchmark - 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 - Slower
|
Benchmark | diff/base | Base Median (ns) | Diff Median (ns) | Modality |
---|---|---|---|---|
Benchmarks.Trace.SpanBenchmark.StartFinishScope‑netcoreapp3.1 | 1.129 | 698.86 | 789.21 |
Benchmark | base/diff | Base Median (ns) | Diff Median (ns) | Modality |
---|---|---|---|---|
Benchmarks.Trace.SpanBenchmark.StartFinishScope‑net6.0 | 1.201 | 557.21 | 463.80 |
Raw results
Branch | Method | Toolchain | Mean | StdError | StdDev | Gen 0 | Gen 1 | Gen 2 | Allocated |
---|---|---|---|---|---|---|---|---|---|
master | StartFinishSpan |
net6.0 | 432ns | 0.147ns | 0.55ns | 0.00755 | 0 | 0 | 536 B |
master | StartFinishSpan |
netcoreapp3.1 | 599ns | 0.144ns | 0.558ns | 0.00739 | 0 | 0 | 536 B |
master | StartFinishSpan |
net472 | 616ns | 0.365ns | 1.37ns | 0.0852 | 0 | 0 | 538 B |
master | StartFinishScope |
net6.0 | 557ns | 0.174ns | 0.652ns | 0.0093 | 0 | 0 | 656 B |
master | StartFinishScope |
netcoreapp3.1 | 699ns | 0.284ns | 1.06ns | 0.00884 | 0 | 0 | 656 B |
master | StartFinishScope |
net472 | 806ns | 1.09ns | 4.23ns | 0.0982 | 0 | 0 | 618 B |
#4377 | StartFinishSpan |
net6.0 | 474ns | 0.186ns | 0.722ns | 0.0076 | 0 | 0 | 536 B |
#4377 | StartFinishSpan |
netcoreapp3.1 | 560ns | 0.265ns | 0.992ns | 0.00719 | 0 | 0 | 536 B |
#4377 | StartFinishSpan |
net472 | 621ns | 0.146ns | 0.547ns | 0.0854 | 0 | 0 | 538 B |
#4377 | StartFinishScope |
net6.0 | 464ns | 0.132ns | 0.493ns | 0.00921 | 0 | 0 | 656 B |
#4377 | StartFinishScope |
netcoreapp3.1 | 789ns | 0.248ns | 0.894ns | 0.00917 | 0 | 0 | 656 B |
#4377 | StartFinishScope |
net472 | 853ns | 0.16ns | 0.62ns | 0.098 | 0 | 0 | 618 B |
Benchmarks.Trace.TraceAnnotationsBenchmark - Faster 🎉 Same allocations ✔️
Faster 🎉 in #4377
Benchmark
base/diff
Base Median (ns)
Diff Median (ns)
Modality
Benchmarks.Trace.TraceAnnotationsBenchmark.RunOnMethodBegin‑net6.0
1.143
578.28
506.07
Benchmark | base/diff | Base Median (ns) | Diff Median (ns) | Modality |
---|---|---|---|---|
Benchmarks.Trace.TraceAnnotationsBenchmark.RunOnMethodBegin‑net6.0 | 1.143 | 578.28 | 506.07 |
Raw results
Branch | Method | Toolchain | Mean | StdError | StdDev | Gen 0 | Gen 1 | Gen 2 | Allocated |
---|---|---|---|---|---|---|---|---|---|
master | RunOnMethodBegin |
net6.0 | 578ns | 0.283ns | 1.02ns | 0.00931 | 0 | 0 | 656 B |
master | RunOnMethodBegin |
netcoreapp3.1 | 761ns | 0.331ns | 1.28ns | 0.00888 | 0 | 0 | 656 B |
master | RunOnMethodBegin |
net472 | 897ns | 0.429ns | 1.66ns | 0.0982 | 0 | 0 | 618 B |
#4377 | RunOnMethodBegin |
net6.0 | 506ns | 0.233ns | 0.873ns | 0.00922 | 0 | 0 | 656 B |
#4377 | RunOnMethodBegin |
netcoreapp3.1 | 763ns | 0.24ns | 0.898ns | 0.00881 | 0 | 0 | 656 B |
#4377 | RunOnMethodBegin |
net472 | 897ns | 0.51ns | 1.84ns | 0.0979 | 0 | 0 | 618 B |
Throughput/Crank Report:zap:Throughput results for AspNetCoreSimpleController comparing the following branches/commits: Cases where throughput results for the PR are worse than latest master (5% drop or greater), results are shown in red. Note that these results are based on a single point-in-time result for each branch. For full results, see one of the many, many dashboards! gantt
title Throughput Linux x64 (Total requests)
dateFormat X
axisFormat %s
section Baseline
This PR (4377) (11.048M) : 0, 11048443
master (10.902M) : 0, 10901521
benchmarks/2.33.0 (10.950M) : 0, 10949608
benchmarks/2.9.0 (10.949M) : 0, 10948638
section Automatic
This PR (4377) (7.717M) : 0, 7716890
master (7.534M) : 0, 7533509
benchmarks/2.33.0 (7.621M) : 0, 7620707
benchmarks/2.9.0 (7.869M) : 0, 7869138
section Trace stats
master (7.595M) : 0, 7595057
benchmarks/2.33.0 (7.602M) : 0, 7602038
section Manual
This PR (4377) (9.961M) : 0, 9961318
master (9.815M) : 0, 9814905
benchmarks/2.33.0 (9.770M) : 0, 9770235
section Manual + Automatic
This PR (4377) (7.429M) : 0, 7428784
master (7.255M) : 0, 7254836
benchmarks/2.33.0 (7.189M) : 0, 7188658
section Version Conflict
master (6.579M) : 0, 6579121
benchmarks/2.33.0 (6.553M) : 0, 6553316
gantt
title Throughput Linux arm64 (Total requests)
dateFormat X
axisFormat %s
section Baseline
This PR (4377) (9.648M) : 0, 9648191
master (9.667M) : 0, 9666802
benchmarks/2.33.0 (9.426M) : 0, 9425603
benchmarks/2.9.0 (9.651M) : 0, 9650936
section Automatic
This PR (4377) (6.576M) : 0, 6576054
master (6.755M) : 0, 6754566
benchmarks/2.33.0 (6.803M) : 0, 6802932
section Trace stats
master (6.777M) : 0, 6776538
benchmarks/2.33.0 (6.810M) : 0, 6810447
section Manual
This PR (4377) (8.483M) : 0, 8483324
master (8.561M) : 0, 8561047
benchmarks/2.33.0 (8.435M) : 0, 8434569
section Manual + Automatic
This PR (4377) (6.383M) : 0, 6383497
master (6.332M) : 0, 6331957
benchmarks/2.33.0 (6.465M) : 0, 6465149
section Version Conflict
master (5.975M) : 0, 5975266
benchmarks/2.33.0 (5.807M) : 0, 5806690
gantt
title Throughput Windows x64 (Total requests)
dateFormat X
axisFormat %s
section Baseline
This PR (4377) (10.738M) : 0, 10738165
master (10.104M) : 0, 10103707
benchmarks/2.33.0 (9.426M) : 0, 9426080
benchmarks/2.9.0 (9.867M) : 0, 9866970
section Automatic
This PR (4377) (7.568M) : 0, 7568271
master (6.982M) : 0, 6982306
benchmarks/2.33.0 (6.469M) : 0, 6468939
benchmarks/2.9.0 (7.247M) : 0, 7247453
section Trace stats
master (7.247M) : 0, 7246697
benchmarks/2.33.0 (6.830M) : 0, 6830314
section Manual
This PR (4377) (9.397M) : 0, 9397061
master (9.251M) : 0, 9251104
benchmarks/2.33.0 (8.108M) : 0, 8108026
section Manual + Automatic
This PR (4377) (7.392M) : 0, 7391615
master (6.956M) : 0, 6956130
benchmarks/2.33.0 (6.856M) : 0, 6856379
section Version Conflict
master (6.380M) : 0, 6380435
benchmarks/2.33.0 (5.893M) : 0, 5893016
gantt
title Throughput Linux x64 (ASM) (Total requests)
dateFormat X
axisFormat %s
section Baseline
This PR (4377) (7.761M) : 0, 7761142
master (7.605M) : 0, 7605248
benchmarks/2.33.0 (7.765M) : 0, 7764607
benchmarks/2.9.0 (8.067M) : 0, 8066743
section No attack
This PR (4377) (2.202M) : 0, 2201733
master (2.207M) : 0, 2207340
benchmarks/2.33.0 (2.209M) : 0, 2208725
benchmarks/2.9.0 (3.337M) : 0, 3336566
section Attack
This PR (4377) (1.915M) : 0, 1914600
master (1.918M) : 0, 1917897
benchmarks/2.33.0 (1.911M) : 0, 1910909
benchmarks/2.9.0 (2.611M) : 0, 2611151
section Blocking
This PR (4377) (3.860M) : 0, 3859753
master (3.854M) : 0, 3854094
benchmarks/2.33.0 (3.861M) : 0, 3860900
|
Summary of changes
Add version/license/description to .deb and .rpm packages
Reason for change
They are expected by package users. The change was suggested on the original PR (#4303) and I thought it was applied.