-
Notifications
You must be signed in to change notification settings - Fork 140
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
Fixes Clion build on OSX #6215
Fixes Clion build on OSX #6215
Conversation
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 (6215) - mean (71ms) : 68, 73
. : milestone, 71,
master - mean (70ms) : 68, 72
. : milestone, 70,
section CallTarget+Inlining+NGEN
This PR (6215) - mean (1,122ms) : 1093, 1151
. : milestone, 1122,
master - mean (1,119ms) : 1098, 1140
. : milestone, 1119,
gantt
title Execution time (ms) FakeDbCommand (.NET Core 3.1)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (6215) - mean (112ms) : 105, 118
. : milestone, 112,
master - mean (109ms) : 107, 112
. : milestone, 109,
section CallTarget+Inlining+NGEN
This PR (6215) - mean (779ms) : 756, 802
. : milestone, 779,
master - mean (773ms) : 753, 794
. : milestone, 773,
gantt
title Execution time (ms) FakeDbCommand (.NET 6)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (6215) - mean (93ms) : 90, 96
. : milestone, 93,
master - mean (93ms) : 90, 96
. : milestone, 93,
section CallTarget+Inlining+NGEN
This PR (6215) - mean (733ms) : 715, 751
. : milestone, 733,
master - mean (733ms) : 714, 752
. : milestone, 733,
gantt
title Execution time (ms) HttpMessageHandler (.NET Framework 4.6.2)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (6215) - mean (190ms) : 187, 193
. : milestone, 190,
master - mean (190ms) : 187, 193
. : milestone, 190,
section CallTarget+Inlining+NGEN
This PR (6215) - mean (1,203ms) : 1178, 1227
. : milestone, 1203,
master - mean (1,200ms) : 1167, 1233
. : milestone, 1200,
gantt
title Execution time (ms) HttpMessageHandler (.NET Core 3.1)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (6215) - mean (276ms) : 271, 281
. : milestone, 276,
master - mean (278ms) : 271, 284
. : milestone, 278,
section CallTarget+Inlining+NGEN
This PR (6215) - mean (941ms) : 923, 958
. : milestone, 941,
master - mean (945ms) : 923, 967
. : milestone, 945,
gantt
title Execution time (ms) HttpMessageHandler (.NET 6)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (6215) - mean (265ms) : 261, 268
. : milestone, 265,
master - mean (265ms) : 261, 269
. : milestone, 265,
section CallTarget+Inlining+NGEN
This PR (6215) - mean (924ms) : 906, 942
. : milestone, 924,
master - mean (929ms) : 911, 948
. : milestone, 929,
|
Benchmarks Report for tracer 🐌Benchmarks for #6215 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 - Faster 🎉 Same allocations ✔️
|
Benchmark | base/diff | Base Median (ns) | Diff Median (ns) | Modality |
---|---|---|---|---|
Benchmarks.Trace.GraphQLBenchmark.ExecuteAsync‑net6.0 | 1.128 | 1,322.52 | 1,172.62 |
Raw results
Branch | Method | Toolchain | Mean | StdError | StdDev | Gen 0 | Gen 1 | Gen 2 | Allocated |
---|---|---|---|---|---|---|---|---|---|
master | ExecuteAsync |
net6.0 | 1.32μs | 0.351ns | 1.36ns | 0.0133 | 0 | 0 | 952 B |
master | ExecuteAsync |
netcoreapp3.1 | 1.63μs | 1.02ns | 3.96ns | 0.0122 | 0 | 0 | 952 B |
master | ExecuteAsync |
net472 | 1.85μs | 1ns | 3.74ns | 0.145 | 0 | 0 | 915 B |
#6215 | ExecuteAsync |
net6.0 | 1.17μs | 0.408ns | 1.53ns | 0.0135 | 0 | 0 | 952 B |
#6215 | ExecuteAsync |
netcoreapp3.1 | 1.66μs | 0.714ns | 2.67ns | 0.0127 | 0 | 0 | 952 B |
#6215 | ExecuteAsync |
net472 | 1.77μs | 0.768ns | 2.87ns | 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.34μs | 1.51ns | 5.85ns | 0.0305 | 0 | 0 | 2.22 KB |
master | SendAsync |
netcoreapp3.1 | 5.21μs | 4.84ns | 18.8ns | 0.0364 | 0 | 0 | 2.76 KB |
master | SendAsync |
net472 | 7.77μs | 7.89ns | 30.5ns | 0.497 | 0 | 0 | 3.15 KB |
#6215 | SendAsync |
net6.0 | 4.22μs | 7.47ns | 28ns | 0.0297 | 0 | 0 | 2.22 KB |
#6215 | SendAsync |
netcoreapp3.1 | 5.06μs | 2.52ns | 9.77ns | 0.038 | 0 | 0 | 2.76 KB |
#6215 | SendAsync |
net472 | 7.78μs | 3.04ns | 11.4ns | 0.498 | 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.43μs | 1.01ns | 3.78ns | 0.0231 | 0 | 0 | 1.64 KB |
master | EnrichedLog |
netcoreapp3.1 | 2.18μs | 1.18ns | 4.41ns | 0.023 | 0 | 0 | 1.64 KB |
master | EnrichedLog |
net472 | 2.54μs | 1.61ns | 5.8ns | 0.249 | 0 | 0 | 1.57 KB |
#6215 | EnrichedLog |
net6.0 | 1.58μs | 1.28ns | 4.94ns | 0.0232 | 0 | 0 | 1.64 KB |
#6215 | EnrichedLog |
netcoreapp3.1 | 2.17μs | 1.1ns | 4.28ns | 0.0226 | 0 | 0 | 1.64 KB |
#6215 | EnrichedLog |
net472 | 2.72μs | 0.971ns | 3.63ns | 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 | 118μs | 317ns | 1.23μs | 0 | 0 | 0 | 4.28 KB |
master | EnrichedLog |
netcoreapp3.1 | 123μs | 399ns | 1.55μs | 0.0615 | 0 | 0 | 4.28 KB |
master | EnrichedLog |
net472 | 152μs | 162ns | 629ns | 0.687 | 0.229 | 0 | 4.46 KB |
#6215 | EnrichedLog |
net6.0 | 116μs | 201ns | 780ns | 0.0585 | 0 | 0 | 4.28 KB |
#6215 | EnrichedLog |
netcoreapp3.1 | 120μs | 309ns | 1.2μs | 0 | 0 | 0 | 4.28 KB |
#6215 | EnrichedLog |
net472 | 151μs | 70.3ns | 243ns | 0.679 | 0.226 | 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.04μs | 5.61ns | 21.7ns | 0.0307 | 0 | 0 | 2.2 KB |
master | EnrichedLog |
netcoreapp3.1 | 4.14μs | 1.09ns | 4.08ns | 0.029 | 0 | 0 | 2.2 KB |
master | EnrichedLog |
net472 | 5.1μs | 2.54ns | 9.85ns | 0.318 | 0 | 0 | 2.02 KB |
#6215 | EnrichedLog |
net6.0 | 3.12μs | 1.54ns | 5.76ns | 0.03 | 0 | 0 | 2.2 KB |
#6215 | EnrichedLog |
netcoreapp3.1 | 4.08μs | 1.65ns | 6.39ns | 0.0285 | 0 | 0 | 2.2 KB |
#6215 | EnrichedLog |
net472 | 4.72μs | 1.61ns | 6.23ns | 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.33μs | 0.393ns | 1.42ns | 0.0163 | 0 | 0 | 1.14 KB |
master | SendReceive |
netcoreapp3.1 | 1.79μs | 1.39ns | 5.4ns | 0.0153 | 0 | 0 | 1.14 KB |
master | SendReceive |
net472 | 2.12μs | 1.17ns | 4.2ns | 0.183 | 0.00106 | 0 | 1.16 KB |
#6215 | SendReceive |
net6.0 | 1.35μs | 1.12ns | 4.35ns | 0.0163 | 0 | 0 | 1.14 KB |
#6215 | SendReceive |
netcoreapp3.1 | 1.71μs | 1.92ns | 7.42ns | 0.0152 | 0 | 0 | 1.14 KB |
#6215 | SendReceive |
net472 | 1.99μs | 1.2ns | 4.66ns | 0.184 | 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.85μs | 0.865ns | 3.24ns | 0.0214 | 0 | 0 | 1.6 KB |
master | EnrichedLog |
netcoreapp3.1 | 3.89μs | 2.49ns | 9.63ns | 0.0217 | 0 | 0 | 1.65 KB |
master | EnrichedLog |
net472 | 4.32μs | 1.21ns | 4.36ns | 0.322 | 0 | 0 | 2.04 KB |
#6215 | EnrichedLog |
net6.0 | 2.81μs | 0.742ns | 2.78ns | 0.0225 | 0 | 0 | 1.6 KB |
#6215 | EnrichedLog |
netcoreapp3.1 | 3.93μs | 2.04ns | 7.89ns | 0.0216 | 0 | 0 | 1.65 KB |
#6215 | EnrichedLog |
net472 | 4.41μs | 2.41ns | 9.33ns | 0.323 | 0 | 0 | 2.04 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 |
net6.0 | 399ns | 0.234ns | 0.843ns | 0.00808 | 0 | 0 | 576 B |
master | StartFinishSpan |
netcoreapp3.1 | 577ns | 0.404ns | 1.57ns | 0.00787 | 0 | 0 | 576 B |
master | StartFinishSpan |
net472 | 704ns | 0.516ns | 2ns | 0.0915 | 0 | 0 | 578 B |
master | StartFinishScope |
net6.0 | 519ns | 1.44ns | 5.58ns | 0.00969 | 0 | 0 | 696 B |
master | StartFinishScope |
netcoreapp3.1 | 733ns | 0.702ns | 2.72ns | 0.00937 | 0 | 0 | 696 B |
master | StartFinishScope |
net472 | 903ns | 0.828ns | 2.98ns | 0.104 | 0 | 0 | 658 B |
#6215 | StartFinishSpan |
net6.0 | 398ns | 0.292ns | 1.13ns | 0.00816 | 0 | 0 | 576 B |
#6215 | StartFinishSpan |
netcoreapp3.1 | 603ns | 0.445ns | 1.72ns | 0.00767 | 0 | 0 | 576 B |
#6215 | StartFinishSpan |
net472 | 699ns | 1.33ns | 4.98ns | 0.0918 | 0 | 0 | 578 B |
#6215 | StartFinishScope |
net6.0 | 488ns | 1.02ns | 3.94ns | 0.00969 | 0 | 0 | 696 B |
#6215 | StartFinishScope |
netcoreapp3.1 | 737ns | 0.665ns | 2.58ns | 0.00927 | 0 | 0 | 696 B |
#6215 | StartFinishScope |
net472 | 845ns | 0.686ns | 2.66ns | 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 | 715ns | 0.392ns | 1.52ns | 0.00963 | 0 | 0 | 696 B |
master | RunOnMethodBegin |
netcoreapp3.1 | 950ns | 0.804ns | 3.11ns | 0.00949 | 0 | 0 | 696 B |
master | RunOnMethodBegin |
net472 | 1.2μs | 1.7ns | 6.14ns | 0.104 | 0 | 0 | 658 B |
#6215 | RunOnMethodBegin |
net6.0 | 662ns | 0.757ns | 2.93ns | 0.00994 | 0 | 0 | 696 B |
#6215 | RunOnMethodBegin |
netcoreapp3.1 | 934ns | 1.02ns | 3.96ns | 0.00924 | 0 | 0 | 696 B |
#6215 | RunOnMethodBegin |
net472 | 1.08μs | 0.669ns | 2.5ns | 0.104 | 0 | 0 | 658 B |
Datadog ReportBranch report: ✅ 0 Failed, 372615 Passed, 2416 Skipped, 17h 6m 37.62s Total Time New Flaky Tests (1)
|
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.
Great!
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.
🙈
Throughput/Crank Report ⚡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 (6215) (11.214M) : 0, 11214051
master (10.970M) : 0, 10969978
benchmarks/2.9.0 (11.081M) : 0, 11080577
section Automatic
This PR (6215) (7.399M) : 0, 7398829
master (7.292M) : 0, 7292209
benchmarks/2.9.0 (7.732M) : 0, 7732233
section Trace stats
master (7.582M) : 0, 7581616
section Manual
master (10.995M) : 0, 10995398
section Manual + Automatic
This PR (6215) (6.868M) : 0, 6868238
master (6.739M) : 0, 6738798
section DD_TRACE_ENABLED=0
master (10.175M) : 0, 10175402
gantt
title Throughput Linux arm64 (Total requests)
dateFormat X
axisFormat %s
section Baseline
This PR (6215) (9.732M) : 0, 9732290
master (9.569M) : 0, 9568691
benchmarks/2.9.0 (9.798M) : 0, 9798067
section Automatic
This PR (6215) (6.569M) : 0, 6568750
master (6.420M) : 0, 6420401
section Trace stats
master (6.834M) : 0, 6833970
section Manual
master (9.445M) : 0, 9445274
section Manual + Automatic
This PR (6215) (5.988M) : 0, 5988359
master (6.093M) : 0, 6093411
section DD_TRACE_ENABLED=0
master (9.051M) : 0, 9051079
gantt
title Throughput Windows x64 (Total requests)
dateFormat X
axisFormat %s
section Baseline
This PR (6215) (9.919M) : 0, 9918732
master (9.836M) : 0, 9836175
benchmarks/2.9.0 (10.067M) : 0, 10067315
section Automatic
This PR (6215) (6.583M) : 0, 6583489
master (6.529M) : 0, 6529158
benchmarks/2.9.0 (7.552M) : 0, 7552193
section Trace stats
master (7.181M) : 0, 7181034
section Manual
master (9.635M) : 0, 9634854
section Manual + Automatic
This PR (6215) (6.001M) : 0, 6000793
master (5.980M) : 0, 5980484
section DD_TRACE_ENABLED=0
master (9.130M) : 0, 9130402
|
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.
If it builds and tests pass 🙈
SET(PDB_COMMAND touch stub.c && gcc -o stub.o -c stub.c -target ${OSX_ARCH}-apple-darwin${CMAKE_HOST_SYSTEM_VERSION} && ld -r -o Datadog.Trace.ClrProfiler.Managed.Loader.pdb.o -sectcreate binary pdb Datadog.Trace.ClrProfiler.Managed.Loader.pdb stub.o) | ||
SET(DLL_COMMAND touch stub.c && gcc -o stub.o -c stub.c -target ${OSX_ARCH}-apple-darwin${CMAKE_HOST_SYSTEM_VERSION} && ld -r -o Datadog.Trace.ClrProfiler.Managed.Loader.dll.o -sectcreate binary dll Datadog.Trace.ClrProfiler.Managed.Loader.dll stub.o) | ||
SET(PDB_COMMAND touch stub.c && | ||
gcc -o stub.arm64.o -c stub.c -target arm64-apple-darwin${CMAKE_HOST_SYSTEM_VERSION} && |
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.
You don't need any \
for line continuations etc?
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.
nope here, that will not translate the new line to the final command, but helps me to visualise this better.
Summary of changes
This PR fixes an issue when using CLion on OSX
Reason for change
the CMakeList.txt import the glibc-compat project causing the issue in OSX due the change on the C version.
Implementation details
We skip the definition of this project for osx because is not required in the operating system.
Test coverage
If the pipeline is green then everything works correctly.
Other details