Skip to content

Commit 012049e

Browse files
authored
Add support for AWS SDK v4.0 (#6929)
## Summary of changes Adds support for AWS SDK 4.0, [released on 28th Apr](https://aws.amazon.com/blogs/developer/general-availability-of-aws-sdk-for-net-v4-0/) ## Reason for change We want to support the latest versions of the SDK ## Implementation details - Ran a "baseline" bump of package versions for simplicity, and then later removed the commit from the stack. - Bumped the tested versions of AWS. - Bumped the instrumented versions of AWS. - Added scrubbing for http-client-handler vs socket-handler. - This is an implementation detail difference in v4 which doesn't really matter in the snapshots so just scrubbed it where required - Added additional instrumentation to grab the "real" URL that the HTTP Client sends. - The value added by the existing "core pipeline" instrumentation contained the wrong value for the S3 tests, it contained a value `/{Key+}` instead of the expected `/sample.txt`. - This looks like a core change to the library, to allow "parameterized" URLs. - Rather than trying to reproduce the logic it uses in the existing endpoint, the additional instrumentation grabs the "real" URL that's used, and uses that preferentially - I haven't checked to see if we could backport this to earlier SDK versions too, but seems like low value to do so with risks of breakage ## Test coverage Ran an [all-TFMs test](https://dev.azure.com/datadoghq/dd-trace-dotnet/_build/results?buildId=177194&view=results) to make sure everything looks ok, and looks fine in general ## Other details Stacked on - #6922 because the minimum .NET Framework version was bumped to `net472`
1 parent 5c606d2 commit 012049e

File tree

96 files changed

+3757
-1629
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+3757
-1629
lines changed

tracer/build/PackageVersionsGeneratorDefinitions.json

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,32 @@
11
[
2+
{
3+
"IntegrationName": "AwsSdk",
4+
"SampleProjectName": "Samples.AWS.DynamoDBv2",
5+
"NugetPackageSearchName": "AWSSDK.Core",
6+
"MinVersion": "3.0.0",
7+
"MaxVersionExclusive": "5.0.0",
8+
"SpecificVersions": [
9+
"3.1.*",
10+
"3.3.*",
11+
"3.*.*",
12+
"4.*.*"
13+
],
14+
"VersionConditions": [{
15+
"MaxVersionExclusive": "3.3.0",
16+
"IncludeOnlyTargetFrameworks": ["net48"]
17+
}]
18+
},
219
{
320
"IntegrationName": "AwsDynamoDb",
421
"SampleProjectName": "Samples.AWS.DynamoDBv2",
522
"NugetPackageSearchName": "AWSSDK.DynamoDBv2",
623
"MinVersion": "3.0.0",
7-
"MaxVersionExclusive": "3.8.0",
24+
"MaxVersionExclusive": "5.0.0",
825
"SpecificVersions": [
926
"3.1.*",
1027
"3.3.*",
11-
"3.*.*"
28+
"3.*.*",
29+
"4.*.*"
1230
],
1331
"VersionConditions": [{
1432
"MaxVersionExclusive": "3.3.0",
@@ -20,11 +38,12 @@
2038
"SampleProjectName": "Samples.AWS.Kinesis",
2139
"NugetPackageSearchName": "AWSSDK.Kinesis",
2240
"MinVersion": "3.0.0",
23-
"MaxVersionExclusive": "3.8.0",
41+
"MaxVersionExclusive": "5.0.0",
2442
"SpecificVersions": [
2543
"3.1.*",
2644
"3.3.*",
27-
"3.*.*"
45+
"3.*.*",
46+
"4.*.*"
2847
],
2948
"VersionConditions": [{
3049
"MaxVersionExclusive": "3.3.0",
@@ -50,11 +69,12 @@
5069
"SampleProjectName": "Samples.AWS.SQS",
5170
"NugetPackageSearchName": "AWSSDK.SQS",
5271
"MinVersion": "3.0.0",
53-
"MaxVersionExclusive": "3.8.0",
72+
"MaxVersionExclusive": "5.0.0",
5473
"SpecificVersions": [
5574
"3.1.*",
5675
"3.3.*",
57-
"3.*.*"
76+
"3.*.*",
77+
"4.*.*"
5878
],
5979
"VersionConditions": [{
6080
"MaxVersionExclusive": "3.3.0",
@@ -66,11 +86,12 @@
6686
"SampleProjectName": "Samples.AWS.SimpleNotificationService",
6787
"NugetPackageSearchName": "AWSSDK.SimpleNotificationService",
6888
"MinVersion": "3.0.0",
69-
"MaxVersionExclusive": "3.8.0",
89+
"MaxVersionExclusive": "5.0.0",
7090
"SpecificVersions": [
7191
"3.1.*",
7292
"3.3.*",
73-
"3.*.*"
93+
"3.*.*",
94+
"4.*.*"
7495
],
7596
"VersionConditions": [
7697
{
@@ -84,11 +105,12 @@
84105
"SampleProjectName": "Samples.AWS.EventBridge",
85106
"NugetPackageSearchName": "AWSSDK.EventBridge",
86107
"MinVersion": "3.3.100",
87-
"MaxVersionExclusive": "4.0.0",
108+
"MaxVersionExclusive": "5.0.0",
88109
"SpecificVersions": [
89110
"3.3.*",
90111
"3.5.*",
91-
"3.7.*"
112+
"3.7.*",
113+
"4.*.*"
92114
],
93115
"VersionConditions": [
94116
{
@@ -102,11 +124,12 @@
102124
"SampleProjectName": "Samples.AWS.S3",
103125
"NugetPackageSearchName": "AWSSDK.S3",
104126
"MinVersion": "3.3.0",
105-
"MaxVersionExclusive": "4.0.0",
127+
"MaxVersionExclusive": "5.0.0",
106128
"SpecificVersions": [
107129
"3.3.*",
108130
"3.5.*",
109-
"3.7.*"
131+
"3.7.*",
132+
"4.*.*"
110133
],
111134
"VersionConditions": [
112135
{
@@ -120,11 +143,12 @@
120143
"SampleProjectName": "Samples.AWS.StepFunctions",
121144
"NugetPackageSearchName": "AWSSDK.StepFunctions",
122145
"MinVersion": "3.3.0",
123-
"MaxVersionExclusive": "4.0.0",
146+
"MaxVersionExclusive": "5.0.0",
124147
"SpecificVersions": [
125148
"3.3.*",
126149
"3.5.*",
127-
"3.7.*"
150+
"3.7.*",
151+
"4.*.*"
128152
],
129153
"VersionConditions": [
130154
{

tracer/build/PackageVersionsLatestMajors.g.props

Lines changed: 549 additions & 63 deletions
Large diffs are not rendered by default.

tracer/build/PackageVersionsLatestMinors.g.props

Lines changed: 663 additions & 63 deletions
Large diffs are not rendered by default.

tracer/build/PackageVersionsLatestSpecific.g.props

Lines changed: 609 additions & 63 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)