Merge branch 'dev'

aws-sdk-dotnet-automation · aws-sdk-dotnet-automation · commit 30e5da060fea · 2025-06-03T20:09:55.000Z
diff --git a/.github/workflows/aws-ci.yml b/.github/workflows/aws-ci.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 #v4
+        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df #v4
         with:
           role-to-assume: ${{ secrets.CI_MAIN_TESTING_ACCOUNT_ROLE_ARN }}
           role-duration-seconds: 7200
@@ -29,7 +29,7 @@ jobs:
           $roleArn=$(cat ./response.json)
           "roleArn=$($roleArn -replace '"', '')" >> $env:GITHUB_OUTPUT
       - name: Configure Test Runner Credentials
-        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 #v4
+        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df #v4
         with:
           role-to-assume: ${{ steps.lambda.outputs.roleArn }}
           role-duration-seconds: 7200
diff --git a/.github/workflows/change-file-in-pr.yml b/.github/workflows/change-file-in-pr.yml
@@ -12,11 +12,11 @@ jobs:
 
     steps:
       - name: Checkout PR code
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
 
       - name: Get List of Changed Files
         id: changed-files
-        uses: tj-actions/changed-files@4edd678ac3f81e2dc578756871e4d00c19191daf #v45
+        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c #v45
 
       - name: Check for Change File(s) in .autover/changes/
         run: |
diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml
@@ -25,7 +25,7 @@ jobs:
     steps:
       # Assume an AWS Role that provides access to the Access Token
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@8c3f20df09ac63af7b3ae3d7c91f105f857d8497 #v4
+        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df #v4
         with:
           role-to-assume: ${{ secrets.RELEASE_WORKFLOW_ACCESS_TOKEN_ROLE_ARN }}
           aws-region: us-west-2
diff --git a/.github/workflows/doc-site.yml b/.github/workflows/doc-site.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pinning V4 #v4.2.2
       - name: Dotnet Setup
-        uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # pinning V4 #v4.0.0
+        uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # pinning V4 #v4.3.1
         with:
           dotnet-version: 8.x
 
diff --git a/.github/workflows/semgrep-analysis.yml b/.github/workflows/semgrep-analysis.yml
@@ -35,7 +35,7 @@ jobs:
             p/owasp-top-ten
 
       - name: Upload SARIF file for GitHub Advanced Security Dashboard
-        uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 #v3.28.16 
+        uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b #v3.28.17
         with:
           sarif_file: semgrep.sarif
         if: always()
diff --git a/.github/workflows/sync-main-dev.yml b/.github/workflows/sync-main-dev.yml
@@ -27,7 +27,7 @@ jobs:
     steps:
       # Assume an AWS Role that provides access to the Access Token
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@8c3f20df09ac63af7b3ae3d7c91f105f857d8497 #v4
+        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df #v4
         with:
           role-to-assume: ${{ secrets.RELEASE_WORKFLOW_ACCESS_TOKEN_ROLE_ARN }}
           aws-region: us-west-2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Release 2025-06-03
+
+### AWS.Messaging.Telemetry.OpenTelemetry (0.23.0)
+* Updated consumer processing logic to use Links for connecting to publisher instead of parent-child relationship
+
 ## Release 2025-05-05
 
 ### AWS.Messaging (1.0.0)
diff --git a/src/AWS.Messaging.Telemetry.OpenTelemetry/AWS.Messaging.Telemetry.OpenTelemetry.csproj b/src/AWS.Messaging.Telemetry.OpenTelemetry/AWS.Messaging.Telemetry.OpenTelemetry.csproj
@@ -18,7 +18,7 @@
     <WarningsAsErrors>CA1727</WarningsAsErrors>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\public.snk</AssemblyOriginatorKeyFile>
-    <Version>0.22.0</Version>
+    <Version>0.23.0</Version>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>
diff --git a/src/AWS.Messaging.Telemetry.OpenTelemetry/OpenTelemetryProvider.cs b/src/AWS.Messaging.Telemetry.OpenTelemetry/OpenTelemetryProvider.cs
@@ -34,7 +34,7 @@ public ITelemetryTrace Trace(string traceName)
         }
 
         activity = _activitySource.StartActivity(traceName, ActivityKind.Producer, parentContext: default, links: links);
-        
+
         return new OpenTelemetryTrace(activity, parentActivity);
     }
 
@@ -44,23 +44,43 @@ public ITelemetryTrace Trace(string traceName, MessageEnvelope envelope)
         var propogatedContext = Propagators.DefaultTextMapPropagator.Extract(default, envelope, ExtractTraceContextFromEnvelope);
         Baggage.Current = propogatedContext.Baggage;
 
-        var activity = _activitySource.StartActivity(traceName, ActivityKind.Consumer, parentContext: propogatedContext.ActivityContext);
+        // Create links list for both propagated context and current activity
+        var links = new List<ActivityLink>();
+        if (propogatedContext.ActivityContext.IsValid())
+        {
+            links.Add(new ActivityLink(propogatedContext.ActivityContext));
+        }
+
+        // Create a new root activity with link to producer
+        var activity = _activitySource.StartActivity(
+            traceName,
+            ActivityKind.Consumer,
+            default(ActivityContext),
+            null,
+            links);
+
         if (activity != null)
         {
+            activity.SetStatus(ActivityStatusCode.Ok);
             return new OpenTelemetryTrace(activity);
         }
 
-        // If we initially failed to create an activity, attempt to force creation with 
-        // a link to the current activity, see https://opentelemetry.io/docs/instrumentation/net/manual/#creating-new-root-activities
+        // If we initially failed to create an activity, attempt to force creation
         var parentActivity = Activity.Current;
         Activity.Current = null;
-        ActivityLink[]? links = null;
+
+        // Add link to parent activity if it exists
         if (parentActivity != null)
         {
-            links = new[] { new ActivityLink(parentActivity.Context) };
+            links.Add(new ActivityLink(parentActivity.Context));
         }
 
-        activity = _activitySource.StartActivity(traceName, ActivityKind.Consumer, parentContext: propogatedContext.ActivityContext, links: links);
+        activity = _activitySource.StartActivity(
+            traceName,
+            ActivityKind.Consumer,
+            default(ActivityContext),
+            null,
+            links);
 
         return new OpenTelemetryTrace(activity, parentActivity);
     }
diff --git a/src/AWS.Messaging.Telemetry.OpenTelemetry/README.md b/src/AWS.Messaging.Telemetry.OpenTelemetry/README.md
@@ -43,6 +43,9 @@ public class Startup
 }
 ```
 
+### AWS X-Ray Linked Spans Configuration
+1. If you are using OTEL with X-Ray, make sure you configure your OTEL setup to use OTLP for Cloudwatch. This is needed in order to view linked spans in the AWS X-Ray console. https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-OTLPSimplesetup.html 
+
 # Useful Links
 * [AWS Message Processing Framework for .NET Design Document](../../docs/docs/design/message-processing-framework-design.md)
 * [Sample Applications](https://github.com/awslabs/aws-dotnet-messaging/tree/main/sampleapps) - contains sample applications of a publisher service, long-running subscriber service, Lambda function handlers, and using Polly to override the framework's built-in backoff logic.
diff --git a/test/AWS.Messaging.UnitTests/OpenTelemetryTests.cs b/test/AWS.Messaging.UnitTests/OpenTelemetryTests.cs
@@ -185,8 +185,8 @@ public async Task OpenTelemetry_Handler_ExpectedTracesAndTags()
     }
 
     /// <summary>
-    /// Verifies that the handler trace has the correct parent when included
-    /// in the message envelope
+    /// Verifies that the handler trace has the correct link to the trace context
+    /// included in the message envelope
     /// </summary>
     [Fact]
     public async Task OpenTelemetry_Handler_ParentFromEnvelope()
@@ -212,14 +212,20 @@ public async Task OpenTelemetry_Handler_ParentFromEnvelope()
             .ConfigureResource(resource => resource.AddService("unittest"))
             .AddInMemoryExporter(activities).Build())
         {
-
             await _handler.InvokeAsync(envelope, _subscriberMapping);
         }
 
         Assert.Single(activities);
-        Assert.Equal("AWS.Messaging: Processing message", activities[0].OperationName);
+        var activity = activities[0];
+        Assert.Equal("AWS.Messaging: Processing message", activity.OperationName);
+
+        // Verify the activity is a root activity (no parent)
+        Assert.Null(activity.ParentId);
 
-        // The MPF activity's parent should be the one specified in envelope.Metadata above
-        Assert.Equal("00-d2d8865217873923d2d74cf680a30ac3-d63e320582f9ff94-01", activities[0].ParentId);
+        // Verify the activity has exactly one link to the trace context from the envelope
+        Assert.Single(activity.Links);
+        var link = activity.Links.Single();
+        Assert.Equal("d2d8865217873923d2d74cf680a30ac3", link.Context.TraceId.ToString());
+        Assert.Equal("d63e320582f9ff94", link.Context.SpanId.ToString());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,9 @@ public class Startup`
`43`	`43`	`}`
`44`	`44`	```
`45`	`45`
	`46`	`+### AWS X-Ray Linked Spans Configuration`
	`47`	`+1. If you are using OTEL with X-Ray, make sure you configure your OTEL setup to use OTLP for Cloudwatch. This is needed in order to view linked spans in the AWS X-Ray console. https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-OTLPSimplesetup.html`
	`48`	`+`
`46`	`49`	`# Useful Links`
`47`	`50`	`* [AWS Message Processing Framework for .NET Design Document](../../docs/docs/design/message-processing-framework-design.md)`
`48`	`51`	`* [Sample Applications](https://github.com/awslabs/aws-dotnet-messaging/tree/main/sampleapps) - contains sample applications of a publisher service, long-running subscriber service, Lambda function handlers, and using Polly to override the framework's built-in backoff logic.`