fix: address PR review feedback on event workers and tracker duplication

- SqsStickerPrintedWorker: unwrap EventBridge envelope before deserializing
  (was deserializing message.Body directly as StickerPrintedEventV1, missing
  the CloudWatchEvent<JsonElement> outer envelope; mirrored StickerPrintedSqsHandler)
- ServiceBusStickerPrintedWorker: add return after DeadLetterMessageAsync calls
  so CompleteMessageAsync is never called on an already-settled message
- PrintService.Client: remove duplicate DatadogTransactionTracker; reference
  Core implementation via IDatadogTransactionTracker instead

Author: jeastham1993

print-service/src/Stickerlandia.PrintService.Client/Program.cs

@@ -15,6 +15,7 @@
 using Stickerlandia.PrintService.Client.Configuration;
 using Stickerlandia.PrintService.Client.Services;
 using Stickerlandia.PrintService.Client.Telemetry;
+using CoreObs = Stickerlandia.PrintService.Core.Observability;
 
 var builder = WebApplication.CreateBuilder(args);
 builder.Configuration.AddEnvironmentVariables();
@@ -77,7 +78,7 @@
 builder.Services.AddRazorComponents()
     .AddInteractiveServerComponents();
 
-builder.Services.AddSingleton<DatadogTransactionTracker>();
+builder.Services.AddSingleton<CoreObs.IDatadogTransactionTracker, CoreObs.DatadogTransactionTracker>();
 // Add configuration service (singleton - shared across app)
 builder.Services.AddSingleton<IConfigurationService, ConfigurationService>();
 

print-service/src/Stickerlandia.PrintService.Client/Services/PrintJobPollingService.cs

@@ -11,6 +11,7 @@
 using Stickerlandia.PrintService.Client.Configuration;
 using Stickerlandia.PrintService.Client.Models;
 using Stickerlandia.PrintService.Client.Telemetry;
+using CoreObs = Stickerlandia.PrintService.Core.Observability;
 
 namespace Stickerlandia.PrintService.Client.Services;
 
@@ -25,15 +26,15 @@ internal sealed class PrintJobPollingService : BackgroundService
     private readonly ClientStatusService _statusService;
     private readonly PrintClientInstrumentation _instrumentation;
     private readonly ILogger<PrintJobPollingService> _logger;
-    private readonly DatadogTransactionTracker _transactionTracker;
+    private readonly CoreObs.IDatadogTransactionTracker _transactionTracker;
 
     public PrintJobPollingService(
         IPrintServiceApiClient apiClient,
         ILocalStorageService localStorage,
         IConfigurationService configService,
         ClientStatusService statusService,
         PrintClientInstrumentation instrumentation,
-        ILogger<PrintJobPollingService> logger, DatadogTransactionTracker transactionTracker)
+        ILogger<PrintJobPollingService> logger, CoreObs.IDatadogTransactionTracker transactionTracker)
     {
         _apiClient = apiClient;
         _localStorage = localStorage;

print-service/src/Stickerlandia.PrintService.Client/Stickerlandia.PrintService.Client.csproj

@@ -7,6 +7,10 @@
     <BlazorDisableThrowNavigationException>true</BlazorDisableThrowNavigationException>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Stickerlandia.PrintService.Core\Stickerlandia.PrintService.Core.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <InternalsVisibleTo Include="Stickerlandia.PrintService.Client.Tests" />
     <!-- Required for FakeItEasy to mock internal types -->

print-service/src/Stickerlandia.PrintService.Client/Telemetry/DatadogTransactionTracker.cs

@@ -9,8 +9,11 @@
 // Copyright 2025 Datadog, Inc.
 
 using System.Text.Json;
+using Amazon.Lambda.CloudWatchEvents;
 using Amazon.SQS;
 using Amazon.SQS.Model;
+using CloudNative.CloudEvents;
+using CloudNative.CloudEvents.SystemTextJson;
 using Datadog.Trace;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -19,7 +22,6 @@
 using Stickerlandia.UserManagement.Core;
 using Stickerlandia.UserManagement.Core.Observability;
 using Stickerlandia.UserManagement.Core.StickerPrintedEvent;
-using Stickerlandia.UserManagement.Core.StickerPrintedEvent;
 
 namespace Stickerlandia.UserManagement.AWS;
 
@@ -30,6 +32,7 @@ public class SqsStickerPrintedWorker : IMessagingWorker
     private readonly ILogger<SqsStickerPrintedWorker> _logger;
     private readonly AmazonSQSClient _sqsClient;
     private readonly IOptions<AwsConfiguration> _awsConfiguration;
+    private readonly JsonSerializerOptions _jsonSerializerOptions = new() { PropertyNameCaseInsensitive = true };
 
     public SqsStickerPrintedWorker(ILogger<SqsStickerPrintedWorker> logger,
         AmazonSQSClient sqsClient, IServiceScopeFactory serviceScopeFactory,
@@ -62,7 +65,20 @@ private async Task ProcessMessageAsync(Message message)
         using var scope = _serviceScopeFactory.CreateScope();
         var handler = scope.ServiceProvider.GetRequiredService<StickerPrintedHandler>();
 
-        var evtData = JsonSerializer.Deserialize<StickerPrintedEventV1>(message.Body);
+        var envelope = JsonSerializer.Deserialize<CloudWatchEvent<JsonElement>>(message.Body, _jsonSerializerOptions);
+
+        if (envelope == null)
+        {
+            await _sqsClient.SendMessageAsync(_awsConfiguration.Value.StickerPrintedDLQUrl, message.Body);
+            await _sqsClient.DeleteMessageAsync(_awsConfiguration.Value.StickerPrintedQueueUrl, message.ReceiptHandle);
+            return;
+        }
+
+        var detailBytes = JsonSerializer.SerializeToUtf8Bytes(envelope.Detail, _jsonSerializerOptions);
+        var formatter = new JsonEventFormatter<StickerPrintedEventV1>();
+        var cloudEvent = await formatter.DecodeStructuredModeMessageAsync(
+            new MemoryStream(detailBytes), null, new List<CloudEventAttribute>());
+        var evtData = (StickerPrintedEventV1?)cloudEvent.Data;
 
         if (evtData == null)
         {
@@ -71,10 +87,9 @@ private async Task ProcessMessageAsync(Message message)
             return;
         }
 
-        // Process your message here
         try
         {
-            await handler.Handle(evtData!);
+            await handler.Handle(evtData);
         }
         catch (InvalidUserException ex)
         {

user-management/src/Stickerlandia.UserManagement.AWS/SqsStickerPrintedWorker.cs

@@ -8,6 +8,7 @@
 
     <ItemGroup>
       <PackageReference Include="Amazon.Lambda.Annotations" Version="1.8.0" />
+      <PackageReference Include="Amazon.Lambda.CloudWatchEvents" Version="4.4.0" />
       <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
       <PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
       <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />

user-management/src/Stickerlandia.UserManagement.AWS/Stickerlandia.UserManagement.AWS.csproj

@@ -80,8 +80,12 @@ private async Task ProcessMessageAsync(ProcessMessageEventArgs args)
             stickerPrinted = JsonSerializer.Deserialize<StickerPrintedEventV1>(messageBody);
         }
 
-        if (stickerPrinted == null) await args.DeadLetterMessageAsync(args.Message, "Message body cannot be deserialized");
-        
+        if (stickerPrinted == null)
+        {
+            await args.DeadLetterMessageAsync(args.Message, "Message body cannot be deserialized");
+            return;
+        }
+
         try
         {
             await handler.Handle(stickerPrinted!);
@@ -90,6 +94,7 @@ private async Task ProcessMessageAsync(ProcessMessageEventArgs args)
         {
             Log.InvalidUser(_logger, ex);
             await args.DeadLetterMessageAsync(args.Message, "Invalid account id");
+            return;
         }
 
         // Complete the message