Baggage part 1/3: change propagator signatures

tracer/src/Datadog.Trace.Coverage.collector/CoverageCollector.cs

@@ -301,13 +301,15 @@ private void ProcessFolder(string folder, SearchOption searchOption)
             _logger?.Warning($"Processed {numAssemblies} assemblies in folder: {folder}");
 
             // The following is just a best effort approach to indicate in the test session that
-            // we sucessfully instrumented all assemblies to collect code coverage.
+            // we successfully instrumented all assemblies to collect code coverage.
             // Is not part of the spec but useful for support tickets.
             // We try to extract session variables (from out of process sessions)
             // and try to send a message to the IPC server for setting the test.code_coverage.injected tag.
-            if (SpanContextPropagator.Instance.Extract(
-                    EnvironmentHelpers.GetEnvironmentVariables(),
-                    new DictionaryGetterAndSetter(DictionaryGetterAndSetter.EnvironmentVariableKeyProcessor)) is { } sessionContext)
+            var extractedContext = SpanContextPropagator.Instance.Extract(
+                EnvironmentHelpers.GetEnvironmentVariables(),
+                new DictionaryGetterAndSetter(DictionaryGetterAndSetter.EnvironmentVariableKeyProcessor));
+
+            if (extractedContext.SpanContext is { } sessionContext)
             {
                 try
                 {
@@ -323,7 +325,7 @@ private void ProcessFolder(string folder, SearchOption searchOption)
             }
             else
             {
-                _logger?.Debug($"CoverageCollector.Test session context cannot be found, skipping IPC client and sending injection tags");
+                _logger?.Debug("CoverageCollector.Test session context cannot be found, skipping IPC client and sending injection tags");
             }
         }
 

tracer/src/Datadog.Trace/AspNet/TracingHttpModule.cs

@@ -132,14 +132,15 @@ private void OnBeginRequest(object sender, EventArgs eventArgs)
                 HttpRequest httpRequest = httpContext.Request;
                 var requestHeaders = RequestDataHelper.GetHeaders(httpRequest) ?? new System.Collections.Specialized.NameValueCollection();
                 NameValueHeadersCollection? headers = null;
-                SpanContext propagatedContext = null;
+                PropagationContext extractedContext = default;
+
                 if (tracer.InternalActiveScope == null)
                 {
                     try
                     {
                         // extract propagated http headers
                         headers = requestHeaders.Wrap();
-                        propagatedContext = SpanContextPropagator.Instance.Extract(headers.Value);
+                        extractedContext = SpanContextPropagator.Instance.Extract(headers.Value).MergeBaggageInto(Baggage.Current);
                     }
                     catch (Exception ex)
                     {
@@ -152,7 +153,7 @@ private void OnBeginRequest(object sender, EventArgs eventArgs)
                 string httpMethod = httpRequest.HttpMethod.ToUpperInvariant();
                 string url = httpContext.Request.GetUrlForSpan(tracer.TracerManager.QueryStringManager);
                 var tags = new WebTags();
-                scope = tracer.StartActiveInternal(_requestOperationName, propagatedContext, tags: tags);
+                scope = tracer.StartActiveInternal(_requestOperationName, extractedContext.SpanContext, tags: tags);
                 // Leave resourceName blank for now - we'll update it in OnEndRequest
                 scope.Span.DecorateWebServerSpan(resourceName: null, httpMethod, host, url, userAgent, tags);
                 if (headers is not null)
@@ -172,7 +173,8 @@ private void OnBeginRequest(object sender, EventArgs eventArgs)
                 // (e.g. WCF being hosted in IIS)
                 if (HttpRuntime.UsingIntegratedPipeline)
                 {
-                    SpanContextPropagator.Instance.Inject(scope.Span.Context, requestHeaders.Wrap());
+                    var injectedContext = new PropagationContext(scope.Span.Context, Baggage.Current);
+                    SpanContextPropagator.Instance.Inject(injectedContext, requestHeaders.Wrap());
                 }
 
                 httpContext.Items[_httpContextScopeKey] = scope;