Skip to content

Fixes Apple Silicon Build#3358

Merged
tonyredondo merged 5 commits into
masterfrom
tony/fix-apple-silicon-build
Oct 14, 2022
Merged

Fixes Apple Silicon Build#3358
tonyredondo merged 5 commits into
masterfrom
tony/fix-apple-silicon-build

Conversation

@tonyredondo

@tonyredondo tonyredondo commented Oct 14, 2022 •
edited
Loading

Copy link
Copy Markdown
Member

Summary of changes

This PR fixes Apple Silicon build

@tonyredondo tonyredondo self-assigned this Oct 14, 2022
@tonyredondo
tonyredondo requested review from a team as code owners October 14, 2022 09:53
@andrewlock

andrewlock commented Oct 14, 2022

Copy link
Copy Markdown
Member

Benchmarks Report 🐌

Benchmarks for #3358 compared to master:

  • 1 benchmarks are slower, with geometric mean 1.145
  • 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 792μs 595ns 2.23μs 0.393 0 0 3.22 KB
master WriteAndFlushEnrichedTraces netcoreapp3.1 534μs 402ns 1.56μs 0 0 0 2.63 KB
#3358 WriteAndFlushEnrichedTraces net472 845μs 681ns 2.64μs 0.403 0 0 3.22 KB
#3358 WriteAndFlushEnrichedTraces netcoreapp3.1 540μs 227ns 817ns 0 0 0 2.63 KB
Benchmarks.Trace.AppSecBodyBenchmark - Slower ⚠️ Same allocations ✔️

Slower ⚠️ in #3358

Benchmark diff/base Base Median (ns) Diff Median (ns) Modality
Benchmarks.Trace.AppSecBodyBenchmark.BodyExtractorSimpleBody‑netcoreapp3.1 1.145 228.72 261.77

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master AllCycleSimpleBody net472 197ns 0.116ns 0.448ns 0.0727 0 0 457 B
master AllCycleSimpleBody netcoreapp3.1 255ns 0.145ns 0.56ns 0.00624 0 0 456 B
master AllCycleMoreComplexBody net472 211ns 0.159ns 0.614ns 0.0689 0 0 433 B
master AllCycleMoreComplexBody netcoreapp3.1 253ns 0.113ns 0.438ns 0.00593 0 0 432 B
master BodyExtractorSimpleBody net472 272ns 0.147ns 0.567ns 0.0574 0 0 361 B
master BodyExtractorSimpleBody netcoreapp3.1 229ns 0.09ns 0.349ns 0.00369 0 0 272 B
master BodyExtractorMoreComplexBody net472 15.8μs 12.9ns 49.9ns 1.21 0.0158 0 7.62 KB
master BodyExtractorMoreComplexBody netcoreapp3.1 13.2μs 6.8ns 25.5ns 0.092 0 0 6.75 KB
#3358 AllCycleSimpleBody net472 196ns 0.0616ns 0.231ns 0.0726 0 0 457 B
#3358 AllCycleSimpleBody netcoreapp3.1 254ns 0.284ns 1.1ns 0.00623 0 0 456 B
#3358 AllCycleMoreComplexBody net472 197ns 0.0407ns 0.157ns 0.0688 0 0 433 B
#3358 AllCycleMoreComplexBody netcoreapp3.1 253ns 0.282ns 1.09ns 0.00593 0 0 432 B
#3358 BodyExtractorSimpleBody net472 274ns 0.38ns 1.47ns 0.0573 0 0 361 B
#3358 BodyExtractorSimpleBody netcoreapp3.1 262ns 0.119ns 0.446ns 0.00367 0 0 272 B
#3358 BodyExtractorMoreComplexBody net472 15.5μs 9.43ns 35.3ns 1.21 0.0156 0 7.62 KB
#3358 BodyExtractorMoreComplexBody netcoreapp3.1 12.9μs 4.66ns 17.4ns 0.0903 0 0 6.75 KB
Benchmarks.Trace.AspNetCoreBenchmark - Unknown 🤷 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 181μs 245ns 950ns 0.18 0 0 20.68 KB
#3358 SendRequest net472 0ns 0ns 0ns 0 0 0 0 b
#3358 SendRequest netcoreapp3.1 182μs 166ns 621ns 0.181 0 0 20.68 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.93μs 0.98ns 3.67ns 0.155 0.000967 0 979 B
master ExecuteNonQuery netcoreapp3.1 1.47μs 0.646ns 2.42ns 0.0126 0 0 968 B
#3358 ExecuteNonQuery net472 1.81μs 0.886ns 3.43ns 0.156 0.000904 0 979 B
#3358 ExecuteNonQuery netcoreapp3.1 1.38μs 0.548ns 2.12ns 0.0131 0 0 968 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.63μs 1.06ns 3.97ns 0.188 0 0 1.19 KB
master CallElasticsearch netcoreapp3.1 1.6μs 0.633ns 2.37ns 0.0153 0 0 1.13 KB
master CallElasticsearchAsync net472 2.78μs 1.64ns 5.9ns 0.21 0 0 1.32 KB
master CallElasticsearchAsync netcoreapp3.1 1.63μs 0.611ns 2.2ns 0.0171 0 0 1.25 KB
#3358 CallElasticsearch net472 2.54μs 0.579ns 2.17ns 0.188 0 0 1.19 KB
#3358 CallElasticsearch netcoreapp3.1 1.54μs 0.659ns 2.55ns 0.0154 0 0 1.13 KB
#3358 CallElasticsearchAsync net472 2.7μs 0.957ns 3.71ns 0.21 0 0 1.32 KB
#3358 CallElasticsearchAsync netcoreapp3.1 1.65μs 1.66ns 6.21ns 0.0173 0 0 1.25 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 net472 2.8μs 1.61ns 5.82ns 0.23 0 0 1.45 KB
master ExecuteAsync netcoreapp3.1 1.73μs 0.592ns 2.29ns 0.019 0 0 1.38 KB
#3358 ExecuteAsync net472 2.83μs 1.57ns 6.09ns 0.231 0 0 1.45 KB
#3358 ExecuteAsync netcoreapp3.1 1.71μs 1.16ns 4.35ns 0.018 0 0 1.38 KB
Benchmarks.Trace.HttpClientBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master SendAsync net472 5.89μs 1.37ns 4.92ns 0.445 0 0 2.8 KB
master SendAsync netcoreapp3.1 3.67μs 2.91ns 10.1ns 0.0349 0 0 2.63 KB
#3358 SendAsync net472 5.85μs 1.92ns 7.45ns 0.445 0 0 2.8 KB
#3358 SendAsync netcoreapp3.1 3.66μs 0.993ns 3.72ns 0.035 0 0 2.63 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 net472 3.24μs 3.47ns 13ns 0.298 0 0 1.88 KB
master EnrichedLog netcoreapp3.1 2.5μs 1.1ns 4.25ns 0.026 0 0 1.91 KB
#3358 EnrichedLog net472 3.18μs 1.92ns 7.43ns 0.298 0 0 1.88 KB
#3358 EnrichedLog netcoreapp3.1 2.45μs 0.953ns 3.57ns 0.0255 0 0 1.91 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 151μs 97.4ns 377ns 0.679 0.226 0 4.72 KB
master EnrichedLog netcoreapp3.1 120μs 123ns 477ns 0 0 0 4.55 KB
#3358 EnrichedLog net472 151μs 87.5ns 327ns 0.679 0.226 0 4.72 KB
#3358 EnrichedLog netcoreapp3.1 121μs 171ns 664ns 0 0 0 4.55 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 5.83μs 2.38ns 9.23ns 0.58 0.00291 0 3.65 KB
master EnrichedLog netcoreapp3.1 4.41μs 2.41ns 9.02ns 0.0533 0 0 3.98 KB
#3358 EnrichedLog net472 5.89μs 4.85ns 18.8ns 0.579 0.00294 0 3.65 KB
#3358 EnrichedLog netcoreapp3.1 4.46μs 1.35ns 4.87ns 0.0537 0 0 3.98 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.25μs 2.13ns 7.95ns 0.222 0 0 1.4 KB
master SendReceive netcoreapp3.1 1.77μs 1.22ns 4.4ns 0.0179 0 0 1.35 KB
#3358 SendReceive net472 2.34μs 3.08ns 11.5ns 0.223 0 0 1.4 KB
#3358 SendReceive netcoreapp3.1 1.81μs 0.921ns 3.57ns 0.0181 0 0 1.35 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 net472 4.98μs 2ns 7.22ns 0.365 0 0 2.3 KB
master EnrichedLog netcoreapp3.1 4.44μs 11.8ns 44.1ns 0.0241 0 0 1.86 KB
#3358 EnrichedLog net472 5.22μs 1.86ns 6.97ns 0.364 0 0 2.3 KB
#3358 EnrichedLog netcoreapp3.1 4.44μs 1.7ns 6.14ns 0.0245 0 0 1.86 KB
Benchmarks.Trace.SpanBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master StartFinishSpan net472 1.15μs 0.418ns 1.51ns 0.134 0 0 842 B
master StartFinishSpan netcoreapp3.1 960ns 0.583ns 2.18ns 0.0103 0 0 792 B
master StartFinishScope net472 1.48μs 0.522ns 2.02ns 0.146 0 0 923 B
master StartFinishScope netcoreapp3.1 1.07μs 0.367ns 1.32ns 0.0123 0 0 912 B
#3358 StartFinishSpan net472 1.17μs 0.418ns 1.62ns 0.134 0 0 842 B
#3358 StartFinishSpan netcoreapp3.1 928ns 0.711ns 2.75ns 0.0106 0 0 792 B
#3358 StartFinishScope net472 1.33μs 0.697ns 2.7ns 0.146 0 0 923 B
#3358 StartFinishScope netcoreapp3.1 1.1μs 0.62ns 2.32ns 0.0122 0 0 912 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.54μs 0.361ns 1.3ns 0.146 0 0 923 B
master RunOnMethodBegin netcoreapp3.1 1.17μs 0.762ns 2.75ns 0.0122 0 0 912 B
#3358 RunOnMethodBegin net472 1.56μs 0.356ns 1.38ns 0.146 0 0 923 B
#3358 RunOnMethodBegin netcoreapp3.1 1.19μs 0.343ns 1.28ns 0.0125 0 0 912 B

pierotibou
pierotibou approved these changes Oct 14, 2022
View reviewed changes

@pierotibou pierotibou left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:blindfold: if you're blocked

@andrewlock

andrewlock commented Oct 14, 2022

Copy link
Copy Markdown
Member

Code Coverage Report 📊

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

master #3358 Change
Lines 19582 / 26971 19556 / 26971
Lines % 73% 73% 0% ✔️
Branches 11630 / 16770 11612 / 16770
Branches % 69% 69% 0% ✔️
Complexity 18142 18142 0 ✔️

View the full report for further details:

Datadog.Trace Breakdown ✔️

master #3358 Change
Lines % 73% 73% 0% ✔️
Branches % 69% 69% 0% ✔️
Complexity 18142 18142 0 ✔️

The following classes have significant coverage changes.

File Line coverage change Branch coverage change Complexity change
Datadog.Trace.Iast.StackWalker 0% ✔️ -6% ⛔ 0 ✔️

View the full reports for further details:

@tonyredondo
tonyredondo merged commit 7543060 into master Oct 14, 2022
@tonyredondo
tonyredondo deleted the tony/fix-apple-silicon-build branch October 14, 2022 11:25
@github-actions github-actions Bot added this to the vNext milestone Oct 14, 2022
@lucaspimentel lucaspimentel added type:bug area:builds project files, build scripts, pipelines, versioning, releases, packages labels Oct 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@andrewlock andrewlock andrewlock approved these changes
@pierotibou pierotibou pierotibou approved these changes

Assignees

@tonyredondo tonyredondo

Labels

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

Projects

None yet

Milestone

2.18.0

Development

Successfully merging this pull request may close these issues.

4 participants

@tonyredondo @andrewlock @pierotibou @lucaspimentel