-
Notifications
You must be signed in to change notification settings - Fork 143
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 the filepath we check for datadog.json to the output of diagnostic tool #6273
Conversation
outputs `configurationFileName` in TryLoadJsonConfigurationFile and we print it
tracer/src/Datadog.Trace.Tools.dd_dotnet/Checks/ProcessConfiguration.cs
Outdated
Show resolved
Hide resolved
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 (6273) - mean (69ms) : 67, 71
. : milestone, 69,
master - mean (69ms) : 66, 72
. : milestone, 69,
section CallTarget+Inlining+NGEN
This PR (6273) - mean (979ms) : 954, 1004
. : milestone, 979,
master - mean (980ms) : 957, 1004
. : milestone, 980,
gantt
title Execution time (ms) FakeDbCommand (.NET Core 3.1)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (6273) - mean (109ms) : 106, 111
. : milestone, 109,
master - mean (108ms) : 105, 112
. : milestone, 108,
section CallTarget+Inlining+NGEN
This PR (6273) - mean (680ms) : 664, 696
. : milestone, 680,
master - mean (685ms) : 667, 704
. : milestone, 685,
gantt
title Execution time (ms) FakeDbCommand (.NET 6)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (6273) - mean (92ms) : 89, 94
. : milestone, 92,
master - mean (92ms) : 89, 94
. : milestone, 92,
section CallTarget+Inlining+NGEN
This PR (6273) - mean (633ms) : 614, 652
. : milestone, 633,
master - mean (632ms) : 616, 648
. : milestone, 632,
gantt
title Execution time (ms) HttpMessageHandler (.NET Framework 4.6.2)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (6273) - mean (190ms) : 185, 195
. : milestone, 190,
master - mean (190ms) : 186, 195
. : milestone, 190,
section CallTarget+Inlining+NGEN
This PR (6273) - mean (1,085ms) : 1059, 1110
. : milestone, 1085,
master - mean (1,093ms) : 1058, 1128
. : milestone, 1093,
gantt
title Execution time (ms) HttpMessageHandler (.NET Core 3.1)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (6273) - mean (277ms) : 273, 281
. : milestone, 277,
master - mean (276ms) : 272, 281
. : milestone, 276,
section CallTarget+Inlining+NGEN
This PR (6273) - mean (868ms) : 836, 901
. : milestone, 868,
master - mean (866ms) : 832, 900
. : milestone, 866,
gantt
title Execution time (ms) HttpMessageHandler (.NET 6)
dateFormat X
axisFormat %s
todayMarker off
section Baseline
This PR (6273) - mean (266ms) : 262, 270
. : milestone, 266,
master - mean (265ms) : 261, 269
. : milestone, 265,
section CallTarget+Inlining+NGEN
This PR (6273) - mean (849ms) : 818, 880
. : milestone, 849,
master - mean (896ms) : 803, 990
. : milestone, 896,
|
Datadog ReportBranch report: ✅ 0 Failed, 450999 Passed, 2739 Skipped, 19h 6m 46.97s Total Time |
Benchmarks Report for tracer 🐌Benchmarks for #6273 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 - Slower
|
Benchmark | diff/base | Base Median (ns) | Diff Median (ns) | Modality |
---|---|---|---|---|
Benchmarks.Trace.ILoggerBenchmark.EnrichedLog‑net6.0 | 1.143 | 1,430.64 | 1,635.42 |
Raw results
Branch | Method | Toolchain | Mean | StdError | StdDev | Gen 0 | Gen 1 | Gen 2 | Allocated |
---|---|---|---|---|---|---|---|---|---|
master | EnrichedLog |
net6.0 | 1.43μs | 0.522ns | 1.88ns | 0.0229 | 0 | 0 | 1.64 KB |
master | EnrichedLog |
netcoreapp3.1 | 2.26μs | 0.877ns | 3.28ns | 0.0216 | 0 | 0 | 1.64 KB |
master | EnrichedLog |
net472 | 2.73μs | 2.1ns | 8.12ns | 0.249 | 0 | 0 | 1.57 KB |
#6273 | EnrichedLog |
net6.0 | 1.63μs | 1.75ns | 6.79ns | 0.0229 | 0 | 0 | 1.64 KB |
#6273 | EnrichedLog |
netcoreapp3.1 | 2.42μs | 1.02ns | 3.93ns | 0.0227 | 0 | 0 | 1.64 KB |
#6273 | EnrichedLog |
net472 | 2.66μs | 1.36ns | 5.09ns | 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 | 119μs | 123ns | 477ns | 0.0599 | 0 | 0 | 4.28 KB |
master | EnrichedLog |
netcoreapp3.1 | 123μs | 262ns | 1.01μs | 0.0615 | 0 | 0 | 4.28 KB |
master | EnrichedLog |
net472 | 151μs | 180ns | 699ns | 0.683 | 0.228 | 0 | 4.46 KB |
#6273 | EnrichedLog |
net6.0 | 118μs | 286ns | 1.11μs | 0.0604 | 0 | 0 | 4.28 KB |
#6273 | EnrichedLog |
netcoreapp3.1 | 124μs | 169ns | 654ns | 0 | 0 | 0 | 4.28 KB |
#6273 | EnrichedLog |
net472 | 152μs | 99.2ns | 384ns | 0.682 | 0.227 | 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.02μs | 1.13ns | 4.23ns | 0.0302 | 0 | 0 | 2.2 KB |
master | EnrichedLog |
netcoreapp3.1 | 4.19μs | 1.25ns | 4.68ns | 0.0294 | 0 | 0 | 2.2 KB |
master | EnrichedLog |
net472 | 4.86μs | 1.26ns | 4.87ns | 0.319 | 0 | 0 | 2.02 KB |
#6273 | EnrichedLog |
net6.0 | 3.12μs | 2.13ns | 7.69ns | 0.0313 | 0 | 0 | 2.2 KB |
#6273 | EnrichedLog |
netcoreapp3.1 | 4.32μs | 2.13ns | 8.25ns | 0.0301 | 0 | 0 | 2.2 KB |
#6273 | EnrichedLog |
net472 | 5.01μs | 1.25ns | 4.67ns | 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.32μs | 0.675ns | 2.53ns | 0.016 | 0 | 0 | 1.14 KB |
master | SendReceive |
netcoreapp3.1 | 1.72μs | 0.739ns | 2.86ns | 0.0154 | 0 | 0 | 1.14 KB |
master | SendReceive |
net472 | 2.06μs | 2.04ns | 7.89ns | 0.183 | 0 | 0 | 1.16 KB |
#6273 | SendReceive |
net6.0 | 1.47μs | 0.614ns | 2.38ns | 0.0161 | 0 | 0 | 1.14 KB |
#6273 | SendReceive |
netcoreapp3.1 | 1.72μs | 0.839ns | 3.25ns | 0.0154 | 0 | 0 | 1.14 KB |
#6273 | SendReceive |
net472 | 2.03μs | 2.61ns | 10.1ns | 0.183 | 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 | 1.37ns | 5.14ns | 0.0228 | 0 | 0 | 1.6 KB |
master | EnrichedLog |
netcoreapp3.1 | 3.97μs | 1.99ns | 7.72ns | 0.0219 | 0 | 0 | 1.65 KB |
master | EnrichedLog |
net472 | 4.37μs | 2.06ns | 7.13ns | 0.323 | 0 | 0 | 2.04 KB |
#6273 | EnrichedLog |
net6.0 | 2.85μs | 1.44ns | 5.58ns | 0.0215 | 0 | 0 | 1.6 KB |
#6273 | EnrichedLog |
netcoreapp3.1 | 3.91μs | 2.01ns | 7.8ns | 0.0211 | 0 | 0 | 1.65 KB |
#6273 | EnrichedLog |
net472 | 4.48μs | 3.92ns | 15.2ns | 0.323 | 0 | 0 | 2.04 KB |
Benchmarks.Trace.SpanBenchmark - Slower ⚠️ Same allocations ✔️
Slower ⚠️ in #6273
Benchmark
diff/base
Base Median (ns)
Diff Median (ns)
Modality
Benchmarks.Trace.SpanBenchmark.StartFinishScope‑net6.0
1.201
483.30
580.51
Faster 🎉 in #6273
Benchmark
base/diff
Base Median (ns)
Diff Median (ns)
Modality
Benchmarks.Trace.SpanBenchmark.StartFinishSpan‑net6.0
1.151
455.80
395.94
Benchmark | diff/base | Base Median (ns) | Diff Median (ns) | Modality |
---|---|---|---|---|
Benchmarks.Trace.SpanBenchmark.StartFinishScope‑net6.0 | 1.201 | 483.30 | 580.51 |
Benchmark | base/diff | Base Median (ns) | Diff Median (ns) | Modality |
---|---|---|---|---|
Benchmarks.Trace.SpanBenchmark.StartFinishSpan‑net6.0 | 1.151 | 455.80 | 395.94 |
Raw results
Branch | Method | Toolchain | Mean | StdError | StdDev | Gen 0 | Gen 1 | Gen 2 | Allocated |
---|---|---|---|---|---|---|---|---|---|
master | StartFinishSpan |
net6.0 | 456ns | 0.117ns | 0.439ns | 0.00819 | 0 | 0 | 576 B |
master | StartFinishSpan |
netcoreapp3.1 | 612ns | 0.431ns | 1.67ns | 0.00783 | 0 | 0 | 576 B |
master | StartFinishSpan |
net472 | 701ns | 0.35ns | 1.35ns | 0.0916 | 0 | 0 | 578 B |
master | StartFinishScope |
net6.0 | 483ns | 0.207ns | 0.803ns | 0.00974 | 0 | 0 | 696 B |
master | StartFinishScope |
netcoreapp3.1 | 795ns | 0.468ns | 1.75ns | 0.00919 | 0 | 0 | 696 B |
master | StartFinishScope |
net472 | 869ns | 0.484ns | 1.88ns | 0.104 | 0 | 0 | 658 B |
#6273 | StartFinishSpan |
net6.0 | 396ns | 0.115ns | 0.413ns | 0.00798 | 0 | 0 | 576 B |
#6273 | StartFinishSpan |
netcoreapp3.1 | 568ns | 3.25ns | 23.6ns | 0.0079 | 0 | 0 | 576 B |
#6273 | StartFinishSpan |
net472 | 743ns | 0.484ns | 1.87ns | 0.0916 | 0 | 0 | 578 B |
#6273 | StartFinishScope |
net6.0 | 580ns | 0.352ns | 1.36ns | 0.00964 | 0 | 0 | 696 B |
#6273 | StartFinishScope |
netcoreapp3.1 | 744ns | 0.558ns | 2.16ns | 0.00973 | 0 | 0 | 696 B |
#6273 | StartFinishScope |
net472 | 883ns | 0.287ns | 1.11ns | 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 | 685ns | 0.359ns | 1.39ns | 0.00954 | 0 | 0 | 696 B |
master | RunOnMethodBegin |
netcoreapp3.1 | 955ns | 0.461ns | 1.79ns | 0.00954 | 0 | 0 | 696 B |
master | RunOnMethodBegin |
net472 | 1.11μs | 0.797ns | 2.87ns | 0.105 | 0 | 0 | 658 B |
#6273 | RunOnMethodBegin |
net6.0 | 660ns | 0.24ns | 0.899ns | 0.00961 | 0 | 0 | 696 B |
#6273 | RunOnMethodBegin |
netcoreapp3.1 | 1μs | 0.558ns | 2.09ns | 0.00909 | 0 | 0 | 696 B |
#6273 | RunOnMethodBegin |
net472 | 1.12μs | 0.688ns | 2.57ns | 0.104 | 0 | 0 | 658 B |
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 (6273) (11.281M) : 0, 11281282
master (11.227M) : 0, 11226681
benchmarks/2.9.0 (11.033M) : 0, 11032866
section Automatic
This PR (6273) (7.334M) : 0, 7334272
master (7.304M) : 0, 7304407
benchmarks/2.9.0 (7.786M) : 0, 7785853
section Trace stats
master (7.538M) : 0, 7538390
section Manual
master (11.369M) : 0, 11369387
section Manual + Automatic
This PR (6273) (6.824M) : 0, 6824232
master (6.752M) : 0, 6752251
section DD_TRACE_ENABLED=0
master (10.342M) : 0, 10342303
gantt
title Throughput Linux arm64 (Total requests)
dateFormat X
axisFormat %s
section Baseline
This PR (6273) (9.762M) : 0, 9761795
master (9.354M) : 0, 9354138
benchmarks/2.9.0 (9.495M) : 0, 9494821
section Automatic
This PR (6273) (6.414M) : 0, 6414118
master (6.353M) : 0, 6353370
section Trace stats
master (6.599M) : 0, 6598729
section Manual
master (9.476M) : 0, 9475552
section Manual + Automatic
This PR (6273) (5.969M) : 0, 5969411
master (5.943M) : 0, 5942843
section DD_TRACE_ENABLED=0
master (8.875M) : 0, 8875031
gantt
title Throughput Windows x64 (Total requests)
dateFormat X
axisFormat %s
section Baseline
This PR (6273) (10.385M) : 0, 10385248
master (10.132M) : 0, 10131852
benchmarks/2.9.0 (10.020M) : 0, 10019592
section Automatic
This PR (6273) (6.725M) : 0, 6725095
master (6.697M) : 0, 6696840
benchmarks/2.9.0 (7.255M) : 0, 7255257
section Trace stats
master (7.321M) : 0, 7320806
section Manual
master (10.073M) : 0, 10072874
section Manual + Automatic
This PR (6273) (6.239M) : 0, 6238618
master (6.233M) : 0, 6232865
section DD_TRACE_ENABLED=0
master (9.544M) : 0, 9544007
|
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 think it's good
Left a comment for a potential improvement, but I'm unsure if it'd help or be worthwhile.
IMO (and I may be wrong) but making a test for this isn't too important
…c tool (#6273) outputs `configurationFileName` in TryLoadJsonConfigurationFile and we print it ## Summary of changes add the directory where we look for `datadog.json` in the tracer logs and in the diagnostic tool ## Reason for change https://datadoghq.atlassian.net/browse/APMLP-297 Customer confusion over why their configuration isn't picked up. ## Implementation details Log where the directory we check the json for is. ## Test coverage Need to create a test to check this programmatically in the future, but here's the results running it manually on IIS/Process (IIS check calls the process check) datadog.json read: ![image](https://github.com/user-attachments/assets/8614c834-e08d-47af-8135-f5a10000ca4d) datadog.json not read: ![image](https://github.com/user-attachments/assets/c49fe373-47da-47e6-b604-29d673d93533) ## Other details <!-- Fixes #{issue} --> <!--⚠️ Note: where possible, please obtain 2 approvals prior to merging. Unless CODEOWNERS specifies otherwise, for external teams it is typically best to have one review from a team member, and one review from apm-dotnet. Trivial changes do not require 2 reviews. -->
outputs
configurationFileName
in TryLoadJsonConfigurationFile and we print itSummary of changes
add the directory where we look for
datadog.json
in the tracer logs and in the diagnostic toolReason for change
https://datadoghq.atlassian.net/browse/APMLP-297
Customer confusion over why their configuration isn't picked up.
Implementation details
Log where the directory we check the json for is.
Test coverage
Need to create a test to check this programmatically, but here's the results running it manually on IIS/Process (IIS check calls the process check)
datadog.json read:
datadog.json not read:
Other details