Skip to content

Fix "MakeGrpcToolsExecutable" when NugetPackageDirectory is not provided#2689

Merged
andrewlock merged 1 commit into
masterfrom
andrew/fix-grpc-requirement
Apr 14, 2022
Merged

Fix "MakeGrpcToolsExecutable" when NugetPackageDirectory is not provided#2689
andrewlock merged 1 commit into
masterfrom
andrew/fix-grpc-requirement

Conversation

@andrewlock

@andrewlock andrewlock commented Apr 14, 2022

Copy link
Copy Markdown
Member

Summary of changes

  • Make the MakeGrpcToolsExecutable build step infer the NuGet package directory if it's not provided in NugetPackageDirectory

Reason for change

When running locally, NugetPackageDirectory is not typically supplied. This will cause MakeGrpcToolsExecutable to fail (when run on Linux, and running integration tests).

Implementation details

Use dotnet nuget locals global-packages --list to do a best-effort attempt at finding the location

@andrewlock andrewlock added the area:builds project files, build scripts, pipelines, versioning, releases, packages label Apr 14, 2022
@andrewlock
andrewlock requested a review from a team as a code owner April 14, 2022 13:40
@andrewlock

andrewlock commented Apr 14, 2022

Copy link
Copy Markdown
Member Author

Code Coverage Report 📊

✔️ Merging #2689 into master will not change line coverage
✔️ Merging #2689 into master will not change branch coverage
✔️ Merging #2689 into master will not change complexity

master #2689 Change
Lines 13533 / 18627 13530 / 18627
Lines % 73% 73% 0% ✔️
Branches 7832 / 11125 7833 / 11125
Branches % 70% 70% 0% ✔️
Complexity 12431 12431 0 ✔️

View the full report for further details:

Datadog.Trace Breakdown ✔️

master #2689 Change
Lines % 73% 73% 0% ✔️
Branches % 70% 70% 0% ✔️
Complexity 12431 12431 0 ✔️

The following classes have significant coverage changes.

File Line coverage change Branch coverage change Complexity change
Datadog.Trace.Telemetry.JsonWebRequestTelemetryTransport -27% ⛔ -57% ⛔ 0 ✔️
Datadog.Trace.Ci.GitInfo -17% ⛔ -11% ⛔ 0 ✔️
Datadog.Trace.Ci.CIVisibility 7% ✔️ 7% ✔️ 0 ✔️

View the full reports for further details:

@andrewlock
andrewlock merged commit bef707d into master Apr 14, 2022
@andrewlock
andrewlock deleted the andrew/fix-grpc-requirement branch April 14, 2022 15:43
@github-actions github-actions Bot added this to the vNext milestone Apr 14, 2022
@andrewlock

andrewlock commented Apr 14, 2022

Copy link
Copy Markdown
Member Author

Benchmarks Report 🐌

Benchmarks for #2689 compared to master:

  • 6 benchmarks are slower, with geometric mean 1.261
  • 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.AgentWriterBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master WriteAndFlushEnrichedTraces net472 965μs 5.53μs 41μs 0 0 0 3.16 KB
master WriteAndFlushEnrichedTraces netcoreapp3.1 739μs 4μs 29.7μs 0 0 0 2.57 KB
#2689 WriteAndFlushEnrichedTraces net472 1.02ms 5.65μs 36.2μs 0 0 0 3.16 KB
#2689 WriteAndFlushEnrichedTraces netcoreapp3.1 735μs 2.75μs 9.93μs 0 0 0 2.57 KB
Benchmarks.Trace.AppSecBodyBenchmark - Slower ⚠️ Same allocations ✔️

Slower ⚠️ in #2689

Benchmark diff/base Base Median (ns) Diff Median (ns) Modality
Benchmarks.Trace.AppSecBodyBenchmark.BodyExtractorMoreComplexBody‑netcoreapp3.1 1.355 21,172.68 28,692.72

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master AllCycleSimpleBody net472 306ns 1.68ns 9.2ns 0.052 0 0 329 B
master AllCycleSimpleBody netcoreapp3.1 380ns 1.79ns 6.95ns 0.00452 0 0 328 B
master AllCycleMoreComplexBody net472 291ns 1.61ns 9.4ns 0.0482 0 0 305 B
master AllCycleMoreComplexBody netcoreapp3.1 379ns 2.02ns 10.1ns 0.00421 0 0 304 B
master BodyExtractorSimpleBody net472 433ns 2.48ns 19.5ns 0.057 0 0 361 B
master BodyExtractorSimpleBody netcoreapp3.1 448ns 2.34ns 11ns 0.00368 0 0 272 B
master BodyExtractorMoreComplexBody net472 26.5μs 132ns 590ns 1.18 0.0121 0 7.62 KB
master BodyExtractorMoreComplexBody netcoreapp3.1 21.1μs 115ns 651ns 0.093 0 0 6.75 KB
#2689 AllCycleSimpleBody net472 313ns 1.58ns 10.8ns 0.0519 0 0 329 B
#2689 AllCycleSimpleBody netcoreapp3.1 405ns 2.12ns 9.93ns 0.00465 0 0 328 B
#2689 AllCycleMoreComplexBody net472 317ns 1.85ns 16.1ns 0.0481 0 0 305 B
#2689 AllCycleMoreComplexBody netcoreapp3.1 401ns 2.19ns 13.1ns 0.00419 0 0 304 B
#2689 BodyExtractorSimpleBody net472 457ns 2.52ns 14.9ns 0.0569 0 0 361 B
#2689 BodyExtractorSimpleBody netcoreapp3.1 448ns 1.97ns 7.36ns 0.00373 0 0 272 B
#2689 BodyExtractorMoreComplexBody net472 25.4μs 134ns 711ns 1.18 0.0123 0 7.62 KB
#2689 BodyExtractorMoreComplexBody netcoreapp3.1 28.6μs 139ns 608ns 0.0934 0 0 6.75 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 net472 0ns 0ns 0ns 0 0 0 0 b
master SendRequest netcoreapp3.1 302μs 1.48μs 6.63μs 0.151 0 0 19.74 KB
#2689 SendRequest net472 0.0105ns 0.00688ns 0.0401ns 0 0 0 0 b
#2689 SendRequest netcoreapp3.1 336μs 1.56μs 6.03μs 0.167 0 0 19.74 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 net472 1.76μs 7.78ns 28.1ns 0.0942 0 0 594 B
master ExecuteNonQuery netcoreapp3.1 1.54μs 7.26ns 29ns 0.00906 0 0 632 B
#2689 ExecuteNonQuery net472 1.85μs 10.9ns 107ns 0.0944 0.000944 0 594 B
#2689 ExecuteNonQuery netcoreapp3.1 1.68μs 8.87ns 43.5ns 0.00845 0 0 632 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 net472 2.65μs 13.9ns 66.7ns 0.126 0 0 802 B
master CallElasticsearch netcoreapp3.1 1.62μs 7.19ns 28.7ns 0.0105 0 0 792 B
master CallElasticsearchAsync net472 3.13μs 8.63ns 32.3ns 0.148 0.00146 0 939 B
master CallElasticsearchAsync netcoreapp3.1 1.81μs 9.37ns 42.9ns 0.0124 0 0 912 B
#2689 CallElasticsearch net472 2.64μs 14.6ns 96ns 0.124 0 0 802 B
#2689 CallElasticsearch netcoreapp3.1 1.73μs 8.18ns 31.7ns 0.0112 0 0 792 B
#2689 CallElasticsearchAsync net472 3μs 14.3ns 59ns 0.148 0.00144 0 939 B
#2689 CallElasticsearchAsync netcoreapp3.1 1.86μs 8.81ns 35.2ns 0.0128 0 0 912 B
Benchmarks.Trace.GraphQLBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master ExecuteAsync net472 3.32μs 18.5ns 119ns 0.165 0 0 1.06 KB
master ExecuteAsync netcoreapp3.1 2.03μs 8.57ns 30.9ns 0.0139 0 0 1.03 KB
#2689 ExecuteAsync net472 3.03μs 15.1ns 65.8ns 0.168 0.00148 0 1.06 KB
#2689 ExecuteAsync netcoreapp3.1 2.22μs 6.11ns 23.7ns 0.014 0 0 1.03 KB
Benchmarks.Trace.HttpClientBenchmark - Slower ⚠️ Same allocations ✔️

Slower ⚠️ in #2689

Benchmark diff/base Base Median (ns) Diff Median (ns) Modality
Benchmarks.Trace.HttpClientBenchmark.SendAsync‑netcoreapp3.1 1.672 5,186.82 8,674.11

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master SendAsync net472 7.09μs 40.3ns 307ns 0.356 0 0 2.28 KB
master SendAsync netcoreapp3.1 5.24μs 28.7ns 170ns 0.0307 0 0 2.21 KB
#2689 SendAsync net472 9.15μs 222ns 2.22μs 0.353 0 0 2.28 KB
#2689 SendAsync netcoreapp3.1 8.44μs 114ns 1.13μs 0.0306 0 0 2.21 KB
Benchmarks.Trace.ILoggerBenchmark - Slower ⚠️ Same allocations ✔️

Slower ⚠️ in #2689

Benchmark diff/base Base Median (ns) Diff Median (ns) Modality
Benchmarks.Trace.ILoggerBenchmark.EnrichedLog‑net472 1.164 3,326.74 3,872.91

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master EnrichedLog net472 3.35μs 17.9ns 92.8ns 0.228 0 0 1.45 KB
master EnrichedLog netcoreapp3.1 3μs 13.1ns 49ns 0.021 0 0 1.53 KB
#2689 EnrichedLog net472 3.85μs 16.1ns 62.5ns 0.226 0 0 1.45 KB
#2689 EnrichedLog netcoreapp3.1 3.28μs 16.1ns 68.3ns 0.0214 0 0 1.53 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 net472 286μs 699ns 2.52μs 0.427 0.142 0 4.33 KB
master EnrichedLog netcoreapp3.1 232μs 1.11μs 4.3μs 0 0 0 4.21 KB
#2689 EnrichedLog net472 297μs 1.5μs 7.18μs 0.426 0.142 0 4.33 KB
#2689 EnrichedLog netcoreapp3.1 236μs 1.21μs 5.55μs 0 0 0 4.21 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 net472 7.87μs 41.6ns 208ns 0.503 0 0 3.23 KB
master EnrichedLog netcoreapp3.1 7.08μs 30.9ns 119ns 0.0493 0 0 3.6 KB
#2689 EnrichedLog net472 8.22μs 54.4ns 535ns 0.506 0 0 3.23 KB
#2689 EnrichedLog netcoreapp3.1 7.1μs 42.5ns 421ns 0.0497 0 0 3.6 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 net472 2.3μs 12.3ns 64.9ns 0.16 0.00116 0 1.01 KB
master SendReceive netcoreapp3.1 2.01μs 10.3ns 68.6ns 0.0144 0 0 1.01 KB
#2689 SendReceive net472 2.39μs 12.9ns 75.1ns 0.16 0 0 1.01 KB
#2689 SendReceive netcoreapp3.1 2.09μs 10.2ns 45.7ns 0.0143 0 0 1.01 KB
Benchmarks.Trace.SerilogBenchmark - Slower ⚠️ Same allocations ✔️

Slower ⚠️ in #2689

Benchmark diff/base Base Median (ns) Diff Median (ns) Modality
Benchmarks.Trace.SerilogBenchmark.EnrichedLog‑net472 1.136 6,095.15 6,925.24 several?

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master EnrichedLog net472 6.15μs 33.1ns 184ns 0.292 0 0 1.87 KB
master EnrichedLog netcoreapp3.1 5.25μs 27.5ns 140ns 0.0204 0 0 1.49 KB
#2689 EnrichedLog net472 7.02μs 41ns 395ns 0.292 0 0 1.87 KB
#2689 EnrichedLog netcoreapp3.1 5.72μs 30.6ns 162ns 0.0211 0 0 1.49 KB
Benchmarks.Trace.SpanBenchmark - Slower ⚠️ Same allocations ✔️

Slower ⚠️ in #2689

Benchmark diff/base Base Median (ns) Diff Median (ns) Modality
Benchmarks.Trace.SpanBenchmark.StartFinishSpan‑net472 1.174 876.94 1,029.10
Benchmarks.Trace.SpanBenchmark.StartFinishSpan‑netcoreapp3.1 1.142 872.46 996.69

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master StartFinishSpan net472 882ns 4.67ns 24.7ns 0.0716 0 0 457 B
master StartFinishSpan netcoreapp3.1 880ns 4.47ns 19.5ns 0.00635 0 0 456 B
master StartFinishScope net472 1.14μs 6.39ns 42.4ns 0.0846 0 0 538 B
master StartFinishScope netcoreapp3.1 1.01μs 3.85ns 14.4ns 0.0076 0 0 576 B
#2689 StartFinishSpan net472 1.03μs 4.61ns 17.3ns 0.0716 0 0 457 B
#2689 StartFinishSpan netcoreapp3.1 1μs 5.68ns 41.8ns 0.00599 0 0 456 B
#2689 StartFinishScope net472 1.16μs 6.75ns 60.8ns 0.084 0 0 538 B
#2689 StartFinishScope netcoreapp3.1 1.09μs 5.7ns 27.3ns 0.00782 0 0 576 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 net472 1.27μs 6.3ns 27.4ns 0.0841 0 0 538 B
master RunOnMethodBegin netcoreapp3.1 1.16μs 4.81ns 18.6ns 0.00806 0 0 576 B
#2689 RunOnMethodBegin net472 1.34μs 5.83ns 22.6ns 0.0838 0 0 538 B
#2689 RunOnMethodBegin netcoreapp3.1 1.21μs 5.39ns 20.2ns 0.00773 0 0 576 B

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@robertpi robertpi robertpi approved these changes
@lucaspimentel lucaspimentel lucaspimentel approved these changes

Assignees

No one assigned

Labels

area:builds project files, build scripts, pipelines, versioning, releases, packages

Projects

None yet

Milestone

2.7.0

Development

Successfully merging this pull request may close these issues.

3 participants

@andrewlock @robertpi @lucaspimentel