check traceparent of both sampled & not sampled SQS requests

open-telemetry · Jan 1, 2025 · fc15a27 · fc15a27
1 parent 189367d
commit fc15a27
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/test/OpenTelemetry.Instrumentation.AWS.Tests/TestAWSClientInstrumentation.cs b/test/OpenTelemetry.Instrumentation.AWS.Tests/TestAWSClientInstrumentation.cs
@@ -185,16 +185,18 @@ public async Task TestDDBScanUnsuccessful()
 
     [Fact]
 #if NETFRAMEWORK
-    public void TestSQSSendMessageSuccessful()
+    public void TestSQSSendMessageSuccessfulSampled()
 #else
-    public async Task TestSQSSendMessageSuccessful()
+    public async Task TestSQSSendMessageSuccessfulSampled()
 #endif
     {
         var exportedItems = new List<Activity>();
 
         var parent = new Activity("parent").Start();
         var requestId = @"fakerequ-esti-dfak-ereq-uestidfakere";
 
+        SendMessageRequest send_msg_req;
+
         using (Sdk.CreateTracerProviderBuilder()
                    .AddXRayTraceId()
                    .SetSampler(new AlwaysOnSampler())
@@ -208,7 +210,7 @@ public async Task TestSQSSendMessageSuccessful()
             var sqs = new AmazonSQSClient(new AnonymousAWSCredentials(), RegionEndpoint.USEast1);
             var dummyResponse = "{}";
             CustomResponses.SetResponse(sqs, dummyResponse, requestId, true);
-            var send_msg_req = new SendMessageRequest
+            send_msg_req = new SendMessageRequest
             {
                 QueueUrl = "https://sqs.us-east-1.amazonaws.com/123456789/MyTestQueue",
                 MessageBody = "Hello from OT",
@@ -230,6 +232,14 @@ public async Task TestSQSSendMessageSuccessful()
 
         Assert.Equal(ActivityStatusCode.Unset, awssdk_activity.Status);
         Assert.Equal(requestId, Utils.GetTagValue(awssdk_activity, "aws.request_id"));
+
+        Assert.Equal(2, send_msg_req.MessageAttributes.Count);
+        Assert.Contains(
+            send_msg_req.MessageAttributes,
+            kv => kv.Key == "traceparent" && kv.Value.StringValue == $"00-{awssdk_activity.TraceId}-{awssdk_activity.SpanId}-01");
+        Assert.Contains(
+            send_msg_req.MessageAttributes,
+            kv => kv.Key == "Custom" && kv.Value.StringValue == "Value");
     }
 
     [Fact]
@@ -273,10 +283,11 @@ public async Task TestSQSSendMessageSuccessfulNotSampled()
         }
 
         Assert.Empty(exportedItems);
+
         Assert.Equal(2, send_msg_req.MessageAttributes.Count);
         Assert.Contains(
             send_msg_req.MessageAttributes,
-            kv => kv.Key == "traceparent" && kv.Value.StringValue.EndsWith("00", StringComparison.Ordinal));
+            kv => kv.Key == "traceparent" && kv.Value.StringValue == $"00-{parent.TraceId}-{parent.SpanId}-00");
         Assert.Contains(
             send_msg_req.MessageAttributes,
             kv => kv.Key == "Custom" && kv.Value.StringValue == "Value");