Fix AWS SQS test snapshots (#4913)

* Update SQS snapshots to support latest package versions * Update tested AWS package versions
DataDog · Nov 23, 2023 · b96ed5f · b96ed5f
1 parent 6fce37c
commit b96ed5f
Show file tree

Hide file tree

Showing 17 changed files with 5,551 additions and 387 deletions.
diff --git a/tracer/build/PackageVersionsLatestMajors.g.props b/tracer/build/PackageVersionsLatestMajors.g.props
diff --git a/tracer/build/PackageVersionsLatestMinors.g.props b/tracer/build/PackageVersionsLatestMinors.g.props
diff --git a/tracer/build/PackageVersionsLatestSpecific.g.props b/tracer/build/PackageVersionsLatestSpecific.g.props
diff --git a/tracer/build/supported_versions.json b/tracer/build/supported_versions.json
@@ -210,7 +210,7 @@
         "minVersionTestedInclusive": "3.1.5.3",
         "maxVersionSupportedInclusive": "3.7.300.7",
         "maxVersionAvailableInclusive": "3.7.300.7",
-        "maxVersionTestedInclusive": "3.7.300.3"
+        "maxVersionTestedInclusive": "3.7.300.7"
       }
     ]
   },
@@ -227,7 +227,7 @@
         "minVersionTestedInclusive": "3.1.3.5",
         "maxVersionSupportedInclusive": "3.7.300.7",
         "maxVersionAvailableInclusive": "3.7.300.7",
-        "maxVersionTestedInclusive": "3.7.300.3"
+        "maxVersionTestedInclusive": "3.7.300.7"
       }
     ]
   },
@@ -278,7 +278,7 @@
         "minVersionTestedInclusive": "3.1.2.1",
         "maxVersionSupportedInclusive": "3.7.300.7",
         "maxVersionAvailableInclusive": "3.7.300.7",
-        "maxVersionTestedInclusive": "3.7.300.3"
+        "maxVersionTestedInclusive": "3.7.300.7"
       }
     ]
   },
@@ -295,7 +295,7 @@
         "minVersionTestedInclusive": "3.1.0.13",
         "maxVersionSupportedInclusive": "3.7.300.7",
         "maxVersionAvailableInclusive": "3.7.300.7",
-        "maxVersionTestedInclusive": "3.7.200.67"
+        "maxVersionTestedInclusive": "3.7.300.7"
       }
     ]
   },

diff --git a/tracer/dependabot/Datadog.Dependabot.Integrations.csproj b/tracer/dependabot/Datadog.Dependabot.Integrations.csproj
@@ -28,28 +28,28 @@
 
     <!-- Integration: AWSSDK.DynamoDBv2 -->
     <!-- Assembly: AWSSDK.DynamoDBv2 -->
-    <!-- Latest package https://www.nuget.org/packages/AWSSDK.DynamoDBv2/3.7.300.3 -->
-    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.300.3" />
+    <!-- Latest package https://www.nuget.org/packages/AWSSDK.DynamoDBv2/3.7.300.7 -->
+    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.300.7" />
 
     <!-- Integration: AWSSDK.Kinesis -->
     <!-- Assembly: AWSSDK.Kinesis -->
-    <!-- Latest package https://www.nuget.org/packages/AWSSDK.Kinesis/3.7.300.3 -->
-    <PackageReference Include="AWSSDK.Kinesis" Version="3.7.300.3" />
+    <!-- Latest package https://www.nuget.org/packages/AWSSDK.Kinesis/3.7.300.7 -->
+    <PackageReference Include="AWSSDK.Kinesis" Version="3.7.300.7" />
 
     <!-- Integration: AWSSDK.Core -->
     <!-- Assembly: AWSSDK.Core -->
-    <!-- Latest package https://www.nuget.org/packages/AWSSDK.Core/3.7.300.3 -->
-    <PackageReference Include="AWSSDK.Core" Version="3.7.300.3" />
+    <!-- Latest package https://www.nuget.org/packages/AWSSDK.Core/3.7.300.7 -->
+    <PackageReference Include="AWSSDK.Core" Version="3.7.300.7" />
 
     <!-- Integration: AWSSDK.SimpleNotificationService -->
     <!-- Assembly: AWSSDK.SimpleNotificationService -->
-    <!-- Latest package https://www.nuget.org/packages/AWSSDK.SimpleNotificationService/3.7.300.3 -->
-    <PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.300.3" />
+    <!-- Latest package https://www.nuget.org/packages/AWSSDK.SimpleNotificationService/3.7.300.7 -->
+    <PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.300.7" />
 
     <!-- Integration: AWSSDK.SQS -->
     <!-- Assembly: AWSSDK.SQS -->
-    <!-- Latest package https://www.nuget.org/packages/AWSSDK.SQS/3.7.300.3 -->
-    <PackageReference Include="AWSSDK.SQS" Version="3.7.200.67" />
+    <!-- Latest package https://www.nuget.org/packages/AWSSDK.SQS/3.7.300.7 -->
+    <PackageReference Include="AWSSDK.SQS" Version="3.7.300.7" />
 
     <!-- Integration: Azure.Messaging.ServiceBus -->
     <!-- Assembly: Azure.Messaging.ServiceBus -->

diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/AWS/AwsSqsTests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/AWS/AwsSqsTests.cs
@@ -70,7 +70,9 @@ public async Task SubmitsTraces(string packageVersion, string metadataSchemaVers
                 var host = Environment.GetEnvironmentVariable("AWS_SDK_HOST");
 
                 var settings = VerifyHelper.GetSpanVerifierSettings();
-                settings.UseFileName($"{nameof(AwsSqsTests)}.{frameworkName}.Schema{metadataSchemaVersion.ToUpper()}");
+                var suffix = GetSnapshotSuffix(packageVersion);
+
+                settings.UseFileName($"{nameof(AwsSqsTests)}.{frameworkName}.Schema{metadataSchemaVersion.ToUpper()}{suffix}");
                 settings.AddSimpleScrubber("out.host: localhost", "out.host: aws_sqs");
                 settings.AddSimpleScrubber("out.host: localstack", "out.host: aws_sqs");
                 settings.AddSimpleScrubber("out.host: localstack_arm64", "out.host: aws_sqs");
@@ -94,6 +96,14 @@ public async Task SubmitsTraces(string packageVersion, string metadataSchemaVers
                 await VerifyHelper.VerifySpans(spans, settings);
 
                 telemetry.AssertIntegrationEnabled(IntegrationId.AwsSqs);
+
+                static string GetSnapshotSuffix(string packageVersion)
+                    => packageVersion switch
+                    {
+                        null or "" => ".pre3_7_300",
+                        { } v when new Version(v) < new Version("3.7.300.6") => ".pre3_7_300",
+                        _ => string.Empty
+                    };
             }
         }
     }

diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs
@@ -27,28 +27,28 @@ public class PackageVersionsLatestMajors
                 new object[] { string.Empty },
 #else
 #if NET462
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NETCOREAPP2_1
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NETCOREAPP3_0
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NETCOREAPP3_1
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NET5_0
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NET6_0
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NET7_0
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NET8_0
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #endif
             };
@@ -61,28 +61,28 @@ public class PackageVersionsLatestMajors
                 new object[] { string.Empty },
 #else
 #if NET462
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NETCOREAPP2_1
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NETCOREAPP3_0
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NETCOREAPP3_1
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NET5_0
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NET6_0
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NET7_0
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NET8_0
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #endif
             };
@@ -111,28 +111,28 @@ public class PackageVersionsLatestMajors
                 new object[] { string.Empty },
 #else
 #if NET462
-                new object[] { "3.7.200.67" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NETCOREAPP2_1
-                new object[] { "3.7.200.67" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NETCOREAPP3_0
-                new object[] { "3.7.200.67" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NETCOREAPP3_1
-                new object[] { "3.7.200.67" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NET5_0
-                new object[] { "3.7.200.67" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NET6_0
-                new object[] { "3.7.200.67" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NET7_0
-                new object[] { "3.7.200.67" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NET8_0
-                new object[] { "3.7.200.67" },
+                new object[] { "3.7.300.7" },
 #endif
 #endif
             };
@@ -145,28 +145,28 @@ public class PackageVersionsLatestMajors
                 new object[] { string.Empty },
 #else
 #if NET462
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NETCOREAPP2_1
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NETCOREAPP3_0
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NETCOREAPP3_1
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NET5_0
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NET6_0
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NET7_0
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #if NET8_0
-                new object[] { "3.7.300.3" },
+                new object[] { "3.7.300.7" },
 #endif
 #endif
             };