chore: fix DSM example in AWS deployment

Author: jeastham1993

mise.toml

@@ -280,3 +280,19 @@ docker compose --profile load-test run --rm load-simulator
 docker compose --profile load-test down -v
 """
 
+[tasks."aws:load-test:smoke"]
+description = "Run load tests against AWS deployment"
+dir = "e2e"
+depends = ["ui-test:install"]
+run = """
+BASE_URL=$(aws cloudformation describe-stacks \
+  --stack-name "StickerlandiaSharedResources-${ENV:-dev}" \
+  --query "Stacks[0].Outputs[?OutputKey=='BaseUrl'].OutputValue" \
+  --output text)
+DEPLOYMENT_HOST_URL=$(aws cloudformation describe-stacks \
+  --stack-name "StickerlandiaSharedResources-${ENV:-dev}" \
+  --query "Stacks[0].Outputs[?OutputKey=='BaseUrl'].OutputValue" \
+  --output text)
+echo "Running tests against: $BASE_URL"
+BASE_URL=$BASE_URL DEPLOYMENT_HOST_URL=$DEPLOYMENT_HOST_URL npx playwright test
+"""

print-service/src/Stickerlandia.PrintService.AWS/EventBridgeEventPublisher.cs

@@ -32,7 +32,7 @@ public class EventBridgeEventPublisher(
     ILogger<EventBridgeEventPublisher> logger,
     IAmazonEventBridge client,
     IOptions<AwsConfiguration> awsConfiguration,
-    DatadogTransactionTracker transactionTracker) : IPrintServiceEventPublisher
+    IDatadogTransactionTracker transactionTracker) : IPrintServiceEventPublisher
 {
     [Channel("printJobs.queued.v1")]
     [PublishOperation(typeof(PrintJobQueuedEvent))]
@@ -151,7 +151,7 @@ internal async Task PublishCloudEventAsync(CloudEvent cloudEvent)
             }
             else
             {
-                Log.GenericWarning(logger, "Failure publishing event", null);
+                Log.GenericWarning(logger, "DSM injection skipped for EventBridge: no active Datadog scope", null);
                 activity?.SetTag("dsm.injection_skipped", "no active scope");
             }
 

print-service/src/Stickerlandia.PrintService.AWS/ServiceExtensions.cs

@@ -63,7 +63,7 @@ public static IServiceCollection AddAwsAdapters(this IServiceCollection services
         services.AddSingleton<IPrintServiceEventPublisher, EventBridgeEventPublisher>();
 
         services.AddHttpClient();
-        services.AddSingleton<DatadogTransactionTracker>();
+        services.AddSingleton<IDatadogTransactionTracker, DatadogTransactionTracker>();
 
         return services;
     }

print-service/src/Stickerlandia.PrintService.Agnostic/KafkaEventPublisher.cs

@@ -7,6 +7,7 @@
 using CloudNative.CloudEvents;
 using CloudNative.CloudEvents.SystemTextJson;
 using Confluent.Kafka;
+using Datadog.Trace;
 using Microsoft.Extensions.Logging;
 using Saunter.Attributes;
 using Stickerlandia.PrintService.Core;
@@ -17,7 +18,7 @@
 
 namespace Stickerlandia.PrintService.Agnostic;
 
-public class KafkaEventPublisher(ProducerConfig config, ILogger<KafkaEventPublisher> logger, DatadogTransactionTracker transactionTracker) : IPrintServiceEventPublisher
+public class KafkaEventPublisher(ProducerConfig config, ILogger<KafkaEventPublisher> logger, IDatadogTransactionTracker transactionTracker) : IPrintServiceEventPublisher
 {
     [Channel("printJobs.queued.v1")]
     [PublishOperation(typeof(PrintJobQueuedEvent))]
@@ -127,13 +128,33 @@ private async Task Publish<T>(CloudEvent cloudEvent)
             var formatter = new JsonEventFormatter<T>();
             var data = formatter.EncodeStructuredModeMessage(cloudEvent, out _);
 
+            var message = new Message<string, string>
+            {
+                Key = cloudEvent.Id!,
+                Value = Encoding.UTF8.GetString(data.Span)
+            };
+
+            if (Tracer.Instance.ActiveScope is not null)
+            {
+                message.Headers = new Headers();
+                new SpanContextInjector().InjectIncludingDsm(
+                    message.Headers,
+                    (headers, key, value) => headers.Add(key, Encoding.UTF8.GetBytes(value)),
+                    Tracer.Instance.ActiveScope.Span.Context,
+                    "kafka",
+                    cloudEvent.Type!);
+            }
+            else
+            {
+                Log.GenericWarning(logger, "DSM injection skipped for Kafka: no active Datadog scope", null);
+                activity?.SetTag("dsm.injection_skipped", "no active scope");
+            }
+
             using var producer = new ProducerBuilder<string, string>(config).Build();
 
             try
             {
-                var deliveryReport = await producer.ProduceAsync(cloudEvent.Type,
-                    new Message<string, string> { Key = cloudEvent.Id!, Value = Encoding.UTF8.GetString(data.Span) },
-                    default);
+                var deliveryReport = await producer.ProduceAsync(cloudEvent.Type, message, default);
 
                 if (deliveryReport.Status == PersistenceStatus.PossiblyPersisted)
                 {

print-service/src/Stickerlandia.PrintService.Agnostic/ServiceExtensions.cs

@@ -124,7 +124,7 @@ public static IServiceCollection AddKafkaMessaging(this IServiceCollection servi
         services.AddSingleton(consumerConfig);
 
         services.AddHttpClient();
-        services.AddSingleton<DatadogTransactionTracker>();
+        services.AddSingleton<IDatadogTransactionTracker, DatadogTransactionTracker>();
 
         // Register event publisher as singleton
         services.AddSingleton<IPrintServiceEventPublisher, KafkaEventPublisher>();

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

@@ -132,18 +132,20 @@ private async Task ProcessJobAsync(PrintJobDto job)
     {
         _logger.LogInformation("Processing job {JobId} for sticker {StickerId}", job.PrintJobId, job.StickerId);
 
-        // Extract DSM context first so the consumer span wraps all processing work
+        // Extract DSM context and activate the Datadog scope before starting the OTel activity,
+        // so the activity is parented to the DSM-extracted context rather than the ambient poll span.
         var extractedContext = new SpanContextExtractor().ExtractIncludingDsm(
             job,
             GetHeader,
             "queue",
             "print_queue");
 
-        using var activity = PrintClientInstrumentation.StartProcessJobActivity(job);
         using var scope = Tracer.Instance.StartActive(
             "process print.job",
             new SpanCreationSettings { Parent = extractedContext });
 
+        using var activity = PrintClientInstrumentation.StartProcessJobActivity(job);
+
         await _transactionTracker.TrackTransactionAsync(job.PrintJobId, "print-received");
         var stopwatch = Stopwatch.StartNew();
 

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

@@ -36,4 +36,17 @@
     </PackageReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <_ContentIncludedByDefault Remove="print-jobs\2026-03-24\415ea02f-bc10-4ef6-89e7-2f769009f87e.json" />
+    <_ContentIncludedByDefault Remove="print-jobs\2026-03-24\506dccea-4c39-4e96-95bf-6858e30d043e.json" />
+    <_ContentIncludedByDefault Remove="print-jobs\2026-03-24\5270f1d5-9e9a-45b7-91dc-9eb65e4b23cb.json" />
+    <_ContentIncludedByDefault Remove="print-jobs\2026-03-24\6868ccee-3ddf-4c36-813a-e51c130865c3.json" />
+    <_ContentIncludedByDefault Remove="print-jobs\2026-03-24\82a74161-0eca-4fe1-a3d5-bb3fd86f2afc.json" />
+    <_ContentIncludedByDefault Remove="print-jobs\2026-03-24\c1f03d74-0c92-429f-807c-e8e86dffa326.json" />
+    <_ContentIncludedByDefault Remove="print-jobs\2026-03-24\c64e482c-9200-4406-8501-56a17bc8ac7d.json" />
+    <_ContentIncludedByDefault Remove="print-jobs\2026-03-24\c72499f4-ce72-4169-be33-7b3eb918f614.json" />
+    <_ContentIncludedByDefault Remove="print-jobs\2026-03-24\d8e56c15-6e4c-4cb6-b9e4-3a277c0725b0.json" />
+    <_ContentIncludedByDefault Remove="print-jobs\2026-03-24\e03b614b-b23d-4ebb-a747-bfdaee9f67ee.json" />
+  </ItemGroup>
+
 </Project>

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

@@ -15,9 +15,9 @@ namespace Stickerlandia.PrintService.Client.Telemetry;
 
 internal class DatadogTransactionTracker
 {
-    private readonly string _apiKey;
     private readonly string _service;
     private readonly string _environment;
+    private readonly string _ddApiKey;
     private readonly Uri _pipelineStatsEndpoint;
 
     private readonly IHttpClientFactory _httpClientFactory;
@@ -28,24 +28,17 @@ public DatadogTransactionTracker(IHttpClientFactory httpClientFactory,
         ILogger<DatadogTransactionTracker> logger)
     {
         ArgumentNullException.ThrowIfNull(configuration);
-        
+
         _httpClientFactory = httpClientFactory;
         _logger = logger;
-        _apiKey = configuration["DD_API_KEY"] ?? string.Empty;
         _service = configuration["DD_SERVICE"] ?? "print-service";
         _environment = configuration["DD_ENV"] ?? "local";
-        var ddSite = configuration["DD_SITE"] ?? "datadoghq.com";
-        _pipelineStatsEndpoint = new Uri($"https://trace.agent.{ddSite}/api/v0.1/pipeline_stats");
+        _ddApiKey = configuration["DD_API_KEY"] ?? "";
+        _pipelineStatsEndpoint = new Uri($"https://trace.agent.{configuration["DD_SITE"] ?? "datadoghq.com"}/api/v0.1/pipeline_stats");
     }
 
     internal async Task TrackTransactionAsync(string transactionId, string checkpoint)
     {
-        if (string.IsNullOrEmpty(_apiKey))
-        {
-            _logger.LogWarning("DD_API_KEY is not configured. Skipping transaction tracking for transaction {TransactionId} at checkpoint {Checkpoint}.", transactionId, checkpoint);
-            return;
-        }
-
         try
         {
             if (Activity.Current is not null)
@@ -77,10 +70,10 @@ internal async Task TrackTransactionAsync(string transactionId, string checkpoin
 
             using var client = _httpClientFactory.CreateClient();
             using var request = new HttpRequestMessage(HttpMethod.Post, _pipelineStatsEndpoint);
-            request.Headers.Add("DD-API-KEY", _apiKey);
             request.Content = new ByteArrayContent(compressed);
             request.Content.Headers.ContentType = new MediaTypeHeaderValue("application/json");
             request.Content.Headers.ContentEncoding.Add("gzip");
+            request.Content.Headers.Add("DD-API-KEY", _ddApiKey);
 
             var response = await client.SendAsync(request);
             response.EnsureSuccessStatusCode();
@@ -93,7 +86,7 @@ internal async Task TrackTransactionAsync(string transactionId, string checkpoin
         catch (Exception ex)
 #pragma warning restore CA1031
         {
-            _logger.LogWarning(ex, "Failed to track transaction {TransactionId} at checkpoint {Checkpoint}. Exception: {ExceptionMessage}", transactionId, checkpoint);
+            _logger.LogWarning(ex, "Failed to track transaction {TransactionId} at checkpoint {Checkpoint}", transactionId, checkpoint);
         }
     }
 

print-service/src/Stickerlandia.PrintService.Core/Observability/DatadogTransactionTracker.cs

@@ -13,11 +13,11 @@
 
 namespace Stickerlandia.PrintService.Core.Observability;
 
-public class DatadogTransactionTracker
+public class DatadogTransactionTracker : IDatadogTransactionTracker
 {
-    private readonly string _apiKey;
     private readonly string _service;
     private readonly string _environment;
+    private readonly string _ddApiKey;
     private readonly Uri _pipelineStatsEndpoint;
 
     private readonly IHttpClientFactory _httpClientFactory;
@@ -28,24 +28,17 @@ public DatadogTransactionTracker(IHttpClientFactory httpClientFactory,
         ILogger<DatadogTransactionTracker> logger)
     {
         ArgumentNullException.ThrowIfNull(configuration);
-        
+
         _httpClientFactory = httpClientFactory;
         _logger = logger;
-        _apiKey = configuration["DD_API_KEY"] ?? string.Empty;
         _service = configuration["DD_SERVICE"] ?? "print-service";
         _environment = configuration["DD_ENV"] ?? "local";
-        var ddSite = configuration["DD_SITE"] ?? "datadoghq.com";
-        _pipelineStatsEndpoint = new Uri($"https://trace.agent.{ddSite}/api/v0.1/pipeline_stats");
+        _ddApiKey = configuration["DD_API_KEY"] ?? "";
+        _pipelineStatsEndpoint = new Uri($"https://trace.agent.{configuration["DD_SITE"] ?? "datadoghq.com"}/api/v0.1/pipeline_stats");
     }
 
     public async Task TrackTransactionAsync(string transactionId, string checkpoint)
     {
-        if (string.IsNullOrEmpty(_apiKey))
-        {
-            Log.TransactionTrackingSkipped(_logger);
-            return;
-        }
-
         try
         {
             if (Activity.Current is not null)
@@ -77,10 +70,10 @@ public async Task TrackTransactionAsync(string transactionId, string checkpoint)
 
             using var client = _httpClientFactory.CreateClient();
             using var request = new HttpRequestMessage(HttpMethod.Post, _pipelineStatsEndpoint);
-            request.Headers.Add("DD-API-KEY", _apiKey);
             request.Content = new ByteArrayContent(compressed);
             request.Content.Headers.ContentType = new MediaTypeHeaderValue("application/json");
             request.Content.Headers.ContentEncoding.Add("gzip");
+            request.Content.Headers.Add("DD-API-KEY", _ddApiKey);
 
             var response = await client.SendAsync(request);
             response.EnsureSuccessStatusCode();

print-service/src/Stickerlandia.PrintService.Core/Observability/IDatadogTransactionTracker.cs

@@ -0,0 +1,10 @@
+// Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2026 Datadog, Inc.
+
+namespace Stickerlandia.PrintService.Core.Observability;
+
+public interface IDatadogTransactionTracker
+{
+    Task TrackTransactionAsync(string transactionId, string checkpoint);
+}