feat: add additional event handlers

docker-compose.yml

@@ -379,11 +379,14 @@ services:
         condition: service_healthy
     environment:
       # DataDog APM configuration
+      DD_API_KEY: ${DD_API_KEY}
+      DD_SITE: ${DD_SITE:-datadoghq.com}
       DD_SERVICE: print-service
       DD_ENV: ${ENV:-development}
       DD_VERSION: ${COMMIT_SHA:-latest}
       DD_AGENT_HOST: datadog-agent
       DD_DATA_STREAMS_ENABLED: "true"
+      DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED: "true"
       DD_TRACE_OTEL_ENABLED: "true"
       DD_LOGS_INJECTION: "true"
       DD_RUNTIME_METRICS_ENABLED: "true"
@@ -433,11 +436,14 @@ services:
         condition: service_healthy
     environment:
       # DataDog APM configuration
+      DD_API_KEY: ${DD_API_KEY}
+      DD_SITE: ${DD_SITE:-datadoghq.com}
       DD_SERVICE: print-service
       DD_ENV: ${ENV:-development}
       DD_VERSION: ${COMMIT_SHA:-latest}
       DD_AGENT_HOST: datadog-agent
       DD_DATA_STREAMS_ENABLED: "true"
+      DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED: "true"
       DD_TRACE_OTEL_ENABLED: "true"
       DD_LOGS_INJECTION: "true"
       DD_RUNTIME_METRICS_ENABLED: "true"
@@ -474,11 +480,14 @@ services:
       - "8086:8080"
     environment:
       # DataDog APM configuration
+      DD_API_KEY: ${DD_API_KEY}
+      DD_SITE: ${DD_SITE:-datadoghq.com}
       DD_SERVICE: print-service-client
       DD_ENV: ${ENV:-development}
       DD_VERSION: ${COMMIT_SHA:-latest}
       DD_AGENT_HOST: datadog-agent
       DD_DATA_STREAMS_ENABLED: "true"
+      DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED: "true"
       DD_TRACE_OTEL_ENABLED: "true"
       DD_LOGS_INJECTION: "true"
       DD_RUNTIME_METRICS_ENABLED: "true"
@@ -538,7 +547,8 @@ services:
       DD_ENV: ${ENV:-development}
       DD_VERSION: ${COMMIT_SHA:-latest}
       DD_AGENT_HOST: datadog-agent
-      DD_DATA_STREAMS_ENABLED: true
+      DD_DATA_STREAMS_ENABLED: "true"
+      DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED: "true"
       DD_TRACE_OTEL_ENABLED: "true"
       DD_LOGS_INJECTION: "true"
       DD_RUNTIME_METRICS_ENABLED: "true"
@@ -592,7 +602,8 @@ services:
       DD_ENV: ${ENV:-development}
       DD_VERSION: ${COMMIT_SHA:-latest}
       DD_AGENT_HOST: datadog-agent
-      DD_DATA_STREAMS_ENABLED: true
+      DD_DATA_STREAMS_ENABLED: "true"
+      DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED: "true"
       DD_TRACE_OTEL_ENABLED: "true"
       DD_LOGS_INJECTION: "true"
       DD_RUNTIME_METRICS_ENABLED: "true"
@@ -716,7 +727,8 @@ services:
       DD_ENV: ${ENV:-development}
       DD_VERSION: ${COMMIT_SHA:-latest}
       DD_AGENT_HOST: datadog-agent
-      DD_DATA_STREAMS_ENABLED: true
+      DD_DATA_STREAMS_ENABLED: "true"
+      DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED: "true"
       # Server configuration
       SERVER_PORT: 8080
 
@@ -768,6 +780,7 @@ services:
   # Load testing service - runs k6 load tests against the stack
   load-simulator:
     image: grafana/k6:latest
+    restart: always
     volumes:
       - ./load-tests:/scripts
     environment:

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

@@ -9,10 +9,12 @@
 // Copyright 2025 Datadog, Inc.
 
 using System.Diagnostics;
+using System.Text.Json.Nodes;
 using Amazon.EventBridge;
 using Amazon.EventBridge.Model;
 using CloudNative.CloudEvents;
 using CloudNative.CloudEvents.SystemTextJson;
+using Datadog.Trace;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Saunter.Attributes;
@@ -29,7 +31,8 @@ namespace Stickerlandia.PrintService.AWS;
 public class EventBridgeEventPublisher(
     ILogger<EventBridgeEventPublisher> logger,
     IAmazonEventBridge client,
-    IOptions<AwsConfiguration> awsConfiguration) : IPrintServiceEventPublisher
+    IOptions<AwsConfiguration> awsConfiguration,
+    IDatadogTransactionTracker transactionTracker) : IPrintServiceEventPublisher
 {
     [Channel("printJobs.queued.v1")]
     [PublishOperation(typeof(PrintJobQueuedEvent))]
@@ -47,6 +50,7 @@ public async Task PublishPrintJobQueuedEvent(PrintJobQueuedEvent printJobQueuedE
         };
 
         await PublishCloudEventAsync(cloudEvent);
+        await transactionTracker.TrackTransactionAsync(printJobQueuedEvent.PrintJobId, "print-job-queued");
     }
 
     [Channel("printJobs.failed.v1")]
@@ -139,14 +143,26 @@ internal async Task PublishCloudEventAsync(CloudEvent cloudEvent)
             var data = formatter.EncodeStructuredModeMessage(cloudEvent, out _);
             var jsonString = System.Text.Encoding.UTF8.GetString(data.Span);
 
+            if (Tracer.Instance.ActiveScope is not null)
+            {
+                var jsonNode = JsonNode.Parse(jsonString)!;
+                new SpanContextInjector().InjectIncludingDsm(jsonNode, SetHeader, Tracer.Instance.ActiveScope.Span.Context, "eventbridge", cloudEvent.Type!);
+                jsonString = jsonNode.ToJsonString();
+            }
+            else
+            {
+                Log.GenericWarning(logger, "DSM injection skipped for EventBridge: no active Datadog scope", null);
+                activity?.SetTag("dsm.injection_skipped", "no active scope");
+            }
+
             var response = await client.PutEventsAsync(new PutEventsRequest()
             {
                 Entries = new List<PutEventsRequestEntry>(1)
                 {
                     new()
                     {
                         EventBusName = awsConfiguration.Value.EventBusName,
-                        Source = $"{Environment.GetEnvironmentVariable("ENV") ?? "dev"}.users",
+                        Source = $"{Environment.GetEnvironmentVariable("ENV") ?? "dev"}.print",
                         DetailType = cloudEvent.Type,
                         Detail = jsonString,
                     }
@@ -171,4 +187,11 @@ internal async Task PublishCloudEventAsync(CloudEvent cloudEvent)
             throw;
         }
     }
+
+    private static void SetHeader(JsonNode jsonNode, string key, string value)
+    {
+        if (jsonNode["_datadog"] == null) jsonNode["_datadog"] = new JsonObject();
+
+        jsonNode["_datadog"]![key] = value;
+    }
 }

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

@@ -16,6 +16,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Stickerlandia.PrintService.Core;
+using Stickerlandia.PrintService.Core.Observability;
 using Stickerlandia.PrintService.Core.Outbox;
 using Stickerlandia.PrintService.Core.PrintJobs;
 
@@ -61,6 +62,9 @@ public static IServiceCollection AddAwsAdapters(this IServiceCollection services
 
         services.AddSingleton<IPrintServiceEventPublisher, EventBridgeEventPublisher>();
 
+        services.AddHttpClient();
+        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) : IPrintServiceEventPublisher
+public class KafkaEventPublisher(ProducerConfig config, ILogger<KafkaEventPublisher> logger, IDatadogTransactionTracker transactionTracker) : IPrintServiceEventPublisher
 {
     [Channel("printJobs.queued.v1")]
     [PublishOperation(typeof(PrintJobQueuedEvent))]
@@ -34,7 +35,8 @@ public async Task PublishPrintJobQueuedEvent(PrintJobQueuedEvent printJobQueuedE
             Data = printJobQueuedEvent
         };
 
-        await Publish<PrinterRegisteredEvent>(cloudEvent);
+        await Publish<PrintJobQueuedEvent>(cloudEvent);
+        await transactionTracker.TrackTransactionAsync(printJobQueuedEvent.PrintJobId, "print-job-queued");
     }
 
     [Channel("printJobs.failed.v1")]
@@ -52,7 +54,7 @@ public async Task PublishPrintJobFailedEvent(PrintJobFailedEvent printJobFailedE
             Data = printJobFailedEvent
         };
 
-        await Publish<PrinterRegisteredEvent>(cloudEvent);
+        await Publish<PrintJobFailedEvent>(cloudEvent);
     }
 
     [Channel("print.printerRegistered.v1")]
@@ -126,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)
                 {