feat: store tracecontext in additionalcontext

Author: josep-bocanegra

src/Voxel.MiddyNet.Tracing.ApiGatewayMiddleware/ApiGatewayHttpApiV2TracingMiddleware.cs

@@ -6,6 +6,7 @@ namespace Voxel.MiddyNet.Tracing.ApiGatewayMiddleware
 {
     public class ApiGatewayHttpApiV2TracingMiddleware : ILambdaMiddleware<APIGatewayHttpApiV2ProxyRequest, APIGatewayHttpApiV2ProxyResponse>
     {
+        private const string TraceContextKey = "TraceContext";
         private const string TraceParentHeaderName = "traceparent";
         private const string TraceStateHeaderName = "tracestate";
         private const string TraceIdHeaderName = "trace-id";
@@ -22,14 +23,12 @@ public Task Before(APIGatewayHttpApiV2ProxyRequest apiGatewayEvent, MiddyNetCont
 
             var traceContext = TraceContext.Handle(traceParentHeaderValue, traceStateHeaderValue);
 
+            context.AdditionalContext.Add(TraceContextKey, traceContext);
+
             context.Logger.EnrichWith(new LogProperty(TraceParentHeaderName, traceContext.TraceParent));
             context.Logger.EnrichWith(new LogProperty(TraceStateHeaderName, traceContext.TraceState));
             context.Logger.EnrichWith(new LogProperty(TraceIdHeaderName, traceContext.TraceId));
 
-            context.AdditionalContext.Add(TraceParentHeaderName, traceContext.TraceParent);
-            context.AdditionalContext.Add(TraceStateHeaderName, traceContext.TraceState);
-            context.AdditionalContext.Add(TraceIdHeaderName, traceContext.TraceId);
-
             return Task.CompletedTask;
         }
 

test/Voxel.MiddyNet.Tracing.ApiGatewayMiddleware.Tests/ApiGatewayHttpApiV2TracingMiddlewareShould.cs

@@ -4,6 +4,7 @@
 using Amazon.Lambda.Core;
 using FluentAssertions;
 using NSubstitute;
+using Voxel.MiddyNet.Tracing.Core;
 using Xunit;
 
 namespace Voxel.MiddyNet.Tracing.ApiGatewayMiddleware.Tests
@@ -16,6 +17,7 @@ public class ApiGatewayHttpApiV2TracingMiddlewareShould
         private const string TraceparentHeaderValue = "00-0af7651916cd43dd8448eb211c80319c-b9c7c989f97918e1-01";
         private const string TracestateHeaderValue = "congo=ucfJifl5GOE";
         private const string TraceIdHeaderValue = "0af7651916cd43dd8448eb211c80319c";
+        private const string TraceContextKey = "TraceContext";
 
         [Fact]
         public async Task EnrichLoggerWithTraceContext()
@@ -55,12 +57,11 @@ public async Task EnrichContextWithTraceContext()
 
             await middleware.Before(apiGatewayEvent, context);
 
-            context.AdditionalContext.Should().ContainKey(TraceparentHeaderName);
-            context.AdditionalContext[TraceparentHeaderName].Should().Be(TraceparentHeaderValue);
-            context.AdditionalContext.Should().ContainKey(TracestateHeaderName);
-            context.AdditionalContext[TracestateHeaderName].Should().Be(TracestateHeaderValue);
-            context.AdditionalContext.Should().ContainKey(TraceIdHeaderName);
-            context.AdditionalContext[TraceIdHeaderName].Should().Be(TraceIdHeaderValue);
+            context.AdditionalContext.Should().ContainKey(TraceContextKey);
+            var traceContext = context.AdditionalContext[TraceContextKey] as TraceContext;
+            traceContext.TraceParent.Should().Be(TraceparentHeaderValue);
+            traceContext.TraceState.Should().Be(TracestateHeaderValue);
+            traceContext.TraceId.Should().Be(TraceIdHeaderValue);
         }
     }
 }