Skip to content

Commit a7b9559

Browse files
nhulstonnhulston
authored
[tracer] Add s3 instrumentation (#6590)
1 parent bb7fbb0 commit a7b9559

File tree

105 files changed

+8550
-1311
lines changed

Some content is hidden

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

105 files changed

+8550
-1311
lines changed

‎Datadog.Trace.OSX.slnf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
"tracer\\test\\test-applications\\integrations\\Samples.AWS.EventBridge\\Samples.AWS.EventBridge.csproj",
8383
"tracer\\test\\test-applications\\integrations\\Samples.AWS.Kinesis\\Samples.AWS.Kinesis.csproj",
8484
"tracer\\test\\test-applications\\integrations\\Samples.AWS.Lambda\\Samples.AWS.Lambda.csproj",
85+
"tracer\\test\\test-applications\\integrations\\Samples.AWS.S3\\Samples.AWS.S3.csproj",
8586
"tracer\\test\\test-applications\\integrations\\Samples.AWS.SimpleNotificationService\\Samples.AWS.SimpleNotificationService.csproj",
8687
"tracer\\test\\test-applications\\integrations\\Samples.AWS.SQS\\Samples.AWS.SQS.csproj",
8788
"tracer\\test\\test-applications\\integrations\\Samples.AzureServiceBus\\Samples.AzureServiceBus.csproj",

‎Datadog.Trace.Samples.g.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.XUnitTestsV3", "tra
437437
EndProject
438438
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.XUnitTestsRetriesV3", "tracer\test\test-applications\integrations\Samples.XUnitTestsRetriesV3\Samples.XUnitTestsRetriesV3.csproj", "{E2EDDD17-B5E6-4240-9EF8-34F2D274AA19}"
439439
EndProject
440+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.AWS.S3", "tracer\test\test-applications\integrations\Samples.AWS.S3\Samples.AWS.S3.csproj", "{0C0578CB-3B67-4F95-8547-206CD2A560CD}"
441+
EndProject
440442
Global
441443
GlobalSection(SolutionConfigurationPlatforms) = preSolution
442444
Debug|Any CPU = Debug|Any CPU
@@ -1051,6 +1053,10 @@ Global
10511053
{E2EDDD17-B5E6-4240-9EF8-34F2D274AA19}.Debug|Any CPU.Build.0 = Debug|Any CPU
10521054
{E2EDDD17-B5E6-4240-9EF8-34F2D274AA19}.Release|Any CPU.ActiveCfg = Release|Any CPU
10531055
{E2EDDD17-B5E6-4240-9EF8-34F2D274AA19}.Release|Any CPU.Build.0 = Release|Any CPU
1056+
{0C0578CB-3B67-4F95-8547-206CD2A560CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1057+
{0C0578CB-3B67-4F95-8547-206CD2A560CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
1058+
{0C0578CB-3B67-4F95-8547-206CD2A560CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
1059+
{0C0578CB-3B67-4F95-8547-206CD2A560CD}.Release|Any CPU.Build.0 = Release|Any CPU
10541060
EndGlobalSection
10551061
GlobalSection(NestedProjects) = preSolution
10561062
{9518425A-36A5-4B8F-B0B8-6137DB88441D} = {8CEC2042-F11C-49F5-A674-2355793B600A}
@@ -1225,5 +1231,6 @@ Global
12251231
{0F8EAB52-0C5B-4F60-92C5-42FAC21F4E77} = {C4C1E313-C7C1-4490-AECE-0DD0062380A4}
12261232
{E5BF2436-0BE7-4096-9F25-5118916F4BE4} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
12271233
{E2EDDD17-B5E6-4240-9EF8-34F2D274AA19} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
1234+
{0C0578CB-3B67-4F95-8547-206CD2A560CD} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
12281235
EndGlobalSection
12291236
EndGlobal

‎Datadog.Trace.sln‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.XUnitTestsV3", "tra
607607
EndProject
608608
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.XUnitTestsRetriesV3", "tracer\test\test-applications\integrations\Samples.XUnitTestsRetriesV3\Samples.XUnitTestsRetriesV3.csproj", "{E2EDDD17-B5E6-4240-9EF8-34F2D274AA19}"
609609
EndProject
610+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.AWS.S3", "tracer\test\test-applications\integrations\Samples.AWS.S3\Samples.AWS.S3.csproj", "{0C0578CB-3B67-4F95-8547-206CD2A560CD}"
611+
EndProject
610612
Global
611613
GlobalSection(SolutionConfigurationPlatforms) = preSolution
612614
Debug|Any CPU = Debug|Any CPU
@@ -1459,6 +1461,10 @@ Global
14591461
{E2EDDD17-B5E6-4240-9EF8-34F2D274AA19}.Debug|Any CPU.Build.0 = Debug|Any CPU
14601462
{E2EDDD17-B5E6-4240-9EF8-34F2D274AA19}.Release|Any CPU.ActiveCfg = Release|Any CPU
14611463
{E2EDDD17-B5E6-4240-9EF8-34F2D274AA19}.Release|Any CPU.Build.0 = Release|Any CPU
1464+
{0C0578CB-3B67-4F95-8547-206CD2A560CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1465+
{0C0578CB-3B67-4F95-8547-206CD2A560CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
1466+
{0C0578CB-3B67-4F95-8547-206CD2A560CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
1467+
{0C0578CB-3B67-4F95-8547-206CD2A560CD}.Release|Any CPU.Build.0 = Release|Any CPU
14621468
EndGlobalSection
14631469
GlobalSection(SolutionProperties) = preSolution
14641470
HideSolutionNode = FALSE
@@ -1696,6 +1702,7 @@ Global
16961702
{0F8EAB52-0C5B-4F60-92C5-42FAC21F4E77} = {C4C1E313-C7C1-4490-AECE-0DD0062380A4}
16971703
{E5BF2436-0BE7-4096-9F25-5118916F4BE4} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
16981704
{E2EDDD17-B5E6-4240-9EF8-34F2D274AA19} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
1705+
{0C0578CB-3B67-4F95-8547-206CD2A560CD} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
16991706
EndGlobalSection
17001707
GlobalSection(ExtensibilityGlobals) = postSolution
17011708
SolutionGuid = {160A1D00-1F5B-40F8-A155-621B4459D78F}
@@ -1705,6 +1712,7 @@ Global
17051712
tracer\test\test-applications\Samples.Shared\Samples.Shared.projitems*{061ab58b-8235-4dae-8d56-5f081dd78f5e}*SharedItemsImports = 5
17061713
tracer\test\test-applications\Samples.Shared\Samples.Shared.projitems*{086ff8a0-9cee-470a-9751-78b0f1340649}*SharedItemsImports = 5
17071714
tracer\test\test-applications\Samples.Shared\Samples.Shared.projitems*{0980bcdd-a231-42d1-b689-41a41bba161a}*SharedItemsImports = 5
1715+
tracer\test\test-applications\Samples.Shared\Samples.Shared.projitems*{0c0578cb-3b67-4f95-8547-206cd2a560cd}*SharedItemsImports = 5
17081716
tracer\test\test-applications\Samples.Shared\Samples.Shared.projitems*{0d996eee-7c04-4888-af48-9c1e2f261a00}*SharedItemsImports = 5
17091717
tracer\test\test-applications\Samples.Shared\Samples.Shared.projitems*{0df4363a-0df4-4882-a39f-3c9f404b8de5}*SharedItemsImports = 5
17101718
tracer\test\test-applications\Samples.Shared\Samples.Shared.projitems*{0e036453-2c80-4fc9-a517-771f0071734b}*SharedItemsImports = 5

‎docker-compose.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
localstack_arm64:
44
image: localstack/localstack
55
environment:
6-
- SERVICES=sns,sqs,kinesis,dynamodb,events
6+
- SERVICES=sns,sqs,kinesis,dynamodb,events,s3
77
- DEBUG=1
88
- DATA_DIR=/tmp/localstack/data
99
- DEFAULT_REGION=us-east-1
@@ -92,7 +92,7 @@ services:
9292
localstack:
9393
image: localstack/localstack
9494
environment:
95-
- SERVICES=sns,sqs,kinesis,dynamodb,events
95+
- SERVICES=sns,sqs,kinesis,dynamodb,events,s3
9696
- DEBUG=1
9797
- DATA_DIR=/tmp/localstack/data
9898
- DEFAULT_REGION=us-east-1
@@ -1077,7 +1077,7 @@ services:
10771077
localstack_osx_arm64:
10781078
image: localstack/localstack
10791079
environment:
1080-
- SERVICES=sns,sqs,kinesis,dynamodb,events
1080+
- SERVICES=sns,sqs,kinesis,dynamodb,events,s3
10811081
- DEBUG=1
10821082
- DATA_DIR=/tmp/localstack/data
10831083
- DEFAULT_REGION=us-east-1

‎tracer/build/PackageVersionsGeneratorDefinitions.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,24 @@
9797
}
9898
]
9999
},
100+
{
101+
"IntegrationName": "AwsS3",
102+
"SampleProjectName": "Samples.AWS.S3",
103+
"NugetPackageSearchName": "AWSSDK.S3",
104+
"MinVersion": "3.3.0",
105+
"MaxVersionExclusive": "4.0.0",
106+
"SpecificVersions": [
107+
"3.3.*",
108+
"3.5.*",
109+
"3.7.*"
110+
],
111+
"VersionConditions": [
112+
{
113+
"MaxVersionExclusive": "3.3.0",
114+
"IncludeOnlyTargetFrameworks": ["net462"]
115+
}
116+
]
117+
},
100118
{
101119
"IntegrationName": "MongoDB",
102120
"SampleProjectName": "Samples.MongoDB",

‎tracer/build/PackageVersionsLatestMajors.g.props‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,54 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
300300
<RequiresDockerDependency>All</RequiresDockerDependency>
301301
<SampleName>Samples.AWS.EventBridge</SampleName>
302302
</PackageVersionSample>
303+
<PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.S3\Samples.AWS.S3.csproj">
304+
<Properties>ApiVersion=3.7.414.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
305+
<TargetFramework>netcoreapp2.1</TargetFramework>
306+
<RequiresDockerDependency>All</RequiresDockerDependency>
307+
<SampleName>Samples.AWS.S3</SampleName>
308+
</PackageVersionSample>
309+
<PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.S3\Samples.AWS.S3.csproj">
310+
<Properties>ApiVersion=3.7.414.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
311+
<TargetFramework>netcoreapp3.0</TargetFramework>
312+
<RequiresDockerDependency>All</RequiresDockerDependency>
313+
<SampleName>Samples.AWS.S3</SampleName>
314+
</PackageVersionSample>
315+
<PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.S3\Samples.AWS.S3.csproj">
316+
<Properties>ApiVersion=3.7.414.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
317+
<TargetFramework>netcoreapp3.1</TargetFramework>
318+
<RequiresDockerDependency>All</RequiresDockerDependency>
319+
<SampleName>Samples.AWS.S3</SampleName>
320+
</PackageVersionSample>
321+
<PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.S3\Samples.AWS.S3.csproj">
322+
<Properties>ApiVersion=3.7.414.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
323+
<TargetFramework>net5.0</TargetFramework>
324+
<RequiresDockerDependency>All</RequiresDockerDependency>
325+
<SampleName>Samples.AWS.S3</SampleName>
326+
</PackageVersionSample>
327+
<PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.S3\Samples.AWS.S3.csproj">
328+
<Properties>ApiVersion=3.7.414.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
329+
<TargetFramework>net6.0</TargetFramework>
330+
<RequiresDockerDependency>All</RequiresDockerDependency>
331+
<SampleName>Samples.AWS.S3</SampleName>
332+
</PackageVersionSample>
333+
<PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.S3\Samples.AWS.S3.csproj">
334+
<Properties>ApiVersion=3.7.414.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
335+
<TargetFramework>net7.0</TargetFramework>
336+
<RequiresDockerDependency>All</RequiresDockerDependency>
337+
<SampleName>Samples.AWS.S3</SampleName>
338+
</PackageVersionSample>
339+
<PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.S3\Samples.AWS.S3.csproj">
340+
<Properties>ApiVersion=3.7.414.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
341+
<TargetFramework>net8.0</TargetFramework>
342+
<RequiresDockerDependency>All</RequiresDockerDependency>
343+
<SampleName>Samples.AWS.S3</SampleName>
344+
</PackageVersionSample>
345+
<PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.S3\Samples.AWS.S3.csproj">
346+
<Properties>ApiVersion=3.7.414.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
347+
<TargetFramework>net9.0</TargetFramework>
348+
<RequiresDockerDependency>All</RequiresDockerDependency>
349+
<SampleName>Samples.AWS.S3</SampleName>
350+
</PackageVersionSample>
303351
<PackageVersionSample Include="test\test-applications\integrations\Samples.MongoDB\Samples.MongoDB.csproj">
304352
<Properties>ApiVersion=2.30.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
305353
<TargetFramework>net462</TargetFramework>

0 commit comments

Comments
 (0)