Skip to content

Remove remaining references to nlohmann.json NuGet package#2691

Merged
zacharycmontoya merged 2 commits into
masterfrom
zach/remove-nlohmann-json
Apr 19, 2022
Merged

Remove remaining references to nlohmann.json NuGet package#2691
zacharycmontoya merged 2 commits into
masterfrom
zach/remove-nlohmann-json

Conversation

@zacharycmontoya

@zacharycmontoya zacharycmontoya commented Apr 15, 2022

Copy link
Copy Markdown
Contributor

Summary of changes

Removes remaining references to nlohmann.json NuGet package. Thanks @Kielek for spotting this!

Reason for change

This is no longer needed since we no longer use integrations.json to read integrations.

Implementation details

N/A

Test coverage

N/A

Other details

N/A

@zacharycmontoya
Removes remaining references to nlohmann.json NuGet package, which wa…
11e33e0 
…s removed from production code when integrations.json was removed
@zacharycmontoya zacharycmontoya added the type:cleanup Minor code clean up label Apr 15, 2022
@zacharycmontoya
zacharycmontoya requested a review from a team as a code owner April 15, 2022 15:35
@zacharycmontoya zacharycmontoya self-assigned this Apr 15, 2022
@lucaspimentel lucaspimentel added the area:native-library Automatic instrumentation native C++ code (Datadog.Trace.ClrProfiler.Native) label Apr 15, 2022
@andrewlock

andrewlock commented Apr 15, 2022

Copy link
Copy Markdown
Member

Code Coverage Report 📊

✔️ Merging #2691 into master will not change line coverage
✔️ Merging #2691 into master will not change branch coverage
⛔ Merging #2691 into master will will increase complexity by 168

master #2691 Change
Lines 13537 / 18627 13634 / 18778
Lines % 73% 73% 0% ✔️
Branches 7815 / 11125 7910 / 11271
Branches % 70% 70% 0% ✔️
Complexity 12431 12599 168 ⛔

View the full report for further details:

Datadog.Trace Breakdown ✔️

master #2691 Change
Lines % 73% 73% 0% ✔️
Branches % 70% 70% 0% ✔️
Complexity 12431 12599 168 ⛔

The following classes have significant coverage changes.

File Line coverage change Branch coverage change Complexity change
Datadog.Trace.TracerManager -9% ⛔ -17% ⛔ 33 ⛔
Datadog.Trace.Configuration.ExporterSettings -6% ⛔ -7% ⛔ 133 ⛔
Datadog.Trace.Ci.CIVisibility 7% ✔️ 7% ✔️ 0 ✔️
Datadog.Trace.Ci.Processors.OriginTagTraceProcessor 9% ✔️ 17% ✔️ 0 ✔️
Datadog.Trace.Telemetry.JsonHttpClientTelemetryTransport 26% ✔️ 38% ✔️ 0 ✔️

View the full reports for further details:

@andrewlock

andrewlock commented Apr 15, 2022

Copy link
Copy Markdown
Member

Benchmarks Report 🐌

Benchmarks for #2691 compared to master:

  • 1 benchmarks are slower, with geometric mean 1.168
  • 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 923μs 4.08μs 16.8μs 0 0 0 3.16 KB
master WriteAndFlushEnrichedTraces netcoreapp3.1 692μs 2.79μs 10.4μs 0 0 0 2.57 KB
#2691 WriteAndFlushEnrichedTraces net472 960μs 5.12μs 27.1μs 0 0 0 3.16 KB
#2691 WriteAndFlushEnrichedTraces netcoreapp3.1 705μs 3.02μs 11.3μs 0 0 0 2.57 KB
Benchmarks.Trace.AppSecBodyBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master AllCycleSimpleBody net472 288ns 1.35ns 5.21ns 0.0519 0 0 329 B
master AllCycleSimpleBody netcoreapp3.1 375ns 1.37ns 4.95ns 0.00462 0 0 328 B
master AllCycleMoreComplexBody net472 299ns 1.73ns 13.9ns 0.0482 0 0 305 B
master AllCycleMoreComplexBody netcoreapp3.1 371ns 1.83ns 7.78ns 0.00422 0 0 304 B
master BodyExtractorSimpleBody net472 423ns 2.37ns 15.9ns 0.0569 0 0 361 B
master BodyExtractorSimpleBody netcoreapp3.1 452ns 2.31ns 10.3ns 0.00376 0 0 272 B
master BodyExtractorMoreComplexBody net472 24μs 89.3ns 346ns 1.19 0.0125 0 7.62 KB
master BodyExtractorMoreComplexBody netcoreapp3.1 21.6μs 105ns 444ns 0.0931 0 0 6.75 KB
#2691 AllCycleSimpleBody net472 298ns 1.6ns 8.6ns 0.0519 0 0 329 B
#2691 AllCycleSimpleBody netcoreapp3.1 380ns 1.91ns 8.74ns 0.00461 0 0 328 B
#2691 AllCycleMoreComplexBody net472 293ns 1.08ns 4.06ns 0.0482 0 0 305 B
#2691 AllCycleMoreComplexBody netcoreapp3.1 373ns 0.959ns 3.46ns 0.00413 0 0 304 B
#2691 BodyExtractorSimpleBody net472 414ns 1.47ns 5.51ns 0.057 0 0 361 B
#2691 BodyExtractorSimpleBody netcoreapp3.1 443ns 2.35ns 11.3ns 0.00378 0 0 272 B
#2691 BodyExtractorMoreComplexBody net472 24.2μs 94.2ns 326ns 1.19 0.0118 0 7.62 KB
#2691 BodyExtractorMoreComplexBody netcoreapp3.1 21μs 102ns 445ns 0.094 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 293μs 1.51μs 7.07μs 0.143 0 0 19.74 KB
#2691 SendRequest net472 0ns 0ns 0ns 0 0 0 0 b
#2691 SendRequest netcoreapp3.1 299μs 1.6μs 8.94μs 0.149 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.67μs 8.7ns 42.6ns 0.0943 0.000827 0 594 B
master ExecuteNonQuery netcoreapp3.1 1.51μs 7.56ns 49ns 0.00838 0 0 632 B
#2691 ExecuteNonQuery net472 1.79μs 10.1ns 73.2ns 0.0938 0.000861 0 594 B
#2691 ExecuteNonQuery netcoreapp3.1 1.47μs 5.39ns 19.4ns 0.00851 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.67μs 13.3ns 70.1ns 0.126 0 0 802 B
master CallElasticsearch netcoreapp3.1 1.72μs 7.84ns 30.4ns 0.0109 0 0 792 B
master CallElasticsearchAsync net472 3μs 15.8ns 83.8ns 0.148 0 0 939 B
master CallElasticsearchAsync netcoreapp3.1 1.79μs 4.06ns 14.6ns 0.0126 0 0 912 B
#2691 CallElasticsearch net472 2.51μs 13.4ns 67.1ns 0.126 0 0 802 B
#2691 CallElasticsearch netcoreapp3.1 1.86μs 9.43ns 57.4ns 0.0109 0 0 792 B
#2691 CallElasticsearchAsync net472 2.76μs 15ns 87.2ns 0.149 0.00139 0 939 B
#2691 CallElasticsearchAsync netcoreapp3.1 1.89μs 9.25ns 38.1ns 0.0123 0 0 912 B
Benchmarks.Trace.GraphQLBenchmark - Slower ⚠️ Same allocations ✔️

Slower ⚠️ in #2691

Benchmark diff/base Base Median (ns) Diff Median (ns) Modality
Benchmarks.Trace.GraphQLBenchmark.ExecuteAsync‑net472 1.168 2,895.86 3,382.82

Raw results

Branch Method Toolchain Mean StdError StdDev Gen 0 Gen 1 Gen 2 Allocated
master ExecuteAsync net472 2.9μs 11.2ns 43.5ns 0.167 0 0 1.06 KB
master ExecuteAsync netcoreapp3.1 2.06μs 8.7ns 36.9ns 0.0142 0 0 1.03 KB
#2691 ExecuteAsync net472 3.4μs 15.5ns 99.2ns 0.168 0 0 1.06 KB
#2691 ExecuteAsync netcoreapp3.1 2.04μs 7.69ns 27.7ns 0.0145 0 0 1.03 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 6.57μs 25.4ns 95ns 0.36 0 0 2.28 KB
master SendAsync netcoreapp3.1 5.01μs 28.4ns 199ns 0.0311 0 0 2.21 KB
#2691 SendAsync net472 7.21μs 34.1ns 145ns 0.36 0 0 2.28 KB
#2691 SendAsync netcoreapp3.1 4.91μs 17.2ns 64.4ns 0.0299 0 0 2.21 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.54μs 10.7ns 42.7ns 0.228 0 0 1.45 KB
master EnrichedLog netcoreapp3.1 3.25μs 15.3ns 61.1ns 0.0217 0 0 1.53 KB
#2691 EnrichedLog net472 3.79μs 21.5ns 146ns 0.227 0 0 1.45 KB
#2691 EnrichedLog netcoreapp3.1 3.14μs 13.9ns 60.8ns 0.0221 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 291μs 1.25μs 4.85μs 0.426 0.142 0 4.33 KB
master EnrichedLog netcoreapp3.1 225μs 646ns 2.42μs 0 0 0 4.21 KB
#2691 EnrichedLog net472 291μs 1.57μs 9.3μs 0.442 0.147 0 4.33 KB
#2691 EnrichedLog netcoreapp3.1 225μs 767ns 2.77μ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 8.05μs 44.6ns 296ns 0.503 0 0 3.23 KB
master EnrichedLog netcoreapp3.1 6.69μs 31.6ns 126ns 0.0489 0 0 3.6 KB
#2691 EnrichedLog net472 7.42μs 37.9ns 240ns 0.504 0 0 3.23 KB
#2691 EnrichedLog netcoreapp3.1 6.75μs 32.5ns 169ns 0.0496 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.63μs 13ns 55ns 0.16 0.00127 0 1.01 KB
master SendReceive netcoreapp3.1 2.12μs 9.86ns 39.4ns 0.014 0 0 1.01 KB
#2691 SendReceive net472 2.4μs 13ns 75.7ns 0.16 0.00255 0.00128 1.01 KB
#2691 SendReceive netcoreapp3.1 2.11μs 9.44ns 36.6ns 0.0138 0 0 1.01 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 6.87μs 32.1ns 124ns 0.289 0 0 1.87 KB
master EnrichedLog netcoreapp3.1 5.72μs 31ns 167ns 0.0194 0 0 1.49 KB
#2691 EnrichedLog net472 6.34μs 33ns 171ns 0.292 0 0 1.87 KB
#2691 EnrichedLog netcoreapp3.1 5.24μs 24.5ns 94.9ns 0.0205 0 0 1.49 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 973ns 4.7ns 18.8ns 0.0717 0 0 457 B
master StartFinishSpan netcoreapp3.1 864ns 3.35ns 12.5ns 0.00604 0 0 456 B
master StartFinishScope net472 1.06μs 5.78ns 33.2ns 0.0846 0 0 538 B
master StartFinishScope netcoreapp3.1 1.1μs 6.33ns 49.8ns 0.00806 0 0 576 B
#2691 StartFinishSpan net472 918ns 5ns 28.3ns 0.0719 0 0 457 B
#2691 StartFinishSpan netcoreapp3.1 891ns 4.05ns 22.6ns 0.00613 0 0 456 B
#2691 StartFinishScope net472 1.09μs 4.49ns 16.8ns 0.0845 0 0 538 B
#2691 StartFinishScope netcoreapp3.1 1.05μs 5.11ns 21.7ns 0.00784 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.48μs 7.56ns 33.8ns 0.0838 0 0 538 B
master RunOnMethodBegin netcoreapp3.1 1.22μs 4.71ns 17ns 0.00821 0 0 576 B
#2691 RunOnMethodBegin net472 1.38μs 7.84ns 55.4ns 0.0841 0 0 538 B
#2691 RunOnMethodBegin netcoreapp3.1 1.2μs 6.49ns 38.9ns 0.00763 0 0 576 B

@zacharycmontoya
zacharycmontoya merged commit 443c791 into master Apr 19, 2022
@zacharycmontoya
zacharycmontoya deleted the zach/remove-nlohmann-json branch April 19, 2022 18:03
@github-actions github-actions Bot added this to the vNext milestone Apr 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lucaspimentel lucaspimentel lucaspimentel approved these changes
@andrewlock andrewlock andrewlock approved these changes
+1 more reviewer
@Kielek Kielek Kielek approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@zacharycmontoya zacharycmontoya

Labels

area:native-library Automatic instrumentation native C++ code (Datadog.Trace.ClrProfiler.Native) type:cleanup Minor code clean up

Projects

None yet

Milestone

2.7.0

Development

Successfully merging this pull request may close these issues.

4 participants

@zacharycmontoya @andrewlock @lucaspimentel @Kielek