[tracer] Add s3 instrumentation #6590

nhulston · 2025-01-23T20:45:09Z

Summary of changes

Creates an automatic instrumentation for S3's common & important operations (and their async equivalents):

Object management:

GetObject
PutObject
DeleteObject
CopyObject
ListObjectsV2

Bucket management:

PutBucket
DeleteBucket
ListBuckets

Multipart uploads:

InitiateMultipartUpload
UploadPart
CompleteMultipartUpload

Reason for change

More enriched spans for AWS SDK in S3
S3 is instrumented in other tracers
This is a prerequisite for a new feature I'm working on called 'span pointers'. See my PR in the Java tracer for more context.

Implementation details

Instrumented AmazonS3Client and the specified methods
Set bucket and object key tags (in alignment with other tracers) for operations where these fields exist

Test coverage

Unit tests:

cd tracer
dotnet test ./test/Datadog.Trace.ClrProfiler.Managed.Tests

Integration tests:

cd tracer

# Start docker localstock
docker run --rm -it -p 4566:4566 -p 4571:4571 -e SERVICES=s3 localstack/localstack

# Build tracer
./build.sh BuildTracerHome -buildConfiguration Debug -framework net6.0

# Run integation tests
./build.sh BuildAndRunOSxIntegrationTests -buildConfiguration Debug -framework net6.0 -Filter "Datadog.Trace.ClrProfiler.IntegrationTests.AWS.AwsS3Tests" -SampleName Samples.AWS.S3

Manually tested every operation (see above for images). All instrumentations work since each operation's span does have a custom resource name.

Other details

For AWS S3 v3.3 and v3.5, the bucket path is given as bucket-name/. For v3.7+, the bucket path is given as bucket-name. I had to manually handle this case in RuntimePipelineInvokeIntegration to get integration tests to pass and for the http.url tags to be consistent across versions. Let me know if there's a better way to handle this.

datadog-ddstaging · 2025-01-23T21:43:30Z

Datadog Report

Branch report: nicholas.hulston/add-s3-instrumentation
Commit report: f3cb287
Test service: dd-trace-dotnet

❌ 2 Failed (0 Known Flaky), 574643 Passed, 4933 Skipped, 46h 52m 52.65s Total Time

❌ Failed Tests (2)

Baseline - Samples.HttpMessageHandler.windows.net80.json.scenarios - Details

Expand for error

 
 <null>rd Output: tnet-core-applaunch?framework=Microsoft.NETCore.App&framework_version=8.0.0&arch=x64&rid=win-x64&os=win10

CallTarget+Inlining+NGEN - Samples.HttpMessageHandler.windows.net80.json.scenarios - Details

Expand for error

 
 <null>rd Output: tnet-core-applaunch?framework=Microsoft.NETCore.App&framework_version=8.0.0&arch=x64&rid=win-x64&os=win10

andrewlock · 2025-01-23T22:17:10Z

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 (6590) - mean (70ms)  : 66, 73
     .   : milestone, 70,
    master - mean (69ms)  : 66, 72
     .   : milestone, 69,

    section CallTarget+Inlining+NGEN
    This PR (6590) - mean (984ms)  : 955, 1013
     .   : milestone, 984,
    master - mean (983ms)  : 961, 1005
     .   : milestone, 983,

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

    section CallTarget+Inlining+NGEN
    This PR (6590) - mean (675ms)  : 658, 692
     .   : milestone, 675,
    master - mean (674ms)  : 659, 688
     .   : milestone, 674,

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

    section CallTarget+Inlining+NGEN
    This PR (6590) - mean (631ms)  : 613, 648
     .   : milestone, 631,
    master - mean (630ms)  : 614, 646
     .   : milestone, 630,

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

    section CallTarget+Inlining+NGEN
    This PR (6590) - mean (1,091ms)  : 1060, 1122
     .   : milestone, 1091,
    master - mean (1,093ms)  : 1061, 1125
     .   : milestone, 1093,

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

    section CallTarget+Inlining+NGEN
    This PR (6590) - mean (864ms)  : 832, 895
     .   : milestone, 864,
    master - mean (868ms)  : 836, 899
     .   : milestone, 868,

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

    section CallTarget+Inlining+NGEN
    This PR (6590) - mean (845ms)  : 804, 885
     .   : milestone, 845,
    master - mean (850ms)  : 812, 889
     .   : milestone, 850,

andrewlock · 2025-01-23T22:36:04Z

Benchmarks Report for tracer 🐌

Benchmarks for #6590 compared to master:

2 benchmarks are faster, with geometric mean 1.203
1 benchmarks are slower, with geometric mean 1.165
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.ActivityBenchmark - Same speed ✔️ Same allocations ✔️

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Gen 1	Gen 2	Allocated
master	`StartStopWithChild`	net6.0	7.99μs	45.6ns	328ns	0.0121	0.00403	0	5.61 KB
master	`StartStopWithChild`	netcoreapp3.1	10.4μs	58.9ns	408ns	0.0206	0.0103	0	5.8 KB
master	`StartStopWithChild`	net472	16.1μs	37.1ns	144ns	1.04	0.293	0.0897	6.22 KB
#6590	`StartStopWithChild`	net6.0	7.93μs	45.4ns	337ns	0.0123	0.00408	0	5.61 KB
#6590	`StartStopWithChild`	netcoreapp3.1	10.2μs	57.4ns	385ns	0.0206	0.0103	0	5.8 KB
#6590	`StartStopWithChild`	net472	16.2μs	69.4ns	269ns	1.04	0.313	0.0962	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	487μs	251ns	973ns	0	2.7 KB
master	`WriteAndFlushEnrichedTraces`	netcoreapp3.1	658μs	319ns	1.19μs	0	2.7 KB
master	`WriteAndFlushEnrichedTraces`	net472	855μs	516ns	1.93μs	0.425	3.3 KB
#6590	`WriteAndFlushEnrichedTraces`	net6.0	475μs	340ns	1.32μs	0	2.7 KB
#6590	`WriteAndFlushEnrichedTraces`	netcoreapp3.1	653μs	206ns	715ns	0	2.7 KB
#6590	`WriteAndFlushEnrichedTraces`	net472	844μs	493ns	1.91μs	0.419	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	128μs	374ns	1.4μs	0.187	14.47 KB
master	`SendRequest`	netcoreapp3.1	143μs	451ns	1.75μs	0.207	17.27 KB
master	`SendRequest`	net472	0ns	0ns	0ns	0	0 b
#6590	`SendRequest`	net6.0	129μs	438ns	1.69μs	0.193	14.47 KB
#6590	`SendRequest`	netcoreapp3.1	146μs	203ns	785ns	0.217	17.27 KB
#6590	`SendRequest`	net472	0.00188ns	0.000781ns	0.00302ns	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	585μs	3.27μs	20.2μs	0.532	0	0	41.81 KB
master	`WriteAndFlushEnrichedTraces`	netcoreapp3.1	655μs	3.51μs	18.6μs	0.326	0	0	41.92 KB
master	`WriteAndFlushEnrichedTraces`	net472	849μs	4.05μs	17.2μs	8.58	2.45	0.408	53.31 KB
#6590	`WriteAndFlushEnrichedTraces`	net6.0	567μs	2.24μs	8.38μs	0.579	0	0	41.64 KB
#6590	`WriteAndFlushEnrichedTraces`	netcoreapp3.1	660μs	3.3μs	14.4μs	0.319	0	0	41.86 KB
#6590	`WriteAndFlushEnrichedTraces`	net472	836μs	4.2μs	18.8μs	8.39	2.52	0.419	53.29 KB

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

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Gen 1	Allocated
master	`ExecuteNonQuery`	net6.0	1.32μs	0.779ns	3.02ns	0.0146	0	1.02 KB
master	`ExecuteNonQuery`	netcoreapp3.1	1.8μs	0.965ns	3.48ns	0.0133	0	1.02 KB
master	`ExecuteNonQuery`	net472	2.03μs	2.58ns	9.99ns	0.156	0.00103	987 B
#6590	`ExecuteNonQuery`	net6.0	1.28μs	1.04ns	4.04ns	0.014	0	1.02 KB
#6590	`ExecuteNonQuery`	netcoreapp3.1	1.71μs	1.1ns	4.11ns	0.0137	0	1.02 KB
#6590	`ExecuteNonQuery`	net472	2.14μs	1.05ns	3.79ns	0.157	0.00107	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.2μs	1.2ns	4.65ns	0.0139	976 B
master	`CallElasticsearch`	netcoreapp3.1	1.55μs	0.561ns	2.1ns	0.0132	976 B
master	`CallElasticsearch`	net472	2.48μs	1.29ns	4.65ns	0.157	995 B
master	`CallElasticsearchAsync`	net6.0	1.34μs	0.439ns	1.7ns	0.0128	952 B
master	`CallElasticsearchAsync`	netcoreapp3.1	1.73μs	0.878ns	3.28ns	0.0137	1.02 KB
master	`CallElasticsearchAsync`	net472	2.68μs	2.09ns	8.1ns	0.166	1.05 KB
#6590	`CallElasticsearch`	net6.0	1.21μs	0.676ns	2.53ns	0.0134	976 B
#6590	`CallElasticsearch`	netcoreapp3.1	1.54μs	0.788ns	2.95ns	0.0131	976 B
#6590	`CallElasticsearch`	net472	2.66μs	1.32ns	5.12ns	0.158	995 B
#6590	`CallElasticsearchAsync`	net6.0	1.36μs	1.04ns	4.05ns	0.0136	952 B
#6590	`CallElasticsearchAsync`	netcoreapp3.1	1.6μs	0.857ns	3.21ns	0.0137	1.02 KB
#6590	`CallElasticsearchAsync`	net472	2.65μs	1.83ns	6.86ns	0.166	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.28μs	0.484ns	1.75ns	0.0137	952 B
master	`ExecuteAsync`	netcoreapp3.1	1.64μs	1.66ns	6.22ns	0.0131	952 B
master	`ExecuteAsync`	net472	1.82μs	0.698ns	2.7ns	0.145	915 B
#6590	`ExecuteAsync`	net6.0	1.29μs	1.64ns	6.14ns	0.013	952 B
#6590	`ExecuteAsync`	netcoreapp3.1	1.67μs	0.854ns	3.31ns	0.0126	952 B
#6590	`ExecuteAsync`	net472	1.77μs	0.607ns	2.35ns	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.47μs	1.2ns	4.66ns	0.0314	2.31 KB
master	`SendAsync`	netcoreapp3.1	5.3μs	1.79ns	6.7ns	0.0373	2.85 KB
master	`SendAsync`	net472	7.36μs	1.18ns	4.56ns	0.494	3.12 KB
#6590	`SendAsync`	net6.0	4.38μs	1.45ns	5.43ns	0.0308	2.31 KB
#6590	`SendAsync`	netcoreapp3.1	5.26μs	1.99ns	7.43ns	0.0367	2.85 KB
#6590	`SendAsync`	net472	7.34μs	2.58ns	9.65ns	0.493	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.859ns	3.21ns	0.0231	1.64 KB
master	`EnrichedLog`	netcoreapp3.1	2.26μs	1.05ns	3.95ns	0.0225	1.64 KB
master	`EnrichedLog`	net472	2.68μs	1.07ns	3.98ns	0.249	1.57 KB
#6590	`EnrichedLog`	net6.0	1.54μs	1.38ns	5.15ns	0.0235	1.64 KB
#6590	`EnrichedLog`	netcoreapp3.1	2.27μs	0.744ns	2.68ns	0.0217	1.64 KB
#6590	`EnrichedLog`	net472	2.68μs	0.86ns	3.22ns	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	114μs	180ns	698ns	0.0575	0	4.28 KB
master	`EnrichedLog`	netcoreapp3.1	116μs	278ns	1.07μs	0.0584	0	4.28 KB
master	`EnrichedLog`	net472	153μs	183ns	708ns	0.688	0.229	4.46 KB
#6590	`EnrichedLog`	net6.0	112μs	98ns	380ns	0.0558	0	4.28 KB
#6590	`EnrichedLog`	netcoreapp3.1	117μs	248ns	929ns	0.058	0	4.28 KB
#6590	`EnrichedLog`	net472	151μs	141ns	528ns	0.675	0.225	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.03μs	0.8ns	3.1ns	0.0303	2.2 KB
master	`EnrichedLog`	netcoreapp3.1	4.08μs	1.14ns	4.27ns	0.0286	2.2 KB
master	`EnrichedLog`	net472	4.87μs	1.25ns	4.86ns	0.318	2.02 KB
#6590	`EnrichedLog`	net6.0	3.18μs	0.648ns	2.43ns	0.0308	2.2 KB
#6590	`EnrichedLog`	netcoreapp3.1	4.28μs	1.43ns	5.53ns	0.0298	2.2 KB
#6590	`EnrichedLog`	net472	4.8μs	1.01ns	3.92ns	0.321	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.46μs	2.58ns	10ns	0.0157	1.14 KB
master	`SendReceive`	netcoreapp3.1	1.76μs	0.517ns	1.94ns	0.015	1.14 KB
master	`SendReceive`	net472	2.09μs	0.655ns	2.45ns	0.183	1.16 KB
#6590	`SendReceive`	net6.0	1.36μs	0.956ns	3.7ns	0.0163	1.14 KB
#6590	`SendReceive`	netcoreapp3.1	1.71μs	0.884ns	3.42ns	0.0156	1.14 KB
#6590	`SendReceive`	net472	2.03μs	0.314ns	1.22ns	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.69μs	0.891ns	3.45ns	0.0228	1.6 KB
master	`EnrichedLog`	netcoreapp3.1	3.84μs	1.19ns	4.46ns	0.0211	1.65 KB
master	`EnrichedLog`	net472	4.47μs	3.21ns	12.4ns	0.323	2.04 KB
#6590	`EnrichedLog`	net6.0	2.89μs	10.1ns	39.1ns	0.0226	1.6 KB
#6590	`EnrichedLog`	netcoreapp3.1	3.84μs	1.99ns	7.7ns	0.0212	1.65 KB
#6590	`EnrichedLog`	net472	4.37μs	3.18ns	11.9ns	0.323	2.04 KB

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

Slower ⚠️ in #6590

Benchmark	diff/base	Base Median (ns)	Diff Median (ns)	Modality
Benchmarks.Trace.SpanBenchmark.StartFinishSpan‑net6.0	1.165	402.60	469.01

Faster 🎉 in #6590

Benchmark	base/diff	Base Median (ns)	Diff Median (ns)	Modality
Benchmarks.Trace.SpanBenchmark.StartFinishScope‑net472	1.293	895.28	692.32
Benchmarks.Trace.SpanBenchmark.StartFinishSpan‑net472	1.120	656.25	586.19

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`StartFinishSpan`	net6.0	403ns	0.102ns	0.382ns	0.00812	576 B
master	`StartFinishSpan`	netcoreapp3.1	576ns	0.53ns	1.98ns	0.00749	576 B
master	`StartFinishSpan`	net472	656ns	0.208ns	0.779ns	0.0918	578 B
master	`StartFinishScope`	net6.0	474ns	0.213ns	0.823ns	0.00976	696 B
master	`StartFinishScope`	netcoreapp3.1	756ns	0.349ns	1.35ns	0.00941	696 B
master	`StartFinishScope`	net472	896ns	0.292ns	1.13ns	0.104	658 B
#6590	`StartFinishSpan`	net6.0	468ns	0.547ns	2.12ns	0.00796	576 B
#6590	`StartFinishSpan`	netcoreapp3.1	561ns	0.952ns	3.69ns	0.00795	576 B
#6590	`StartFinishSpan`	net472	585ns	1.49ns	5.36ns	0.0917	578 B
#6590	`StartFinishScope`	net6.0	479ns	0.809ns	3.03ns	0.00991	696 B
#6590	`StartFinishScope`	netcoreapp3.1	701ns	1.69ns	6.56ns	0.00966	696 B
#6590	`StartFinishScope`	net472	693ns	1.62ns	6.27ns	0.105	658 B

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

Raw results

Branch	Method	Toolchain	Mean	StdError	StdDev	Gen 0	Allocated
master	`RunOnMethodBegin`	net6.0	632ns	0.369ns	1.43ns	0.00956	696 B
master	`RunOnMethodBegin`	netcoreapp3.1	906ns	0.394ns	1.47ns	0.00935	696 B
master	`RunOnMethodBegin`	net472	1.03μs	0.405ns	1.57ns	0.104	658 B
#6590	`RunOnMethodBegin`	net6.0	668ns	0.666ns	2.58ns	0.00965	696 B
#6590	`RunOnMethodBegin`	netcoreapp3.1	932ns	1.31ns	5.07ns	0.00929	696 B
#6590	`RunOnMethodBegin`	net472	1.06μs	3.13ns	12.1ns	0.104	658 B

… and object key

…eMultipartUpload, and CompleteMultipartUploadAsync

# Conflicts: # tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountCIVisibility.g.cs # tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_DistributionCIVisibility.g.cs # tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountCIVisibility.g.cs # tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_DistributionCIVisibility.g.cs # tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountCIVisibility.g.cs # tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_DistributionCIVisibility.g.cs # tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountCIVisibility.g.cs # tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_DistributionCIVisibility.g.cs # tracer/src/Datadog.Tracer.Native/Generated/generated_calltargets.g.cpp

… of Client

DylanLovesCoffee · 2025-01-30T18:48:06Z

tracer/test/test-applications/integrations/Samples.AWS.S3/SyncHelpers.cs

+        private const string ObjectKey = "sample.txt";
+        private const string ObjectContent = "Hello World!";
+
+        public static void StartS3Tasks(AmazonS3Client s3Client)


Should we also add coverage for the other new integrations like CopyObject, etc?

yes, i'll get that to that once I can get these tests to pass

…on't have tags for bucket or object key

nhulston added 5 commits January 27, 2025 17:03

add basic S3 instrumentation for PutObject and PutObjectAsync

abb2bae

implement tags

99d4528

create basic s3 sample app

1c6707a

implement basic s3 integration tests

01734d3

run GeneratePackageVersions

8e22164

nhulston force-pushed the nicholas.hulston/add-s3-instrumentation branch from baa2cad to 8e22164 Compare January 27, 2025 22:24

nhulston added 4 commits January 28, 2025 11:30

Add aws.bucket.name and aws.object.key tags

1e3ee72

Instrument PutObject and PutObjectAsync; set tags for bucket name…

96dde22

… and object key

create basic instrumentation for CopyObject, CopyObjectAsync, Complet…

f1cde9c

…eMultipartUpload, and CompleteMultipartUploadAsync

Run GeneratePackageVersions to update call targets

2085dfb

nhulston force-pushed the nicholas.hulston/add-s3-instrumentation branch from cdea333 to 2085dfb Compare January 28, 2025 17:32

nhulston added 16 commits January 28, 2025 13:36

update calltargets

205388b

Instrument CopyObject and CompleteMultipartUpload

308d567

create GetObject integration

387122d

create DeleteObject integration

4bffcbc

create ListObjects integration

c9eb8e2

create PutBucket integration

0e4c0f0

create DeleteBucket integration

a6d606f

refactor async integrations

239409f

create ListObjectsV2 integration

9273310

refactor integrations; remove ListObjectsV1 integration in favor of v2

5e415a7

run GeneratePackageVersions

675d9e9

create ListBuckets integration

57d7e35

simplify comments

dca6ed4

create DeleteObjects integration

ed525ff

create InitiateMultipartUpload integration

6493d30

nhulston added 11 commits January 28, 2025 17:30

run GeneratePackageVersions

dd6c0a2

fix span kind to Client; make spanKind parameter have default value…

49beaa1

… of Client

add AwsS3Common unit tests

bf5e58b

update SpanMetadataRules tests

7fcd5b2

implement sample app

00a8dc0

fix s3 launch settings

ccfc372

update tags

21d730f

fix integration tests (no uppercase bucket names)

1d8957d

fix unit tests

33135ba

update v0 operation name

fcda3fa

add NetCore snapshots

32b8589

nhulston changed the title ~~[wip] Add s3 instrumentation~~ [tracer] Add s3 instrumentation Jan 30, 2025

nhulston marked this pull request as ready for review January 30, 2025 17:24

nhulston requested review from a team as code owners January 30, 2025 17:24

DylanLovesCoffee reviewed Jan 30, 2025

View reviewed changes

nhulston force-pushed the nicholas.hulston/add-s3-instrumentation branch from 388cb26 to a5d213e Compare January 30, 2025 20:25

nhulston requested review from a team as code owners January 30, 2025 20:25

nhulston force-pushed the nicholas.hulston/add-s3-instrumentation branch from a5d213e to 32b8589 Compare January 30, 2025 20:26

Merge branch 'master' into nicholas.hulston/add-s3-instrumentation

4163a58

nhulston force-pushed the nicholas.hulston/add-s3-instrumentation branch from d603384 to 4163a58 Compare January 31, 2025 14:40

DataDog deleted a comment from github-actions bot Jan 31, 2025

nhulston and others added 5 commits January 31, 2025 09:41

Merge branch 'master' into nicholas.hulston/add-s3-instrumentation

65c52bd

update snapshots

7d631d0

manually construct s3 request paths

f3cb287

add test coverage for every instrumented operation

b2b2f2d

update rules and snapshots. Operations like ListBuckets obviously w…

dc83a86

…on't have tags for bucket or object key

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[tracer] Add s3 instrumentation #6590

[tracer] Add s3 instrumentation #6590

nhulston commented Jan 23, 2025 •

edited

Loading

datadog-ddstaging bot commented Jan 23, 2025 •

edited

Loading

andrewlock commented Jan 23, 2025 •

edited

Loading

andrewlock commented Jan 23, 2025 •

edited

Loading

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Slower ⚠️ in #6590

Faster 🎉 in #6590

Raw results

Raw results

DylanLovesCoffee Jan 30, 2025

nhulston Jan 30, 2025

[tracer] Add s3 instrumentation #6590

Are you sure you want to change the base?

[tracer] Add s3 instrumentation #6590

Conversation

nhulston commented Jan 23, 2025 • edited Loading

Summary of changes

Reason for change

Implementation details

Test coverage

Other details

datadog-ddstaging bot commented Jan 23, 2025 • edited Loading

Datadog Report

❌ Failed Tests (2)

andrewlock commented Jan 23, 2025 • edited Loading

Execution-Time Benchmarks Report ⏱️

andrewlock commented Jan 23, 2025 • edited Loading

Benchmarks Report for tracer 🐌

Benchmark details

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Raw results

Slower ⚠️ in #6590

Faster 🎉 in #6590

Raw results

Raw results

DylanLovesCoffee Jan 30, 2025

Choose a reason for hiding this comment

nhulston Jan 30, 2025

Choose a reason for hiding this comment

nhulston commented Jan 23, 2025 •

edited

Loading

datadog-ddstaging bot commented Jan 23, 2025 •

edited

Loading

andrewlock commented Jan 23, 2025 •

edited

Loading

andrewlock commented Jan 23, 2025 •

edited

Loading