[ASM] Native CallTarget definitions #6252

daniel-romano-DD · 2024-11-06T21:55:55Z

Summary of changes

Moved CallTarget definitions to the Native library so we can spare the marshalling.
As from V3, there will not be a situation where a Managed V3 will have to specify its definitions to a newer Native library, we can remove the definitions from the managed part.
We must still keep the ability to receive definitions from a V2 managed library.

Reason for change

Marshalling of definitions from managed to native is taxing. Also, embedding the definitions in each managed library takes space, precious in Serverless scenarions

Implementation details

Moved the generation of the CallTargets definitions to a nuke step, removing them from the managed library.
Created a json file in dependabot folder with all the call target definitions declared. This file is read by the UpdatePackageVersions build step, instead of retrieving them by reflection from the compiled assemblies.
Removed uneeded exports from the native library.

Test coverage

Other details

daniel-romano-DD · 2024-11-06T22:01:34Z

Warning

This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
Learn more

[APM] Exclude windows only definitions from non windows dlls #6270
[ASM] Native CallTarget definitions #6252 👈
[IAST] Native CallSites Definitions #6241
master

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @daniel-romano-DD and the rest of your teammates on Graphite

andrewlock · 2024-11-06T22:41:51Z

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 (6252) - mean (69ms)  : 68, 71
     .   : milestone, 69,
    master - mean (70ms)  : 68, 73
     .   : milestone, 70,

    section CallTarget+Inlining+NGEN
    This PR (6252) - mean (993ms)  : 962, 1023
     .   : milestone, 993,
    master - mean (1,125ms)  : 1072, 1177
     .   : milestone, 1125,

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

    section CallTarget+Inlining+NGEN
    This PR (6252) - mean (687ms)  : 664, 710
     .   : milestone, 687,
    master - mean (782ms)  : 767, 796
     .   : milestone, 782,

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

    section CallTarget+Inlining+NGEN
    This PR (6252) - mean (642ms)  : 627, 657
     .   : milestone, 642,
    master - mean (750ms)  : 683, 817
     .   : milestone, 750,

gantt
    title Execution time (ms) HttpMessageHandler (.NET Framework 4.6.2) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6252) - mean (190ms)  : 187, 194
     .   : milestone, 190,
    master - mean (190ms)  : 186, 194
     .   : milestone, 190,

    section CallTarget+Inlining+NGEN
    This PR (6252) - mean (1,112ms)  : 1082, 1141
     .   : milestone, 1112,
    master - mean (1,228ms)  : 1203, 1253
     .   : milestone, 1228,

gantt
    title Execution time (ms) HttpMessageHandler (.NET Core 3.1) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6252) - mean (276ms)  : 271, 281
     .   : milestone, 276,
    master - mean (276ms)  : 271, 281
     .   : milestone, 276,

    section CallTarget+Inlining+NGEN
    This PR (6252) - mean (879ms)  : 848, 910
     .   : milestone, 879,
    master - mean (951ms)  : 937, 965
     .   : milestone, 951,

gantt
    title Execution time (ms) HttpMessageHandler (.NET 6) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6252) - mean (263ms)  : 259, 267
     .   : milestone, 263,
    master - mean (265ms)  : 261, 269
     .   : milestone, 265,

    section CallTarget+Inlining+NGEN
    This PR (6252) - mean (865ms)  : 829, 901
     .   : milestone, 865,
    master - mean (936ms)  : 916, 957
     .   : milestone, 936,

andrewlock · 2024-11-06T23:14:54Z

Benchmarks Report for tracer 🐌

Benchmarks for #6252 compared to master:

2 benchmarks are faster, with geometric mean 1.323
1 benchmarks are slower, with geometric mean 1.157
2 benchmarks have fewer 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 - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Gen 1	Gen 2	Allocated
master	`StartStopWithChild`	net6.0	8.2μs	45.3ns	264ns	0.0118	0.00393	0	5.61 KB
master	`StartStopWithChild`	netcoreapp3.1	10.4μs	58.7ns	447ns	0.0214	0.0107	0	5.8 KB
master	`StartStopWithChild`	net472	16.5μs	38.9ns	151ns	1.04	0.301	0.0919	6.21 KB
#6252	`StartStopWithChild`	net6.0	8.2μs	46.3ns	328ns	0.0159	0.00797	0	5.61 KB
#6252	`StartStopWithChild`	netcoreapp3.1	9.99μs	54.4ns	303ns	0.0232	0.00928	0	5.8 KB
#6252	`StartStopWithChild`	net472	16.8μs	59.4ns	230ns	1.04	0.305	0.0988	6.21 KB

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

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`WriteAndFlushEnrichedTraces`	net6.0	457μs	441ns	1.71μs	0	2.7 KB
master	`WriteAndFlushEnrichedTraces`	netcoreapp3.1	646μs	260ns	973ns	0	2.7 KB
master	`WriteAndFlushEnrichedTraces`	net472	848μs	347ns	1.25μs	0.419	3.3 KB
#6252	`WriteAndFlushEnrichedTraces`	net6.0	461μs	229ns	856ns	0	2.7 KB
#6252	`WriteAndFlushEnrichedTraces`	netcoreapp3.1	645μs	209ns	782ns	0	2.7 KB
#6252	`WriteAndFlushEnrichedTraces`	net472	844μs	529ns	2.05μs	0.419	3.3 KB

Benchmarks.Trace.AspNetCoreBenchmark - Faster 🎉 Fewer allocations 🎉

Faster 🎉 in #6252

Benchmark	base/diff	Base Median (ns)	Diff Median (ns)	Modality
Benchmarks.Trace.AspNetCoreBenchmark.SendRequest‑net6.0	1.385	195,765.88	141,394.88
Benchmarks.Trace.AspNetCoreBenchmark.SendRequest‑netcoreapp3.1	1.263	213,233.65	168,777.79

Fewer allocations 🎉 in #6252

Benchmark	Base Allocated	Diff Allocated	Change	Change %
Benchmarks.Trace.AspNetCoreBenchmark.SendRequest‑netcoreapp3.1	20.89 KB	17.27 KB	-3.62 KB	-17.32%
Benchmarks.Trace.AspNetCoreBenchmark.SendRequest‑net6.0	18.73 KB	14.47 KB	-4.26 KB	-22.73%

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`SendRequest`	net6.0	198μs	1.15μs	9.58μs	0.195	18.73 KB
master	`SendRequest`	netcoreapp3.1	214μs	1.08μs	4.93μs	0.213	20.89 KB
master	`SendRequest`	net472	0.00101ns	0.000372ns	0.00144ns	0	0 b
#6252	`SendRequest`	net6.0	142μs	787ns	4.85μs	0.141	14.47 KB
#6252	`SendRequest`	netcoreapp3.1	171μs	985ns	7.56μs	0.175	17.27 KB
#6252	`SendRequest`	net472	0.00111ns	0.000391ns	0.00141ns	0	0 b

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

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Gen 1	Gen 2	Allocated
master	`WriteAndFlushEnrichedTraces`	net6.0	568μs	2.51μs	9.06μs	0.548	0.274	0	41.45 KB
master	`WriteAndFlushEnrichedTraces`	netcoreapp3.1	690μs	3.47μs	15.5μs	0.342	0	0	41.85 KB
master	`WriteAndFlushEnrichedTraces`	net472	892μs	4.37μs	18.5μs	8.42	2.66	0.443	53.32 KB
#6252	`WriteAndFlushEnrichedTraces`	net6.0	568μs	2.41μs	10.2μs	0.571	0	0	41.44 KB
#6252	`WriteAndFlushEnrichedTraces`	netcoreapp3.1	685μs	2.49μs	9.65μs	0.338	0	0	41.71 KB
#6252	`WriteAndFlushEnrichedTraces`	net472	867μs	3.31μs	12.8μs	8.08	2.55	0.425	53.26 KB

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

Slower ⚠️ in #6252

Benchmark	diff/base	Base Median (ns)	Diff Median (ns)	Modality
Benchmarks.Trace.DbCommandBenchmark.ExecuteNonQuery‑net6.0	1.157	1,241.01	1,435.30

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Gen 1	Allocated
master	`ExecuteNonQuery`	net6.0	1.24μs	0.65ns	2.34ns	0.0143	0	1.02 KB
master	`ExecuteNonQuery`	netcoreapp3.1	1.73μs	1.36ns	4.7ns	0.0139	0	1.02 KB
master	`ExecuteNonQuery`	net472	2.05μs	1.45ns	5.44ns	0.157	0.00102	987 B
#6252	`ExecuteNonQuery`	net6.0	1.44μs	0.794ns	2.97ns	0.0144	0	1.02 KB
#6252	`ExecuteNonQuery`	netcoreapp3.1	1.78μs	1.16ns	4.2ns	0.0136	0	1.02 KB
#6252	`ExecuteNonQuery`	net472	2.12μs	1.07ns	3.99ns	0.156	0.00106	987 B

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

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`CallElasticsearch`	net6.0	1.21μs	1.38ns	5.16ns	0.014	976 B
master	`CallElasticsearch`	netcoreapp3.1	1.62μs	0.574ns	2.15ns	0.0131	976 B
master	`CallElasticsearch`	net472	2.5μs	2.36ns	9.14ns	0.157	995 B
master	`CallElasticsearchAsync`	net6.0	1.27μs	0.703ns	2.72ns	0.0133	952 B
master	`CallElasticsearchAsync`	netcoreapp3.1	1.65μs	0.741ns	2.87ns	0.0139	1.02 KB
master	`CallElasticsearchAsync`	net472	2.67μs	1.94ns	7.5ns	0.166	1.05 KB
#6252	`CallElasticsearch`	net6.0	1.32μs	0.851ns	3.29ns	0.0133	976 B
#6252	`CallElasticsearch`	netcoreapp3.1	1.6μs	1.01ns	3.93ns	0.013	976 B
#6252	`CallElasticsearch`	net472	2.53μs	1.16ns	4.33ns	0.157	995 B
#6252	`CallElasticsearchAsync`	net6.0	1.35μs	0.443ns	1.66ns	0.0135	952 B
#6252	`CallElasticsearchAsync`	netcoreapp3.1	1.71μs	1.14ns	4.25ns	0.0145	1.02 KB
#6252	`CallElasticsearchAsync`	net472	2.54μs	0.704ns	2.54ns	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.22μs	0.394ns	1.36ns	0.0132	952 B
master	`ExecuteAsync`	netcoreapp3.1	1.66μs	0.815ns	3.16ns	0.0125	952 B
master	`ExecuteAsync`	net472	1.69μs	1.63ns	6.32ns	0.145	915 B
#6252	`ExecuteAsync`	net6.0	1.26μs	1.13ns	4.36ns	0.013	952 B
#6252	`ExecuteAsync`	netcoreapp3.1	1.67μs	1.85ns	7.16ns	0.0125	952 B
#6252	`ExecuteAsync`	net472	1.78μs	0.675ns	2.43ns	0.145	915 B

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

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`SendAsync`	net6.0	4.58μs	1.32ns	4.77ns	0.0321	2.31 KB
master	`SendAsync`	netcoreapp3.1	5.26μs	1.28ns	4.8ns	0.0369	2.85 KB
master	`SendAsync`	net472	7.78μs	2.72ns	10.5ns	0.494	3.12 KB
#6252	`SendAsync`	net6.0	4.44μs	2.2ns	8.52ns	0.031	2.31 KB
#6252	`SendAsync`	netcoreapp3.1	5.31μs	2.48ns	9.59ns	0.0369	2.85 KB
#6252	`SendAsync`	net472	7.29μs	5.04ns	19.5ns	0.495	3.12 KB

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

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`EnrichedLog`	net6.0	1.58μs	0.577ns	2.16ns	0.0229	1.64 KB
master	`EnrichedLog`	netcoreapp3.1	2.18μs	0.857ns	3.21ns	0.022	1.64 KB
master	`EnrichedLog`	net472	2.66μs	1.47ns	5.08ns	0.25	1.57 KB
#6252	`EnrichedLog`	net6.0	1.47μs	0.805ns	3.01ns	0.0229	1.64 KB
#6252	`EnrichedLog`	netcoreapp3.1	2.16μs	0.281ns	0.973ns	0.0218	1.64 KB
#6252	`EnrichedLog`	net472	2.6μs	1.67ns	6.45ns	0.25	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	119μs	104ns	391ns	0.0588	0	4.28 KB
master	`EnrichedLog`	netcoreapp3.1	124μs	469ns	1.81μs	0	0	4.28 KB
master	`EnrichedLog`	net472	156μs	222ns	860ns	0.706	0.235	4.46 KB
#6252	`EnrichedLog`	net6.0	120μs	184ns	713ns	0.0602	0	4.28 KB
#6252	`EnrichedLog`	netcoreapp3.1	121μs	442ns	1.71μs	0	0	4.28 KB
#6252	`EnrichedLog`	net472	151μs	200ns	775ns	0.679	0.226	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.02μs	1.31ns	5.07ns	0.031	2.2 KB
master	`EnrichedLog`	netcoreapp3.1	4.14μs	0.817ns	2.83ns	0.0289	2.2 KB
master	`EnrichedLog`	net472	4.92μs	1.16ns	4.17ns	0.321	2.02 KB
#6252	`EnrichedLog`	net6.0	3.04μs	1.02ns	3.94ns	0.0301	2.2 KB
#6252	`EnrichedLog`	netcoreapp3.1	4.16μs	1.16ns	4.5ns	0.0292	2.2 KB
#6252	`EnrichedLog`	net472	4.9μs	2.11ns	8.17ns	0.319	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.33μs	0.429ns	1.66ns	0.0159	1.14 KB
master	`SendReceive`	netcoreapp3.1	1.83μs	0.845ns	3.27ns	0.0156	1.14 KB
master	`SendReceive`	net472	2.15μs	0.992ns	3.84ns	0.183	1.16 KB
#6252	`SendReceive`	net6.0	1.31μs	0.657ns	2.46ns	0.0157	1.14 KB
#6252	`SendReceive`	netcoreapp3.1	1.76μs	0.588ns	2.28ns	0.015	1.14 KB
#6252	`SendReceive`	net472	2.18μs	1.43ns	5.53ns	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.82μs	5.35ns	20.7ns	0.0225	1.6 KB
master	`EnrichedLog`	netcoreapp3.1	3.97μs	1.67ns	6.45ns	0.0218	1.65 KB
master	`EnrichedLog`	net472	4.33μs	5.36ns	19.3ns	0.323	2.04 KB
#6252	`EnrichedLog`	net6.0	2.77μs	9.72ns	37.7ns	0.0221	1.6 KB
#6252	`EnrichedLog`	netcoreapp3.1	3.97μs	1.68ns	6.52ns	0.0219	1.65 KB
#6252	`EnrichedLog`	net472	4.36μs	1.08ns	3.88ns	0.322	2.04 KB

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

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`StartFinishSpan`	net6.0	410ns	0.186ns	0.721ns	0.00804	576 B
master	`StartFinishSpan`	netcoreapp3.1	563ns	0.322ns	1.21ns	0.00783	576 B
master	`StartFinishSpan`	net472	701ns	0.974ns	3.64ns	0.0915	578 B
master	`StartFinishScope`	net6.0	517ns	0.475ns	1.84ns	0.00989	696 B
master	`StartFinishScope`	netcoreapp3.1	729ns	0.632ns	2.45ns	0.00936	696 B
master	`StartFinishScope`	net472	854ns	0.698ns	2.61ns	0.104	658 B
#6252	`StartFinishSpan`	net6.0	402ns	0.494ns	1.85ns	0.00806	576 B
#6252	`StartFinishSpan`	netcoreapp3.1	557ns	0.843ns	3.26ns	0.00776	576 B
#6252	`StartFinishSpan`	net472	744ns	0.742ns	2.87ns	0.0916	578 B
#6252	`StartFinishScope`	net6.0	500ns	0.958ns	3.71ns	0.00971	696 B
#6252	`StartFinishScope`	netcoreapp3.1	758ns	0.309ns	1.2ns	0.0094	696 B
#6252	`StartFinishScope`	net472	920ns	3.45ns	13.3ns	0.104	658 B

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

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`RunOnMethodBegin`	net6.0	649ns	0.313ns	1.17ns	0.00979	696 B
master	`RunOnMethodBegin`	netcoreapp3.1	998ns	0.786ns	3.04ns	0.00948	696 B
master	`RunOnMethodBegin`	net472	1.18μs	0.603ns	2.25ns	0.104	658 B
#6252	`RunOnMethodBegin`	net6.0	680ns	0.689ns	2.67ns	0.00975	696 B
#6252	`RunOnMethodBegin`	netcoreapp3.1	939ns	1.04ns	3.9ns	0.00937	696 B
#6252	`RunOnMethodBegin`	net472	1.13μs	3.84ns	14.9ns	0.105	658 B

andrewlock · 2024-11-06T23:26:32Z

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 (6252) (11.109M)   : 0, 11108529
    master (10.993M)   : 0, 10993209
    benchmarks/2.9.0 (11.033M)   : 0, 11032866

    section Automatic
    This PR (6252) (7.187M)   : 0, 7186857
    master (7.203M)   : 0, 7203027
    benchmarks/2.9.0 (7.786M)   : 0, 7785853

    section Trace stats
    master (7.503M)   : 0, 7502500

    section Manual
    master (11.115M)   : 0, 11115249

    section Manual + Automatic
    This PR (6252) (6.703M)   : 0, 6702862
    master (6.650M)   : 0, 6649770

    section DD_TRACE_ENABLED=0
    master (10.379M)   : 0, 10378918

gantt
    title Throughput Linux arm64 (Total requests) 
    dateFormat  X
    axisFormat %s
    section Baseline
    This PR (6252) (9.687M)   : 0, 9686812
    master (9.396M)   : 0, 9395989
    benchmarks/2.9.0 (9.495M)   : 0, 9494821

    section Automatic
    This PR (6252) (6.432M)   : 0, 6432324
    master (6.432M)   : 0, 6432181

    section Trace stats
    master (6.826M)   : 0, 6826388

    section Manual
    master (9.596M)   : 0, 9595811

    section Manual + Automatic
    This PR (6252) (5.938M)   : 0, 5937738
    master (6.016M)   : 0, 6015725

    section DD_TRACE_ENABLED=0
    master (8.730M)   : 0, 8730305

gantt
    title Throughput Windows x64 (Total requests) 
    dateFormat  X
    axisFormat %s
    section Baseline
    This PR (6252) (9.937M)   : 0, 9936764
    master (9.836M)   : 0, 9835977
    benchmarks/2.9.0 (10.020M)   : 0, 10019592

    section Automatic
    This PR (6252) (6.468M)   : 0, 6468412
    master (6.334M)   : 0, 6333662
    benchmarks/2.9.0 (7.255M)   : 0, 7255257

    section Trace stats
    master (7.012M)   : 0, 7011750

    section Manual
    master (9.898M)   : 0, 9897743

    section Manual + Automatic
    This PR (6252) (5.928M)   : 0, 5928140
    master (5.778M)   : 0, 5777929

    section DD_TRACE_ENABLED=0
    master (9.111M)   : 0, 9110736

datadog-ddstaging · 2024-11-06T23:44:40Z

Datadog Report

Branch report: dani/apm/NativeCallTargets
Commit report: 2277786
Test service: dd-trace-dotnet

✅ 0 Failed, 489203 Passed, 3963 Skipped, 41h 7m 9.75s Total Time
❄️ 1 New Flaky

New Flaky Tests (1)

NoExceptions - Datadog.Trace.ClrProfiler.IntegrationTests.SmokeTests.RuntimeMetricsShutdownSmokeTest - Last Failure

Expand for error

 Expected no errors in smoke test: [createdump] Problem suspending threads: ptrace(ATTACH, 24002) FAILED Operation not permitted (1)
 [createdump] Failure took 0ms
 
 Expected: True
 Actual:   False

andrewlock · 2024-11-08T09:18:50Z

Benchmarks Report for appsec 🐌

Benchmarks for #6252 compared to master:

All benchmarks have the same speed
2 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.Asm.AppSecBodyBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Gen 1	Allocated
master	`AllCycleSimpleBody`	net6.0	72.3μs	67.8ns	263ns	0.0716	0	6 KB
master	`AllCycleSimpleBody`	netcoreapp3.1	62.5μs	58.7ns	220ns	0.0938	0	6.95 KB
master	`AllCycleSimpleBody`	net472	49.1μs	72ns	279ns	1.31	0	8.33 KB
master	`AllCycleMoreComplexBody`	net6.0	78.4μs	55ns	213ns	0.117	0	9.51 KB
master	`AllCycleMoreComplexBody`	netcoreapp3.1	69.4μs	56.4ns	211ns	0.139	0	10.36 KB
master	`AllCycleMoreComplexBody`	net472	56.5μs	85.2ns	330ns	1.87	0.0283	11.85 KB
master	`ObjectExtractorSimpleBody`	net6.0	145ns	0.12ns	0.448ns	0.00395	0	280 B
master	`ObjectExtractorSimpleBody`	netcoreapp3.1	209ns	0.137ns	0.494ns	0.00369	0	272 B
master	`ObjectExtractorSimpleBody`	net472	171ns	0.0861ns	0.334ns	0.0446	0	281 B
master	`ObjectExtractorMoreComplexBody`	net6.0	3.04μs	2.64ns	9.86ns	0.0533	0	3.78 KB
master	`ObjectExtractorMoreComplexBody`	netcoreapp3.1	3.91μs	3.08ns	11.9ns	0.0507	0	3.69 KB
master	`ObjectExtractorMoreComplexBody`	net472	4.36μs	1.92ns	7.44ns	0.601	0.00656	3.8 KB
#6252	`AllCycleSimpleBody`	net6.0	72.2μs	53.8ns	208ns	0.0721	0	6 KB
#6252	`AllCycleSimpleBody`	netcoreapp3.1	63.8μs	36.3ns	126ns	0.0958	0	6.95 KB
#6252	`AllCycleSimpleBody`	net472	47.7μs	55.8ns	216ns	1.31	0	8.34 KB
#6252	`AllCycleMoreComplexBody`	net6.0	78.6μs	98ns	367ns	0.118	0	9.51 KB
#6252	`AllCycleMoreComplexBody`	netcoreapp3.1	69μs	60.6ns	227ns	0.138	0	10.37 KB
#6252	`AllCycleMoreComplexBody`	net472	54.8μs	52.6ns	204ns	1.88	0.0272	11.85 KB
#6252	`ObjectExtractorSimpleBody`	net6.0	146ns	0.273ns	1.02ns	0.00392	0	280 B
#6252	`ObjectExtractorSimpleBody`	netcoreapp3.1	206ns	0.285ns	1.07ns	0.00371	0	272 B
#6252	`ObjectExtractorSimpleBody`	net472	165ns	0.124ns	0.462ns	0.0446	0	281 B
#6252	`ObjectExtractorMoreComplexBody`	net6.0	3.14μs	3.38ns	12.6ns	0.053	0	3.78 KB
#6252	`ObjectExtractorMoreComplexBody`	netcoreapp3.1	3.9μs	1.8ns	6.72ns	0.0509	0	3.69 KB
#6252	`ObjectExtractorMoreComplexBody`	net472	4.34μs	3.23ns	12.5ns	0.603	0.0065	3.8 KB

Benchmarks.Trace.Asm.AppSecEncoderBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Gen 1	Allocated
master	`EncodeArgs`	net6.0	38.2μs	26.2ns	102ns	0.454	0	32.4 KB
master	`EncodeArgs`	netcoreapp3.1	54.3μs	36.7ns	142ns	0.432	0	32.4 KB
master	`EncodeArgs`	net472	66.4μs	27.9ns	104ns	5.15	0.0661	32.5 KB
master	`EncodeLegacyArgs`	net6.0	76.2μs	407ns	2.11μs	0	0	2.14 KB
master	`EncodeLegacyArgs`	netcoreapp3.1	109μs	254ns	983ns	0	0	2.14 KB
master	`EncodeLegacyArgs`	net472	154μs	97.1ns	376ns	0.31	0	2.15 KB
#6252	`EncodeArgs`	net6.0	38.4μs	26.9ns	104ns	0.441	0	32.4 KB
#6252	`EncodeArgs`	netcoreapp3.1	54.7μs	24.9ns	96.6ns	0.439	0	32.4 KB
#6252	`EncodeArgs`	net472	66.4μs	41.8ns	162ns	5.14	0.0663	32.5 KB
#6252	`EncodeLegacyArgs`	net6.0	78.7μs	374ns	1.45μs	0	0	2.14 KB
#6252	`EncodeLegacyArgs`	netcoreapp3.1	105μs	158ns	612ns	0	0	2.14 KB
#6252	`EncodeLegacyArgs`	net472	152μs	92.5ns	358ns	0.306	0	2.15 KB

Benchmarks.Trace.Asm.AppSecWafBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`RunWafRealisticBenchmark`	net6.0	185μs	60.9ns	236ns	0	2.44 KB
master	`RunWafRealisticBenchmark`	netcoreapp3.1	198μs	238ns	921ns	0	2.39 KB
master	`RunWafRealisticBenchmark`	net472	210μs	141ns	545ns	0.315	2.46 KB
master	`RunWafRealisticBenchmarkWithAttack`	net6.0	122μs	106ns	381ns	0	1.47 KB
master	`RunWafRealisticBenchmarkWithAttack`	netcoreapp3.1	130μs	155ns	598ns	0	1.46 KB
master	`RunWafRealisticBenchmarkWithAttack`	net472	138μs	42.5ns	153ns	0.208	1.49 KB
#6252	`RunWafRealisticBenchmark`	net6.0	185μs	65.7ns	246ns	0	2.44 KB
#6252	`RunWafRealisticBenchmark`	netcoreapp3.1	194μs	195ns	757ns	0	2.39 KB
#6252	`RunWafRealisticBenchmark`	net472	212μs	119ns	461ns	0.314	2.46 KB
#6252	`RunWafRealisticBenchmarkWithAttack`	net6.0	124μs	70.8ns	274ns	0	1.47 KB
#6252	`RunWafRealisticBenchmarkWithAttack`	netcoreapp3.1	130μs	213ns	825ns	0	1.46 KB
#6252	`RunWafRealisticBenchmarkWithAttack`	net472	139μs	47.3ns	177ns	0.207	1.48 KB

Benchmarks.Trace.Iast.StringAspectsBenchmark - Same speed ✔️ More allocations ⚠️

More allocations ⚠️ in #6252

Benchmark	Base Allocated	Diff Allocated	Change	Change %
Benchmarks.Trace.Iast.StringAspectsBenchmark.StringConcatAspectBenchmark‑net472	272.91 KB	278.53 KB	5.62 KB	2.06%

Fewer allocations 🎉 in #6252

Benchmark	Base Allocated	Diff Allocated	Change	Change %
Benchmarks.Trace.Iast.StringAspectsBenchmark.StringConcatAspectBenchmark‑netcoreapp3.1	255.27 KB	253.38 KB	-1.89 KB	-0.74%
Benchmarks.Trace.Iast.StringAspectsBenchmark.StringConcatBenchmark‑net472	60.49 KB	59.04 KB	-1.45 KB	-2.39%

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Allocated
master	`StringConcatBenchmark`	net6.0	52.9μs	209ns	782ns	43.44 KB
master	`StringConcatBenchmark`	netcoreapp3.1	54.2μs	287ns	1.38μs	42.64 KB
master	`StringConcatBenchmark`	net472	38μs	165ns	616ns	60.49 KB
master	`StringConcatAspectBenchmark`	net6.0	295μs	4.71μs	43.7μs	253.95 KB
master	`StringConcatAspectBenchmark`	netcoreapp3.1	354μs	1.97μs	12.1μs	255.27 KB
master	`StringConcatAspectBenchmark`	net472	278μs	6.14μs	58.9μs	272.91 KB
#6252	`StringConcatBenchmark`	net6.0	61.1μs	769ns	7.53μs	43.44 KB
#6252	`StringConcatBenchmark`	netcoreapp3.1	62.5μs	869ns	8.65μs	42.64 KB
#6252	`StringConcatBenchmark`	net472	37.6μs	119ns	429ns	59.04 KB
#6252	`StringConcatAspectBenchmark`	net6.0	310μs	1.41μs	5.46μs	255.08 KB
#6252	`StringConcatAspectBenchmark`	netcoreapp3.1	334μs	1.7μs	10.9μs	253.38 KB
#6252	`StringConcatAspectBenchmark`	net472	283μs	6.3μs	61.4μs	278.53 KB

tonyredondo · 2024-11-11T09:34:41Z

tracer/build/_build/CodeGenerators/CallTargetsGenerator.cs

+        {
+            Serilog.Log.Debug("Generating CallTarget definitions file ...");
+
+            Dictionary<CallTargetDefinitionSource, TargetFrameworks> callTargets = new Dictionary<CallTargetDefinitionSource, TargetFrameworks>();


tonyredondo · 2024-11-11T09:34:53Z

tracer/build/_build/CodeGenerators/CallTargetsGenerator.cs

+
+            static List<CallTargetDefinitionSource> GetCallTargetDefinition(TypeDefinition type, CustomAttribute attribute)
+            {
+                List<CallTargetDefinitionSource> res = new List<CallTargetDefinitionSource>();


tonyredondo · 2024-11-11T09:35:03Z

tracer/build/_build/CodeGenerators/CallTargetsGenerator.cs

+
+        internal static void RetrieveAdoNetCallTargets(Dictionary<CallTargetDefinitionSource, TargetFrameworks> callTargets, AssemblyDefinition assembly, TargetFrameworks tfmCategory)
+        {
+            List<AssemblyCallTargetDefinitionSource> adoNetClientInstruments = new List<AssemblyCallTargetDefinitionSource>();


tonyredondo · 2024-11-11T09:35:10Z

tracer/build/_build/CodeGenerators/CallTargetsGenerator.cs

+                adoNetClientInstruments.AddRange(GetAdoNetClientInstruments(attribute));
+            }
+
+            List<AdoNetSignature> adoNetSignatures = new List<AdoNetSignature>();


tonyredondo · 2024-11-11T09:35:22Z

tracer/build/_build/CodeGenerators/CallTargetsGenerator.cs

+
+            static List<AssemblyCallTargetDefinitionSource> GetAdoNetClientInstruments(CustomAttribute attribute)
+            {
+                List<AssemblyCallTargetDefinitionSource> res = new List<AssemblyCallTargetDefinitionSource>();


tonyredondo · 2024-11-11T09:35:29Z

tracer/build/_build/CodeGenerators/CallTargetsGenerator.cs

+
+            static List<CallTargetDefinitionSource> MergeAdoNetAttributes(List<AssemblyCallTargetDefinitionSource> attributes, List<AdoNetSignature> signatures)
+            {
+                List<CallTargetDefinitionSource> res = new List<CallTargetDefinitionSource>();


tonyredondo · 2024-11-11T09:36:01Z

tracer/build/_build/CodeGenerators/CallTargetsGenerator.cs

+            sb.AppendLine();
+
+            // Retrieve all signatures
+            HashSet<string> signatureTexts = new HashSet<string>();


tonyredondo · 2024-11-11T09:36:07Z

tracer/build/_build/CodeGenerators/CallTargetsGenerator.cs

+                signatureTexts.Add(GetSignature(definition.Key));
+            }
+
+            Dictionary<string, string> signatures = new Dictionary<string, string>();


tonyredondo · 2024-11-11T09:39:48Z

tracer/build/_build/PrepareRelease/GenerateIntegrationDefinitions.cs

@@ -10,12 +10,17 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Runtime.Loader;
+using Microsoft.VisualStudio.Services.WebApi;


:do-not-want:

tonyredondo · 2024-11-11T09:41:45Z

tracer/dependabot/generated_calltargets.g.json

+      "Item1": 2,
+      "Item2": 0,
+      "Item3": 0


I know this is not intended to be read by a human, but Item1 Item2andItem3`? :D

Yep, the version struct is defined as a Tuple...

tonyredondo · 2024-11-11T09:41:56Z

tracer/missing-nullability-files.csv

-src/Datadog.Trace/ClrProfiler/NativeCallTargetDefinition.cs
-src/Datadog.Trace/ClrProfiler/NativeCallTargetDefinition2.cs


tonyredondo · 2024-11-11T09:42:55Z

tracer/src/Datadog.Trace.Tools.Runner/Aot/AotProcessor.cs

+            // TODO : Temporary build fix
+            Definitions = null; // InstrumentationDefinitions.GetAllDefinitionsNative();
+            DerivedDefinitions = null; // InstrumentationDefinitions.GetAllDerivedDefinitionsNative();


I wonder if we should use the same json file for dependabot... wdyt?

Yeah, quite possible, but I think the reality is that this isn't supported or used anywhere yet, so it's not worth worrying about until we come back to this IMO

tonyredondo · 2024-11-11T09:44:32Z

tracer/src/Datadog.Trace/ClrProfiler/NativeCallTargetDefinition3.cs

@@ -1,41 +1,42 @@
-// <copyright file="NativeCallTargetDefinition2.cs" company="Datadog">
+// <copyright file="NativeCallTargetDefinition3.cs" company="Datadog">


Yeah, if we're not sending these from managed -> Native, I'm not sure why we need this file at all? 🤔

andrewlock

Nice work 👍

Mostly just some small suggestions e.g. be more aggressive about validation and error cases in the generator file - we can just throw as soon as we spot anything invalid, better to break the build than have something invalid in there.

A bigger concern is the changing of the native interface - I don't think we should change the native method that is called from the managed size, just add a new one?

andrewlock · 2024-11-11T10:42:32Z

tracer/build/_build/Build.Steps.cs

+    AbsolutePath DependabotPath => TracerDirectory / "dependabot";
+


nit: meh, I would keep this where it was used, having these pulled up to the class level just adds a bit more confusion IMO (I realise this is prob left over from the original output location)

Suggested change

AbsolutePath DependabotPath => TracerDirectory / "dependabot";

andrewlock · 2024-11-11T10:42:49Z

tracer/build/_build/Build.Utilities.cs

@@ -223,7 +223,8 @@ partial class Build
           }

           var testDir = Solution.GetProject(Projects.ClrProfilerIntegrationTests).Directory;
-           var dependabotProj = TracerDirectory / "dependabot" / "Datadog.Dependabot.Integrations.csproj";
+           var dependabotProj = DependabotPath / "Datadog.Dependabot.Integrations.csproj";


Suggested change

var dependabotProj = DependabotPath / "Datadog.Dependabot.Integrations.csproj";

var dependabotProj = TracerDirectory / "dependabot"/ "Datadog.Dependabot.Integrations.csproj";

andrewlock · 2024-11-11T10:54:32Z

tracer/build/_build/PrepareRelease/GenerateIntegrationDefinitions.cs

@@ -10,12 +10,17 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Runtime.Loader;
+using Microsoft.VisualStudio.Services.WebApi;


:do-not-want:

andrewlock · 2024-11-11T10:54:59Z

tracer/build/_build/CodeGenerators/CallTargetsGenerator.cs

+
+        public static void GenerateCallTargets(IEnumerable<TargetFramework> targetFrameworks, Func<string, string> getDllPath, AbsolutePath outputPath, string version, AbsolutePath dependabotPath) 
+        {
+            Serilog.Log.Debug("Generating CallTarget definitions file ...");


Suggested change

Serilog.Log.Debug("Generating CallTarget definitions file ...");

Logger.Debug("Generating CallTarget definitions file ...");

andrewlock · 2024-11-11T11:05:21Z

tracer/build/_build/CodeGenerators/CallTargetsGenerator.cs

+                TryGetVersion(minimumVersion, ushort.MinValue, out minVersion);
+                TryGetVersion(maximumVersion, ushort.MaxValue, out maxVersion);


We should probably handle the return value of false here and throw, pointing to the value and the integration with the problem, otherwise we could end up with strange issues:

Suggested change

TryGetVersion(minimumVersion, ushort.MinValue, out minVersion);

TryGetVersion(maximumVersion, ushort.MaxValue, out maxVersion);

if (!TryGetVersion(minimumVersion, ushort.MinValue, out minVersion))

{

throw new InvalidOperationException($"Error: Integration type '{type}' has invalid value for minimum: '{minimumVersion}'");

}

if (!TryGetVersion(maximumVersion, ushort.MaxValue, out maxVersion))

{

throw new InvalidOperationException($"Error: Integration type '{type}' has invalid value for maximum: '{maximumVersion}'");

}

Agree, but this is already covered in the SourceCodeGenerator. Although I could add more checks here

But we don't want the source code generator any more after this PR do we? 🤔

Nop, but yep, but nop, but yep... The IntegrationOptions is calling GetIntegrationId, so... We might want to look for an alternative method in a following PR

andrewlock · 2024-11-11T11:34:00Z

tracer/src/Datadog.Trace/ClrProfiler/NativeMethods.cs

@@ -183,7 +129,7 @@ public static int RegisterIastAspects(string[] aspects)
            }
        }

-        public static int RegisterCallTargetDefinitions(string id, NativeCallTargetDefinition2[] items, uint enabledCategories)
+        public static int RegisterCallTargetDefinitions(string id, NativeCallTargetDefinition3[] items, uint enabledCategories)


I'm confused, we don't need this method do we, we shouldn't be calling it from anywhere as I understand it 🤔

This method is used to test the category enablement / disablement feature. It's just an entry point that executes the same code that is invoked with the built in definitions

andrewlock · 2024-11-11T11:35:00Z

tracer/src/Datadog.Tracer.Native/Datadog.Tracer.Native.def

-    RegisterCallTargetDefinitions
+    RegisterCallTargetDefinitions3


This seems to be exactly what we don't want to do 🤔 We shouldn't remove the RegisterCallTargetDefinitions method, it needs to remain there, unchanged. And we don't need RegisterCallTargetDefinitions3 because it will never be called?

Legacy init uses InitProfiler in version mismatch scenarios. RegisterCallTargetDefs was called when no mismatch was found, so not needed anymore (but for testing purposes)

andrewlock · 2024-11-11T11:35:41Z

...g.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs

@@ -15,671 +15,8 @@ namespace Datadog.Trace.ClrProfiler
 {
    internal static partial class InstrumentationDefinitions
    {
-        internal static NativeCallTargetDefinition2[] Instrumentations;
-
        static InstrumentationDefinitions()


I don't think we need to generate this file at all any more?

InterationOption is still invoking the GetIntegrationId function...

andrewlock · 2024-11-11T11:38:12Z

tracer/src/Datadog.Tracer.Native/Generated/generated_calltargets.g.h

+{(WCHAR*)WStr("Microsoft.AspNetCore.Diagnostics"),(WCHAR*)WStr("Microsoft.AspNetCore.Diagnostics.DeveloperExceptionPageMiddleware"),(WCHAR*)WStr("DisplayException"),g_callTargets_Sig_159,3,2,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.StackTraceLeak.DeveloperExceptionPageMiddlewareIntegration"),CallTargetKind::Default,4,164},
+{(WCHAR*)WStr("Microsoft.AspNetCore.Diagnostics"),(WCHAR*)WStr("Microsoft.AspNetCore.Diagnostics.DeveloperExceptionPageMiddleware"),(WCHAR*)WStr("DisplayException"),g_callTargets_Sig_157,2,3,0,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.StackTraceLeak.DeveloperExceptionPageMiddlewareIntegration_Pre_3_0_0"),CallTargetKind::Default,4,164},
+{(WCHAR*)WStr("Microsoft.AspNetCore.Diagnostics"),(WCHAR*)WStr("Microsoft.AspNetCore.Diagnostics.DeveloperExceptionPageMiddlewareImpl"),(WCHAR*)WStr("DisplayException"),g_callTargets_Sig_157,2,7,0,0,8,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.StackTraceLeak.DeveloperExceptionPageMiddlewareIntegration_Pre_3_0_0"),CallTargetKind::Default,4,164},
+{(WCHAR*)WStr("System.Web"),(WCHAR*)WStr("System.Web.HttpResponse"),(WCHAR*)WStr("WriteErrorMessage"),g_callTargets_Sig_267,3,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.StackTraceLeak.HttpResponseIntegration"),CallTargetKind::Default,4,1},


As for callsites, I wonder if we can omit the NETFX-only integrations in linux/macos, but that's an optimization for later if we want to consider it

Uhm, interesting. Noted.

andrewlock · 2024-11-11T11:39:20Z

tracer/src/Datadog.Tracer.Native/cor_profiler.h

@@ -203,8 +203,7 @@ class CorProfiler : public CorProfilerBase
    //
    // Tracer Integration methods #2
    //
-    long RegisterCallTargetDefinitions(WCHAR* id, CallTargetDefinition2* items, int size,


I don't think you can or should delete this. I think this is exactly the sort of method that we explicitly should never touch 🤔

It's never used in version mismatch scenarios

Updated API

github-actions bot added the area:asm label Nov 6, 2024

daniel-romano-DD changed the base branch from master to dani/apm/NativeCallSites November 6, 2024 21:59

daniel-romano-DD mentioned this pull request Nov 6, 2024

[IAST] Native CallSites Definitions #6241

Open

daniel-romano-DD force-pushed the dani/apm/NativeCallTargets branch from 44a2ea4 to 80ad64c Compare November 6, 2024 22:10

daniel-romano-DD force-pushed the dani/apm/NativeCallTargets branch 2 times, most recently from c803d7d to afed6e3 Compare November 7, 2024 13:21

daniel-romano-DD added area:native-library Automatic instrumentation native C++ code (Datadog.Trace.ClrProfiler.Native) area:tracer The core tracer library (Datadog.Trace, does not include OpenTracing, native code, or integrations) labels Nov 7, 2024

daniel-romano-DD force-pushed the dani/apm/NativeCallSites branch from 5f466a9 to 6463601 Compare November 8, 2024 18:52

daniel-romano-DD force-pushed the dani/apm/NativeCallTargets branch from bc03048 to faade40 Compare November 8, 2024 18:53

daniel-romano-DD marked this pull request as ready for review November 9, 2024 11:35

daniel-romano-DD requested review from a team as code owners November 9, 2024 11:35

tonyredondo reviewed Nov 11, 2024

View reviewed changes

daniel-romano-DD force-pushed the dani/apm/NativeCallSites branch from 2a92d00 to 74bab4a Compare November 11, 2024 11:39

daniel-romano-DD requested a review from a team as a code owner November 11, 2024 11:39

daniel-romano-DD force-pushed the dani/apm/NativeCallTargets branch from 0e2e051 to fd471c7 Compare November 11, 2024 11:39

andrewlock reviewed Nov 11, 2024

View reviewed changes

daniel-romano-DD force-pushed the dani/apm/NativeCallTargets branch 2 times, most recently from e232f67 to 0b98667 Compare November 11, 2024 12:22

daniel-romano-DD mentioned this pull request Nov 11, 2024

[APM] Exclude windows only definitions from non windows dlls #6270

Open

daniel-romano-DD added 2 commits November 11, 2024 18:02

Export function

0f30e80

No ADO Net definitions yet

270b102

daniel-romano-DD added 10 commits November 11, 2024 18:02

Temporary fix for build error

c8a7ca0

Added AdoNet CallTargets

bd037b0

Fixed linux compilation

c45e067

Fiz build compilation error in linux

7a7c262

Reworked GeneratePackageVerions logic

e2470e6

Fixxed Test.

f353d1a

Updated API

Moved definitions file

07f2ab6

Fix build

665700d

Fix compilation error

abea0ca

Addressed comments

2277786

daniel-romano-DD force-pushed the dani/apm/NativeCallSites branch from ec76382 to 3d10c13 Compare November 11, 2024 21:59

daniel-romano-DD force-pushed the dani/apm/NativeCallTargets branch from 17bc420 to 2277786 Compare November 11, 2024 21:59

		src/Datadog.Trace/ClrProfiler/NativeCallTargetDefinition.cs
		src/Datadog.Trace/ClrProfiler/NativeCallTargetDefinition2.cs

		@@ -1,41 +1,42 @@
		// <copyright file="NativeCallTargetDefinition2.cs" company="Datadog">
		// <copyright file="NativeCallTargetDefinition3.cs" company="Datadog">

		AbsolutePath DependabotPath => TracerDirectory / "dependabot";

	var dependabotProj = DependabotPath / "Datadog.Dependabot.Integrations.csproj";
	var dependabotProj = TracerDirectory / "dependabot"/ "Datadog.Dependabot.Integrations.csproj";

	Serilog.Log.Debug("Generating CallTarget definitions file ...");
	Logger.Debug("Generating CallTarget definitions file ...");

		TryGetVersion(minimumVersion, ushort.MinValue, out minVersion);
		TryGetVersion(maximumVersion, ushort.MaxValue, out maxVersion);

-                TryGetVersion(minimumVersion, ushort.MinValue, out minVersion);
-                TryGetVersion(maximumVersion, ushort.MaxValue, out maxVersion);
+                if (!TryGetVersion(minimumVersion, ushort.MinValue, out minVersion))
+                {
+                    throw new InvalidOperationException($"Error: Integration type  '{type}' has invalid value for minimum: '{minimumVersion}'");
+                }
+                if (!TryGetVersion(maximumVersion, ushort.MaxValue, out maxVersion))
+                {
+                    throw new InvalidOperationException($"Error: Integration type  '{type}' has invalid value for maximum: '{maximumVersion}'");
+                }

[ASM] Native CallTarget definitions #6252

Are you sure you want to change the base?

[ASM] Native CallTarget definitions #6252

Conversation

daniel-romano-DD commented Nov 6, 2024 • edited Loading

Summary of changes

Reason for change

Implementation details

Test coverage

Other details

daniel-romano-DD commented Nov 6, 2024 • edited Loading

andrewlock commented Nov 6, 2024 • edited Loading

Execution-Time Benchmarks Report ⏱️

andrewlock commented Nov 6, 2024 • edited Loading

Benchmarks Report for tracer 🐌

Benchmark details

Raw results

Raw results

Faster 🎉 in #6252

Fewer allocations 🎉 in #6252

Raw results

Raw results

Slower ⚠️ in #6252

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

andrewlock commented Nov 6, 2024 • edited Loading

Throughput/Crank Report ⚡

datadog-ddstaging bot commented Nov 6, 2024 • edited Loading

Datadog Report

New Flaky Tests (1)

andrewlock commented Nov 8, 2024 • edited Loading

Benchmarks Report for appsec 🐌

Benchmark details

Raw results

Raw results

Raw results

More allocations ⚠️ in #6252

Fewer allocations 🎉 in #6252

Raw results

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andrewlock left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

daniel-romano-DD commented Nov 6, 2024 •

edited

Loading

daniel-romano-DD commented Nov 6, 2024 •

edited

Loading

andrewlock commented Nov 6, 2024 •

edited

Loading

andrewlock commented Nov 6, 2024 •

edited

Loading

andrewlock commented Nov 6, 2024 •

edited

Loading

datadog-ddstaging bot commented Nov 6, 2024 •

edited

Loading

andrewlock commented Nov 8, 2024 •

edited

Loading