[Tracer] Finishes Adding Support for ActivityLink #5627

link04 · 2024-05-29T18:41:31Z

Summary of changes

Using the contents of #5019 to translate span links based on the ActivityLink class with the internal SpanLinks class added in: #5354

Reason for change

To add support for OTEL Span Links: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/overview.md#links-between-spans

Test coverage

Updated sample app and related snapshots.
All 5 Otel System Tests passed locally.

sudo TEST_LIBRARY=dotnet ./run.sh PARAMETRIC tests/parametric/test_otel_span_methods.py::Test_Otel_Span_Methods::test_otel_span_link_attribute_handling
sudo TEST_LIBRARY=dotnet ./run.sh PARAMETRIC tests/parametric/test_otel_span_methods.py::Test_Otel_Span_Methods::test_otel_span_started_with_link_from_w3c_headers
sudo TEST_LIBRARY=dotnet ./run.sh PARAMETRIC tests/parametric/test_otel_span_methods.py::Test_Otel_Span_Methods::test_otel_span_started_with_link_from_datadog_headers
sudo TEST_LIBRARY=dotnet ./run.sh PARAMETRIC tests/parametric/test_otel_span_methods.py::Test_Otel_Span_Methods::test_otel_span_started_with_link_from_another_span
sudo TEST_LIBRARY=dotnet ./run.sh PARAMETRIC tests/parametric/test_otel_span_methods.py::Test_Otel_Span_Methods::test_otel_span_started_with_link_from_datadog_headers

datadog-ddstaging · 2024-05-29T18:57:17Z

Datadog Report

Branch report: maximo/span-links
Commit report: f0a1d80
Test service: dd-trace-dotnet

✅ 0 Failed, 342605 Passed, 1679 Skipped, 14h 1m 8.87s Total Time

andrewlock · 2024-05-29T19:13:16Z

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:

Welch test with statistical test for significance of 5%
Only results indicating a difference greater than 5% and 5 ms are considered.

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 (5627) - mean (74ms)  : 63, 85
     .   : milestone, 74,
    master - mean (75ms)  : 65, 85
     .   : milestone, 75,

    section CallTarget+Inlining+NGEN
    This PR (5627) - mean (993ms)  : 969, 1016
     .   : milestone, 993,
    master - mean (988ms)  : 961, 1014
     .   : milestone, 988,

gantt
    title Execution time (ms) FakeDbCommand (.NET Core 3.1) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (5627) - mean (109ms)  : 105, 112
     .   : milestone, 109,
    master - mean (110ms)  : 106, 113
     .   : milestone, 110,

    section CallTarget+Inlining+NGEN
    This PR (5627) - mean (688ms)  : 662, 714
     .   : milestone, 688,
    master - mean (690ms)  : 668, 713
     .   : milestone, 690,

gantt
    title Execution time (ms) FakeDbCommand (.NET 6) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (5627) - mean (94ms)  : 91, 97
     .   : milestone, 94,
    master - mean (93ms)  : 90, 95
     .   : milestone, 93,

    section CallTarget+Inlining+NGEN
    This PR (5627) - mean (650ms)  : 624, 676
     .   : milestone, 650,
    master - mean (651ms)  : 629, 674
     .   : milestone, 651,

gantt
    title Execution time (ms) HttpMessageHandler (.NET Framework 4.6.2) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (5627) - mean (192ms)  : 188, 196
     .   : milestone, 192,
    master - mean (193ms)  : 189, 197
     .   : milestone, 193,

    section CallTarget+Inlining+NGEN
    This PR (5627) - mean (1,091ms)  : 1068, 1115
     .   : milestone, 1091,
    master - mean (1,085ms)  : 1063, 1108
     .   : milestone, 1085,

gantt
    title Execution time (ms) HttpMessageHandler (.NET Core 3.1) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (5627) - mean (277ms)  : 273, 281
     .   : milestone, 277,
    master - mean (278ms)  : 273, 282
     .   : milestone, 278,

    section CallTarget+Inlining+NGEN
    This PR (5627) - mean (866ms)  : 847, 885
     .   : milestone, 866,
    master - mean (866ms)  : 845, 887
     .   : milestone, 866,

gantt
    title Execution time (ms) HttpMessageHandler (.NET 6) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (5627) - mean (267ms)  : 264, 271
     .   : milestone, 267,
    master - mean (267ms)  : 263, 272
     .   : milestone, 267,

    section CallTarget+Inlining+NGEN
    This PR (5627) - mean (860ms)  : 833, 886
     .   : milestone, 860,
    master - mean (857ms)  : 833, 882
     .   : milestone, 857,

andrewlock · 2024-05-29T19:38:16Z

Throughput/Crank Report:zap:

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 (5627) (11.356M)   : 0, 11355765
    master (11.764M)   : 0, 11764029
    benchmarks/2.9.0 (11.712M)   : 0, 11712107

    section Automatic
    This PR (5627) (7.692M)   : 0, 7692274
    master (7.987M)   : 0, 7986561
    benchmarks/2.9.0 (8.389M)   : 0, 8388971

    section Trace stats
    master (8.209M)   : 0, 8208701

    section Manual
    This PR (5627) (9.671M)   : 0, 9671344
    master (10.089M)   : 0, 10088580

    section Manual + Automatic
    This PR (5627) (7.157M)   : crit ,0, 7157101
    master (7.576M)   : 0, 7576297

    section Version Conflict
    master (6.887M)   : 0, 6886872

gantt
    title Throughput Linux arm64 (Total requests) 
    dateFormat  X
    axisFormat %s
    section Baseline
    This PR (5627) (9.675M)   : 0, 9674587
    master (9.517M)   : 0, 9516891
    benchmarks/2.9.0 (9.415M)   : 0, 9415387

    section Automatic
    This PR (5627) (6.585M)   : 0, 6585089
    master (6.484M)   : 0, 6483780

    section Trace stats
    master (6.686M)   : 0, 6685605

    section Manual
    This PR (5627) (7.936M)   : 0, 7936389
    master (8.143M)   : 0, 8142520

    section Manual + Automatic
    This PR (5627) (6.242M)   : 0, 6241566
    master (6.109M)   : 0, 6108548

    section Version Conflict
    master (5.697M)   : 0, 5696670

gantt
    title Throughput Windows x64 (Total requests) 
    dateFormat  X
    axisFormat %s
    section Baseline
    This PR (5627) (10.231M)   : 0, 10230961
    master (9.819M)   : 0, 9819067
    benchmarks/2.9.0 (10.178M)   : 0, 10177730

    section Automatic
    This PR (5627) (7.143M)   : 0, 7143154
    master (7.173M)   : 0, 7173008
    benchmarks/2.9.0 (7.525M)   : 0, 7525377

    section Trace stats
    master (7.406M)   : 0, 7406270

    section Manual
    This PR (5627) (8.948M)   : 0, 8948197
    master (8.906M)   : 0, 8906429

    section Manual + Automatic
    This PR (5627) (6.870M)   : 0, 6869889
    master (6.935M)   : 0, 6934826

    section Version Conflict
    master (6.352M)   : 0, 6352277

andrewlock · 2024-05-29T20:28:29Z

Benchmarks Report for tracer 🐌

Benchmarks for #5627 compared to master:

4 benchmarks are faster, with geometric mean 1.162
1 benchmarks are slower, with geometric mean 1.137
4 benchmarks have fewer allocations
1 benchmarks have more 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.ActivityBenchmark - Faster 🎉 Fewer allocations 🎉

Faster 🎉 in #5627

Benchmark	base/diff	Base Median (ns)	Diff Median (ns)	Modality
Benchmarks.Trace.ActivityBenchmark.StartStopWithChild‑netcoreapp3.1	1.166	11,326.61	9,710.48
Benchmarks.Trace.ActivityBenchmark.StartStopWithChild‑net6.0	1.153	8,839.31	7,664.08

Fewer allocations 🎉 in #5627

Benchmark	Base Allocated	Diff Allocated	Change	Change %
Benchmarks.Trace.ActivityBenchmark.StartStopWithChild‑net472	8.21 KB	6.07 KB	-2.14 KB	-26.08%
Benchmarks.Trace.ActivityBenchmark.StartStopWithChild‑netcoreapp3.1	7.77 KB	5.62 KB	-2.15 KB	-27.71%
Benchmarks.Trace.ActivityBenchmark.StartStopWithChild‑net6.0	7.68 KB	5.43 KB	-2.25 KB	-29.29%

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Gen 1	Gen 2	Allocated
master	`StartStopWithChild`	net6.0	8.82μs	41.5ns	166ns	0.0387	0.0172	0	7.68 KB
master	`StartStopWithChild`	netcoreapp3.1	11.2μs	55.2ns	247ns	0.0266	0.0106	0	7.77 KB
master	`StartStopWithChild`	net472	17.3μs	24ns	89.9ns	1.39	0.357	0.127	8.21 KB
#5627	`StartStopWithChild`	net6.0	7.68μs	43.2ns	284ns	0.0144	0.00719	0	5.43 KB
#5627	`StartStopWithChild`	netcoreapp3.1	9.74μs	54.3ns	331ns	0.0218	0.0109	0	5.62 KB
#5627	`StartStopWithChild`	net472	16.1μs	40.5ns	151ns	1.02	0.294	0.0955	6.07 KB

Benchmarks.Trace.AgentWriterBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`WriteAndFlushEnrichedTraces`	net6.0	481μs	124ns	463ns	0	2.7 KB
master	`WriteAndFlushEnrichedTraces`	netcoreapp3.1	639μs	189ns	709ns	0	2.7 KB
master	`WriteAndFlushEnrichedTraces`	net472	853μs	238ns	921ns	0.417	3.3 KB
#5627	`WriteAndFlushEnrichedTraces`	net6.0	489μs	103ns	385ns	0	2.7 KB
#5627	`WriteAndFlushEnrichedTraces`	netcoreapp3.1	644μs	200ns	748ns	0	2.7 KB
#5627	`WriteAndFlushEnrichedTraces`	net472	836μs	202ns	783ns	0.417	3.3 KB

Benchmarks.Trace.AspNetCoreBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`SendRequest`	net6.0	171μs	240ns	929ns	0.256	18.44 KB
master	`SendRequest`	netcoreapp3.1	195μs	356ns	1.38μs	0.195	20.6 KB
master	`SendRequest`	net472	4.8E‑05ns	4.8E‑05ns	0.000173ns	0	0 b
#5627	`SendRequest`	net6.0	170μs	301ns	1.17μs	0.254	18.44 KB
#5627	`SendRequest`	netcoreapp3.1	191μs	222ns	858ns	0.191	20.6 KB
#5627	`SendRequest`	net472	0.00038ns	0.000225ns	0.000843ns	0	0 b

Benchmarks.Trace.CIVisibilityProtocolWriterBenchmark - Same speed ✔️ Fewer allocations 🎉

Fewer allocations 🎉 in #5627

Benchmark	Base Allocated	Diff Allocated	Change	Change %
Benchmarks.Trace.CIVisibilityProtocolWriterBenchmark.WriteAndFlushEnrichedTraces‑netcoreapp3.1	41.94 KB	41.68 KB	-258 B	-0.62%

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Gen 1	Gen 2	Allocated
master	`WriteAndFlushEnrichedTraces`	net6.0	553μs	445ns	1.72μs	0.558	0	0	41.69 KB
master	`WriteAndFlushEnrichedTraces`	netcoreapp3.1	652μs	736ns	2.65μs	0.332	0	0	41.94 KB
master	`WriteAndFlushEnrichedTraces`	net472	884μs	2.72μs	10.2μs	8.04	2.23	0.446	53.27 KB
#5627	`WriteAndFlushEnrichedTraces`	net6.0	536μs	348ns	1.35μs	0.543	0	0	41.63 KB
#5627	`WriteAndFlushEnrichedTraces`	netcoreapp3.1	645μs	1.16μs	4.33μs	0.324	0	0	41.68 KB
#5627	`WriteAndFlushEnrichedTraces`	net472	849μs	4.19μs	18.3μs	8.19	2.59	0.431	53.26 KB

Benchmarks.Trace.DbCommandBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`ExecuteNonQuery`	net6.0	1.13μs	0.601ns	2.25ns	0.0112	808 B
master	`ExecuteNonQuery`	netcoreapp3.1	1.47μs	0.883ns	3.42ns	0.011	808 B
master	`ExecuteNonQuery`	net472	1.71μs	2.3ns	8.9ns	0.122	770 B
#5627	`ExecuteNonQuery`	net6.0	1.1μs	0.343ns	1.29ns	0.011	808 B
#5627	`ExecuteNonQuery`	netcoreapp3.1	1.48μs	1.08ns	4.18ns	0.011	808 B
#5627	`ExecuteNonQuery`	net472	1.71μs	2.23ns	8.62ns	0.122	770 B

Benchmarks.Trace.ElasticsearchBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`CallElasticsearch`	net6.0	1.32μs	0.659ns	2.55ns	0.0139	976 B
master	`CallElasticsearch`	netcoreapp3.1	1.6μs	3.71ns	14.4ns	0.0127	976 B
master	`CallElasticsearch`	net472	2.46μs	1.81ns	7.02ns	0.157	995 B
master	`CallElasticsearchAsync`	net6.0	1.33μs	0.75ns	2.91ns	0.0133	952 B
master	`CallElasticsearchAsync`	netcoreapp3.1	1.66μs	1.68ns	6.27ns	0.0141	1.02 KB
master	`CallElasticsearchAsync`	net472	2.7μs	1.39ns	5.39ns	0.166	1.05 KB
#5627	`CallElasticsearch`	net6.0	1.2μs	0.542ns	2.03ns	0.0138	976 B
#5627	`CallElasticsearch`	netcoreapp3.1	1.52μs	1.14ns	4.43ns	0.0127	976 B
#5627	`CallElasticsearch`	net472	2.45μs	1.11ns	4.3ns	0.158	995 B
#5627	`CallElasticsearchAsync`	net6.0	1.36μs	0.729ns	2.73ns	0.0129	952 B
#5627	`CallElasticsearchAsync`	netcoreapp3.1	1.68μs	0.448ns	1.61ns	0.0136	1.02 KB
#5627	`CallElasticsearchAsync`	net472	2.48μs	3.13ns	12.1ns	0.167	1.05 KB

Benchmarks.Trace.GraphQLBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`ExecuteAsync`	net6.0	1.36μs	0.631ns	2.36ns	0.013	952 B
master	`ExecuteAsync`	netcoreapp3.1	1.52μs	0.597ns	2.31ns	0.0122	952 B
master	`ExecuteAsync`	net472	1.77μs	0.552ns	2.14ns	0.145	915 B
#5627	`ExecuteAsync`	net6.0	1.29μs	0.971ns	3.76ns	0.013	952 B
#5627	`ExecuteAsync`	netcoreapp3.1	1.59μs	3.54ns	13.7ns	0.0123	952 B
#5627	`ExecuteAsync`	net472	1.74μs	0.909ns	3.52ns	0.145	915 B

Benchmarks.Trace.HttpClientBenchmark - Same speed ✔️ More allocations ⚠️

More allocations ⚠️ in #5627

Benchmark	Base Allocated	Diff Allocated	Change	Change %
Benchmarks.Trace.HttpClientBenchmark.SendAsync‑net472	3.12 KB	3.15 KB	24 B	0.77%

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`SendAsync`	net6.0	4.17μs	1.78ns	6.67ns	0.0292	2.22 KB
master	`SendAsync`	netcoreapp3.1	5.04μs	1.81ns	6.76ns	0.0379	2.76 KB
master	`SendAsync`	net472	7.53μs	1.67ns	6.46ns	0.494	3.12 KB
#5627	`SendAsync`	net6.0	4.25μs	1.95ns	7.31ns	0.0318	2.22 KB
#5627	`SendAsync`	netcoreapp3.1	5.14μs	2.5ns	9.34ns	0.0356	2.76 KB
#5627	`SendAsync`	net472	7.65μs	5.21ns	20.2ns	0.497	3.15 KB

Benchmarks.Trace.ILoggerBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`EnrichedLog`	net6.0	1.53μs	0.669ns	2.5ns	0.023	1.64 KB
master	`EnrichedLog`	netcoreapp3.1	2.23μs	0.812ns	3.04ns	0.0225	1.64 KB
master	`EnrichedLog`	net472	2.53μs	1.26ns	4.89ns	0.249	1.57 KB
#5627	`EnrichedLog`	net6.0	1.45μs	0.299ns	1.08ns	0.0232	1.64 KB
#5627	`EnrichedLog`	netcoreapp3.1	2.26μs	1.39ns	5.39ns	0.0229	1.64 KB
#5627	`EnrichedLog`	net472	2.54μs	4.12ns	15.4ns	0.249	1.57 KB

Benchmarks.Trace.Log4netBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Gen 1	Allocated
master	`EnrichedLog`	net6.0	114μs	124ns	478ns	0.0569	0	4.28 KB
master	`EnrichedLog`	netcoreapp3.1	121μs	241ns	935ns	0.0597	0	4.28 KB
master	`EnrichedLog`	net472	151μs	179ns	695ns	0.684	0.228	4.46 KB
#5627	`EnrichedLog`	net6.0	118μs	111ns	417ns	0.0592	0	4.28 KB
#5627	`EnrichedLog`	netcoreapp3.1	121μs	182ns	704ns	0	0	4.28 KB
#5627	`EnrichedLog`	net472	150μs	126ns	489ns	0.671	0.224	4.46 KB

Benchmarks.Trace.NLogBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`EnrichedLog`	net6.0	3.16μs	0.927ns	3.47ns	0.0304	2.2 KB
master	`EnrichedLog`	netcoreapp3.1	4.13μs	2.9ns	11.2ns	0.0288	2.2 KB
master	`EnrichedLog`	net472	4.85μs	1.46ns	5.67ns	0.32	2.02 KB
#5627	`EnrichedLog`	net6.0	2.96μs	1.86ns	7.19ns	0.0311	2.2 KB
#5627	`EnrichedLog`	netcoreapp3.1	4.07μs	2.45ns	8.82ns	0.0287	2.2 KB
#5627	`EnrichedLog`	net472	5μs	2.11ns	8.19ns	0.32	2.02 KB

Benchmarks.Trace.RedisBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`SendReceive`	net6.0	1.39μs	0.762ns	2.95ns	0.016	1.14 KB
master	`SendReceive`	netcoreapp3.1	1.76μs	0.742ns	2.78ns	0.015	1.14 KB
master	`SendReceive`	net472	2.1μs	1.29ns	5ns	0.184	1.16 KB
#5627	`SendReceive`	net6.0	1.27μs	0.38ns	1.42ns	0.0158	1.14 KB
#5627	`SendReceive`	netcoreapp3.1	1.8μs	0.717ns	2.68ns	0.0154	1.14 KB
#5627	`SendReceive`	net472	2.02μs	0.925ns	3.46ns	0.183	1.16 KB

Benchmarks.Trace.SerilogBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`EnrichedLog`	net6.0	2.91μs	0.911ns	3.53ns	0.0219	1.6 KB
master	`EnrichedLog`	netcoreapp3.1	3.86μs	2.16ns	8.36ns	0.0211	1.65 KB
master	`EnrichedLog`	net472	4.49μs	2.14ns	8.28ns	0.323	2.04 KB
#5627	`EnrichedLog`	net6.0	2.67μs	0.518ns	1.94ns	0.0229	1.6 KB
#5627	`EnrichedLog`	netcoreapp3.1	3.77μs	2.2ns	8.5ns	0.0227	1.65 KB
#5627	`EnrichedLog`	net472	4.5μs	1.02ns	3.97ns	0.322	2.04 KB

Benchmarks.Trace.SpanBenchmark - Faster 🎉 Same allocations ✔️

Faster 🎉 in #5627

Benchmark	base/diff	Base Median (ns)	Diff Median (ns)	Modality
Benchmarks.Trace.SpanBenchmark.StartFinishSpan‑netcoreapp3.1	1.195	657.06	549.70
Benchmarks.Trace.SpanBenchmark.StartFinishScope‑netcoreapp3.1	1.135	833.99	735.05

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`StartFinishSpan`	net6.0	426ns	2.25ns	12.1ns	0.00816	576 B
master	`StartFinishSpan`	netcoreapp3.1	655ns	1.78ns	6.68ns	0.0077	576 B
master	`StartFinishSpan`	net472	655ns	0.491ns	1.9ns	0.0917	578 B
master	`StartFinishScope`	net6.0	477ns	0.134ns	0.52ns	0.00982	696 B
master	`StartFinishScope`	netcoreapp3.1	834ns	0.339ns	1.31ns	0.0093	696 B
master	`StartFinishScope`	net472	823ns	0.814ns	3.15ns	0.105	658 B
#5627	`StartFinishSpan`	net6.0	400ns	0.219ns	0.818ns	0.00803	576 B
#5627	`StartFinishSpan`	netcoreapp3.1	550ns	0.171ns	0.64ns	0.00795	576 B
#5627	`StartFinishSpan`	net472	627ns	0.317ns	1.23ns	0.0918	578 B
#5627	`StartFinishScope`	net6.0	486ns	0.12ns	0.449ns	0.00981	696 B
#5627	`StartFinishScope`	netcoreapp3.1	736ns	1.08ns	4.19ns	0.00956	696 B
#5627	`StartFinishScope`	net472	813ns	0.709ns	2.75ns	0.104	658 B

Benchmarks.Trace.TraceAnnotationsBenchmark - Slower ⚠️ Same allocations ✔️

Slower ⚠️ in #5627

Benchmark	diff/base	Base Median (ns)	Diff Median (ns)	Modality
Benchmarks.Trace.TraceAnnotationsBenchmark.RunOnMethodBegin‑net6.0	1.137	611.23	694.74

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`RunOnMethodBegin`	net6.0	611ns	0.229ns	0.887ns	0.00983	696 B
master	`RunOnMethodBegin`	netcoreapp3.1	948ns	0.242ns	0.873ns	0.00953	696 B
master	`RunOnMethodBegin`	net472	1.1μs	0.229ns	0.886ns	0.104	658 B
#5627	`RunOnMethodBegin`	net6.0	695ns	0.36ns	1.4ns	0.00979	696 B
#5627	`RunOnMethodBegin`	netcoreapp3.1	932ns	0.249ns	0.933ns	0.00928	696 B
#5627	`RunOnMethodBegin`	net472	1.04μs	0.328ns	1.27ns	0.104	658 B

tracer/src/Datadog.Trace/Activity/Handlers/ActivityHandlerCommon.cs

tracer/src/Datadog.Trace/Propagators/W3CTraceContextPropagator.cs

tracer/src/Datadog.Trace/Activity/OtlpHelpers.cs

bouwkast

I think the snapshots need to be updated still

If this passes the system tests I'd be happy to approve after the ! are looked into and reduced

tracer/test/test-applications/integrations/Samples.NetActivitySdk/Program.cs

tracer/src/Datadog.Trace/Activity/OtlpHelpers.cs

zacharycmontoya

Overall this is looking on track. In order to approve we just need to see updated snapshot files (which may require rebasing on/merging in master) and some small tweaks regarding the nullable checks in the span link mapping.

github-actions · 2024-06-08T15:07:26Z

Snapshots difference summary

The following differences have been observed in committed snapshots. It is meant to help the reviewer.
The diff is simplistic, so please check some files anyway while we improve it.

1 occurrences of :

-    Resource: Ctor1,
+    Resource: ActivityWithLinks,

1 occurrences of :

+      some_tag: value,
+      span.kind: server,
+      version: 1.0.0
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    },
+    SpanLinks: [
+      {
+        TraceIdHigh: LinkIdHigh,
+        TraceIdLow: LinkIdLow,
+        SpanId: Id_3,
+        TraceFlags: 2147483648,
+        Attributes: {
+          some_bool: False,
+          some_bool[].0: True,
+          some_bool[].1: False,
+          some_int: 5,
+          some_int[].0: 5,
+          some_int[].1: 55,
+          some_int[].2: 555,
+          some_string: five,
+          some_string[].0: a,
+          some_string[].1: b,
+          some_string[].2: c
+        }
+      },
+      {
+        TraceIdHigh: LinkIdHigh,
+        TraceIdLow: LinkIdLow,
+        SpanId: Id_4,
+        TraceFlags: 2147483649,
+        TraceState: dd=s:2;p:TsParentId;t.dm:-4,foo=1,bar=baz
+      }
+    ]
+  },
+  {
+    TraceId: Id_5,
+    SpanId: Id_6,
+    Name: server.request,
+    Resource: Ctor1,
+    Service: Samples.NetActivitySdk,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      language: dotnet,
+      otel.library.name: Samples.NetActivitySdk,
+      otel.status_code: STATUS_CODE_UNSET,
+      otel.trace_id: Guid_3,
+      runtime-id: Guid_2,

1 occurrences of :

-    TraceId: Id_3,
-    SpanId: Id_4,
+    TraceId: Id_7,
+    SpanId: Id_8,
[...]
-    ParentId: Id_5,
+    ParentId: Id_9,
[...]
-      otel.trace_id: Guid_3,
+      otel.trace_id: Guid_4,

1 occurrences of :

-    TraceId: Id_3,
-    SpanId: Id_6,
+    TraceId: Id_7,
+    SpanId: Id_10,
[...]
-    ParentId: Id_5,
+    ParentId: Id_9,
[...]
-      otel.trace_id: Guid_3,
+      otel.trace_id: Guid_4,

1 occurrences of :

-    TraceId: Id_3,
-    SpanId: Id_7,
+    TraceId: Id_7,
+    SpanId: Id_11,
[...]
-    ParentId: Id_6,
+    ParentId: Id_10,
[...]
-      otel.trace_id: Guid_3,
+      otel.trace_id: Guid_4,
[...]
+    SpanLinks: [
+      {
+        TraceIdHigh: LinkIdHigh,
+        TraceIdLow: LinkIdLow,
+        SpanId: Id_9,
+        TraceFlags: 2147483648
+      }
+    ]
[...]
-    TraceId: Id_8,
-    SpanId: Id_9,
+    TraceId: Id_12,
+    SpanId: Id_13,

1 occurrences of :

-      otel.trace_id: Guid_4,
+      otel.trace_id: Guid_5,

1 occurrences of :

-    TraceId: Id_8,
-    SpanId: Id_10,
+    TraceId: Id_12,
+    SpanId: Id_14,
[...]
-    ParentId: Id_9,
+    ParentId: Id_13,
[...]
-      otel.trace_id: Guid_4,
+      otel.trace_id: Guid_5,
[...]
-    TraceId: Id_8,
-    SpanId: Id_11,
+    TraceId: Id_12,
+    SpanId: Id_15,
[...]
-    ParentId: Id_10,
+    ParentId: Id_14,
[...]
-      otel.trace_id: Guid_4,
+      otel.trace_id: Guid_5,
[...]
-    TraceId: Id_8,
-    SpanId: Id_12,
+    TraceId: Id_12,
+    SpanId: Id_16,
[...]
-    ParentId: Id_11,
+    ParentId: Id_15,
[...]
-      otel.trace_id: Guid_4,
+      otel.trace_id: Guid_5,
[...]
-    TraceId: Id_8,
-    SpanId: Id_13,
+    TraceId: Id_12,
+    SpanId: Id_17,
[...]
-    ParentId: Id_12,
+    ParentId: Id_16,
[...]
-      otel.trace_id: Guid_4,
+      otel.trace_id: Guid_5,
[...]
-    TraceId: Id_8,
-    SpanId: Id_14,
+    TraceId: Id_12,
+    SpanId: Id_18,
[...]
-    ParentId: Id_12,
+    ParentId: Id_16,
[...]
-      otel.trace_id: Guid_4,
+      otel.trace_id: Guid_5,
[...]
-    TraceId: Id_8,
-    SpanId: Id_15,
+    TraceId: Id_12,
+    SpanId: Id_19,
[...]
-    ParentId: Id_14,
+    ParentId: Id_18,
[...]
-      otel.trace_id: Guid_4,
+      otel.trace_id: Guid_5,
[...]
-    TraceId: Id_8,
-    SpanId: Id_16,
+    TraceId: Id_12,
+    SpanId: Id_20,
[...]
-    ParentId: Id_14,
+    ParentId: Id_18,
[...]
-      otel.trace_id: Guid_4,
+      otel.trace_id: Guid_5,
[...]
-    TraceId: Id_8,
-    SpanId: Id_17,
+    TraceId: Id_12,
+    SpanId: Id_21,
[...]
-    ParentId: Id_16,
+    ParentId: Id_20,
[...]
-      otel.trace_id: Guid_4,
+      otel.trace_id: Guid_5,
[...]
-    TraceId: Id_18,
-    SpanId: Id_19,
+    TraceId: Id_22,
+    SpanId: Id_23,

1 occurrences of :

-    TraceId: Id_18,
-    SpanId: Id_20,
+    TraceId: Id_22,
+    SpanId: Id_24,
[...]
-    ParentId: Id_19,
+    ParentId: Id_23,

1 occurrences of :

-    TraceId: Id_21,
-    SpanId: Id_22,
+    TraceId: Id_25,
+    SpanId: Id_26,

1 occurrences of :

-      otel.trace_id: Guid_5,
+      otel.trace_id: Guid_6,

1 occurrences of :

-    TraceId: Id_23,
-    SpanId: Id_24,
+    TraceId: Id_27,
+    SpanId: Id_28,

1 occurrences of :

-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,

1 occurrences of :

-    TraceId: Id_23,
-    SpanId: Id_25,
+    TraceId: Id_27,
+    SpanId: Id_29,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,
[...]
-      attribute-boolArray: [false,true,false],
+      attribute-boolArray.0: false,
+      attribute-boolArray.1: true,
+      attribute-boolArray.2: false,
[...]
-      attribute-doubleArray: [4.1,5.0,6.0],
[...]
-      attribute-intArray: [1,2,3],
[...]
-      attribute-stringArray: ["str1","str2","str3"],
+      attribute-stringArray.0: str1,
+      attribute-stringArray.1: str2,
+      attribute-stringArray.2: str3,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-      attribute-int: 1.0
+      attribute-doubleArray.0: 4.1,
+      attribute-doubleArray.1: 5.0,
+      attribute-doubleArray.2: 6.0,
+      attribute-int: 1.0,
+      attribute-intArray.0: 1.0,
+      attribute-intArray.1: 2.0,
+      attribute-intArray.2: 3.0
[...]
-    TraceId: Id_23,
-    SpanId: Id_26,
+    TraceId: Id_27,
+    SpanId: Id_30,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,
[...]
-      attribute-boolArray: [false,true,false],
+      attribute-boolArray.0: false,
+      attribute-boolArray.1: true,
+      attribute-boolArray.2: false,
[...]
-      attribute-doubleArray: [4.1,5.0,6.0],
[...]
-      attribute-intArray: [1,2,3],
[...]
-      attribute-stringArray: ["str1","str2","str3"],
+      attribute-stringArray.0: str1,
+      attribute-stringArray.1: str2,
+      attribute-stringArray.2: str3,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-      attribute-int: 1.0
+      attribute-doubleArray.0: 4.1,
+      attribute-doubleArray.1: 5.0,
+      attribute-doubleArray.2: 6.0,
+      attribute-int: 1.0,
+      attribute-intArray.0: 1.0,
+      attribute-intArray.1: 2.0,
+      attribute-intArray.2: 3.0
[...]
-    TraceId: Id_23,
-    SpanId: Id_27,
+    TraceId: Id_27,
+    SpanId: Id_31,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_28,
+    TraceId: Id_27,
+    SpanId: Id_32,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_29,
+    TraceId: Id_27,
+    SpanId: Id_33,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_30,
+    TraceId: Id_27,
+    SpanId: Id_34,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_31,
+    TraceId: Id_27,
+    SpanId: Id_35,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_32,
+    TraceId: Id_27,
+    SpanId: Id_36,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,

1 occurrences of :

-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_33,
+    TraceId: Id_27,
+    SpanId: Id_37,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,

1 occurrences of :

-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_34,
+    TraceId: Id_27,
+    SpanId: Id_38,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,

1 occurrences of :

-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_35,
+    TraceId: Id_27,
+    SpanId: Id_39,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,

1 occurrences of :

-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_36,
+    TraceId: Id_27,
+    SpanId: Id_40,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,

1 occurrences of :

-    TraceId: Id_23,
-    SpanId: Id_37,
+    TraceId: Id_27,
+    SpanId: Id_41,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_38,
+    TraceId: Id_27,
+    SpanId: Id_42,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_39,
+    TraceId: Id_27,
+    SpanId: Id_43,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_40,
+    TraceId: Id_27,
+    SpanId: Id_44,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,

1 occurrences of :

-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_41,
+    TraceId: Id_27,
+    SpanId: Id_45,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_42,
+    TraceId: Id_27,
+    SpanId: Id_46,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_43,
+    TraceId: Id_27,
+    SpanId: Id_47,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_44,
+    TraceId: Id_27,
+    SpanId: Id_48,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_45,
+    TraceId: Id_27,
+    SpanId: Id_49,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_46,
+    TraceId: Id_27,
+    SpanId: Id_50,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_47,
+    TraceId: Id_27,
+    SpanId: Id_51,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_48,
+    TraceId: Id_27,
+    SpanId: Id_52,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_49,
+    TraceId: Id_27,
+    SpanId: Id_53,
[...]
-    ParentId: Id_24,
+    ParentId: Id_28,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_50,
+    TraceId: Id_27,
+    SpanId: Id_54,
[...]
-    ParentId: Id_27,
+    ParentId: Id_31,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_51,
+    TraceId: Id_27,
+    SpanId: Id_55,
[...]
-    ParentId: Id_28,
+    ParentId: Id_32,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_52,
+    TraceId: Id_27,
+    SpanId: Id_56,
[...]
-    ParentId: Id_50,
+    ParentId: Id_54,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_53,
+    TraceId: Id_27,
+    SpanId: Id_57,
[...]
-    ParentId: Id_52,
+    ParentId: Id_56,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
-    TraceId: Id_23,
-    SpanId: Id_54,
+    TraceId: Id_27,
+    SpanId: Id_58,
[...]
-    ParentId: Id_53,
+    ParentId: Id_57,
[...]
-      otel.trace_id: Guid_6,
+      otel.trace_id: Guid_7,
[...]
+  },
+  {
+    TraceId: Id_59,
+    SpanId: Id_3,
+    Name: server.request,
+    Resource: SpanLinkSpan1,
+    Service: Samples.NetActivitySdk,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      language: dotnet,
+      otel.library.name: Samples.NetActivitySdk,
+      otel.status_code: STATUS_CODE_UNSET,
+      otel.trace_id: Guid_8,
+      runtime-id: Guid_2,
+      span.kind: server,
+      version: 1.0.0
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_59,
+    SpanId: Id_4,
+    Name: server.request,
+    Resource: SpanLinkSpan2,
+    Service: Samples.NetActivitySdk,
+    Type: web,
+    ParentId: Id_3,
+    Tags: {
+      env: integration_tests,
+      language: dotnet,
+      otel.library.name: Samples.NetActivitySdk,
+      otel.status_code: STATUS_CODE_UNSET,
+      otel.trace_id: Guid_8,
+      span.kind: server,
+      version: 1.0.0
+    }

12 occurrences of :

-      attribute-boolArray: [false,true,false],
+      attribute-boolArray.0: false,
+      attribute-boolArray.1: true,
+      attribute-boolArray.2: false,
[...]
-      attribute-doubleArray: [4.1,5.0,6.0],
[...]
-      attribute-intArray: [1,2,3],
[...]
-      attribute-stringArray: ["\"str1\"","str2","str3"],
+      attribute-stringArray.0: "str1",
+      attribute-stringArray.1: str2,
+      attribute-stringArray.2: str3,

12 occurrences of :

+      attribute-doubleArray.0: 4.1,
+      attribute-doubleArray.1: 5.0,
+      attribute-doubleArray.2: 6.0,
[...]
+      attribute-intArray.0: 1.0,
+      attribute-intArray.1: 2.0,
+      attribute-intArray.2: 3.0,

12 occurrences of :

+    SpanLinks: [
+      {
+        TraceIdHigh: LinkIdHigh,
+        TraceIdLow: LinkIdLow,
+        SpanId: Id_26,
+        TraceFlags: 2147483649
+      }
+    ]

12 occurrences of :

+    SpanLinks: [
+      {
+        TraceIdHigh: LinkIdHigh,
+        TraceIdLow: LinkIdLow,
+        SpanId: Id_26,
+        TraceFlags: 2147483649
+      },
+      {
+        TraceIdHigh: LinkIdHigh,
+        TraceIdLow: LinkIdLow,
+        SpanId: Id_37,
+        TraceFlags: 2147483649
+      }
+    ]

…ce-dotnet into maximo/span-links

andrewlock

A bunch of minor comments, but nothing blocking I think 🙂 Nice work 👍

andrewlock · 2024-06-10T09:13:22Z

tracer/src/Datadog.Trace/Activity/DuckTypes/IActivityLink.cs

+
+internal interface IActivityLink : IDuckType
+{
+    IActivityContext Context { get; }


Can this be null, or will it always have a value?

Mmm AFAIK users can't create a link with null context so it should always have a value: https://github.com/dotnet/runtime/blob/main/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/ActivityLink.cs

tracer/src/Datadog.Trace/Activity/OtlpHelpers.cs

tracer/test/snapshots/OpenTelemetrySdkTests.verified.txt

bouwkast

Thanks!

I still think we need to go through and remove some more null forgiving operators that were added throughout but that can be done in a follow up PR

zacharycmontoya

LGTM, thanks for adding the feature! We should do some cleanup work on the nullability checks, but the feature is doing exactly what it's supposed to, nice work! 🎉

bouwkast and others added 12 commits January 10, 2024 15:27

Add some basic unit tests for Activity tags

b51d34a

Remove TODOs from OtlpHelpers

564cd11

Support dot notation arrays in Activity tags

0237d03

Update Activity-based snapshots for dot-notation

51fae0f

Add multi-dimensional test

95b913c

Re-add empty arrays to tags

01b7c7d

Update snapshots

306f5c5

Add initial ActivityLink support

820776e

Get snapshots passing

e7c1dc5

Update Benchmarks for Activity

4daddee

Update snapshots

0de7ff1

Merge branch 'steven/span-links-activity-link' into maximo/span-links

ac8ab3e

This comment was marked as resolved.

Sign in to view

link04 added 9 commits May 31, 2024 14:43

Setting SpanLink as a tag as opposed to using JsonSerializer

fb99361

Setting isRemote based on context

a253d7c

Updating how we handle the tracestate

22e6055

Merge branch 'master' into maximo/span-links

50dee59

Updated to actually use the context state if dd= is present there

53032c4

Fixing expected tracestate value

6eb4c49

Fixing Origin and adding Attributes

41846b9

Deleted ActivityLinkConverterTests class

305b1cc

Merge branch 'master' into maximo/span-links

547a7e7

link04 marked this pull request as ready for review June 7, 2024 20:23

link04 requested a review from a team as a code owner June 7, 2024 20:23

bouwkast reviewed Jun 7, 2024

View reviewed changes

tracer/src/Datadog.Trace/Activity/Handlers/ActivityHandlerCommon.cs Outdated Show resolved Hide resolved