Move SpanContextPropagator to TracerManager

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

@@ -183,7 +183,7 @@ private void ProcessFolder(string folder, SearchOption searchOption)
                         {
                             List<Exception>? exceptions = null;
                             var remain = 3;
-                            Retry:
+                        Retry:
                             if (--remain > 0)
                             {
                                 try
@@ -305,9 +305,9 @@ private void ProcessFolder(string folder, SearchOption searchOption)
             // 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.
-            var extractedContext = SpanContextPropagator.Instance.Extract(
-                EnvironmentHelpers.GetEnvironmentVariables(),
-                new DictionaryGetterAndSetter(DictionaryGetterAndSetter.EnvironmentVariableKeyProcessor));
+            var extractedContext = Tracer.Instance.TracerManager.SpanContextPropagator.Extract(
+                            EnvironmentHelpers.GetEnvironmentVariables(),
+                            new DictionaryGetterAndSetter(DictionaryGetterAndSetter.EnvironmentVariableKeyProcessor));
 
             if (extractedContext.SpanContext is { } sessionContext)
             {

tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityReporter.cs

@@ -1,4 +1,4 @@
-// <copyright file="SecurityReporter.cs" company="Datadog">
+// <copyright file="SecurityReporter.cs" company="Datadog">
 // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License.
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
 // </copyright>
@@ -98,7 +98,7 @@ internal void AddResponseHeadersToSpanAndCleanup()
         _httpTransport.DisposeAdditiveContext();
     }
 
-    private static void AddHeaderTags(Span span, IHeadersCollection headers, Dictionary<string, string?> headersToCollect, string prefix) => SpanContextPropagator.Instance.AddHeadersToSpanAsTags(span, headers, headersToCollect, defaultTagPrefix: prefix);
+    private static void AddHeaderTags(Span span, IHeadersCollection headers, Dictionary<string, string?> headersToCollect, string prefix) => Tracer.Instance.TracerManager.SpanContextPropagator.AddHeadersToSpanAsTags(span, headers, headersToCollect, defaultTagPrefix: prefix);
 
     private static void LogMatchesIfDebugEnabled(IReadOnlyCollection<object>? results, bool blocked)
     {

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

@@ -140,7 +140,7 @@ private void OnBeginRequest(object sender, EventArgs eventArgs)
                     {
                         // extract propagated http headers
                         headers = requestHeaders.Wrap();
-                        extractedContext = SpanContextPropagator.Instance.Extract(headers.Value).MergeBaggageInto(Baggage.Current);
+                        extractedContext = tracer.TracerManager.SpanContextPropagator.Extract(headers.Value).MergeBaggageInto(Baggage.Current);
                     }
                     catch (Exception ex)
                     {
@@ -158,7 +158,7 @@ private void OnBeginRequest(object sender, EventArgs eventArgs)
                 scope.Span.DecorateWebServerSpan(resourceName: null, httpMethod, host, url, userAgent, tags);
                 if (headers is not null)
                 {
-                    SpanContextPropagator.Instance.AddHeadersToSpanAsTags(scope.Span, headers.Value, tracer.Settings.HeaderTags, defaultTagPrefix: SpanContextPropagator.HttpRequestHeadersTagPrefix);
+                    tracer.TracerManager.SpanContextPropagator.AddHeadersToSpanAsTags(scope.Span, headers.Value, tracer.Settings.HeaderTags, defaultTagPrefix: SpanContextPropagator.HttpRequestHeadersTagPrefix);
                 }
 
                 if (tracer.Settings.IpHeaderEnabled || Security.Instance.AppsecEnabled)
@@ -174,7 +174,7 @@ private void OnBeginRequest(object sender, EventArgs eventArgs)
                 if (HttpRuntime.UsingIntegratedPipeline)
                 {
                     var injectedContext = new PropagationContext(scope.Span.Context, Baggage.Current);
-                    SpanContextPropagator.Instance.Inject(injectedContext, requestHeaders.Wrap());
+                    tracer.TracerManager.SpanContextPropagator.Inject(injectedContext, requestHeaders.Wrap());
                 }
 
                 httpContext.Items[_httpContextScopeKey] = scope;

tracer/src/Datadog.Trace/Ci/TestModule.cs

@@ -130,7 +130,7 @@ internal TestModule(string name, string? framework, string? frameworkVersion, Da
 
             // Extract session variables (from out of process sessions)
             var environmentVariables = EnvironmentHelpers.GetEnvironmentVariables();
-            var context = SpanContextPropagator.Instance.Extract(
+            var context = Tracer.Instance.TracerManager.SpanContextPropagator.Extract(
                 environmentVariables, new DictionaryGetterAndSetter(DictionaryGetterAndSetter.EnvironmentVariableKeyProcessor));
 
             if (context.SpanContext is { } sessionContext)

tracer/src/Datadog.Trace/Ci/TestSession.cs

@@ -548,7 +548,7 @@ private void OnIpcMessageReceived(object message)
             [TestSuiteVisibilityTags.TestSessionWorkingDirectoryEnvironmentVariable] = tags.WorkingDirectory,
         };
 
-        SpanContextPropagator.Instance.Inject(
+        Tracer.Instance.TracerManager.SpanContextPropagator.Inject(
             new PropagationContext(span.Context, Baggage.Current),
             (IDictionary)environmentVariables,
             new DictionaryGetterAndSetter(DictionaryGetterAndSetter.EnvironmentVariableKeyProcessor));

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/EventBridge/ContextPropagation.cs

@@ -83,7 +83,7 @@ private static string BuildContextJson(PropagationContext context, string? event
             var jsonBuilder = Util.StringBuilderCache.Acquire();
             jsonBuilder.Append('{');
 
-            SpanContextPropagator.Instance.Inject(context, jsonBuilder, new StringBuilderCarrierSetter());
+            Tracer.Instance.TracerManager.SpanContextPropagator.Inject(context, jsonBuilder, new StringBuilderCarrierSetter());
 
             // Inject start time and bus name
             var startTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Kinesis/ContextPropagation.cs

@@ -69,7 +69,7 @@ public static void InjectTraceIntoData<TRecordRequest>(TRecordRequest record, Sc
 
             try
             {
-                SpanContextPropagator.Instance.Inject(context, propagatedContext, default(DictionaryGetterAndSetter));
+                Tracer.Instance.TracerManager.SpanContextPropagator.Inject(context, propagatedContext, default(DictionaryGetterAndSetter));
                 jsonData[KinesisKey] = propagatedContext;
 
                 var memoryStreamData = DictionaryToMemoryStream(jsonData);

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Lambda/LambdaCommon.cs

@@ -25,7 +25,7 @@ internal abstract class LambdaCommon
 
     internal static Scope CreatePlaceholderScope(Tracer tracer, NameValueHeadersCollection headers)
     {
-        var context = SpanContextPropagator.Instance.Extract(headers).MergeBaggageInto(Baggage.Current);
+        var context = tracer.TracerManager.SpanContextPropagator.Extract(headers).MergeBaggageInto(Baggage.Current);
 
         var span = tracer.StartSpan(
             PlaceholderOperationName,

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Shared/ContextPropagation.cs

@@ -22,7 +22,7 @@ private static void Inject(PropagationContext context, IDictionary messageAttrib
             // Consolidate headers into one JSON object with <header_name>:<value>
             var sb = Util.StringBuilderCache.Acquire();
             sb.Append('{');
-            SpanContextPropagator.Instance.Inject(context, sb, default(StringBuilderCarrierSetter));
+            Tracer.Instance.TracerManager.SpanContextPropagator.Inject(context, sb, default(StringBuilderCarrierSetter));
 
             if (context.SpanContext?.PathwayContext is { } pathwayContext)
             {

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNet/AspNetMvcIntegration.cs

@@ -137,7 +137,7 @@ internal static Scope CreateScope(ControllerContextStruct controllerContext)
                         {
                             // extract propagated http headers
                             headers = httpContext.Request.Headers.Wrap();
-                            extractedContext = SpanContextPropagator.Instance.Extract(headers.Value).MergeBaggageInto(Baggage.Current);
+                            extractedContext = tracer.TracerManager.SpanContextPropagator.Extract(headers.Value).MergeBaggageInto(Baggage.Current);
                         }
                         catch (Exception ex)
                         {
@@ -164,7 +164,7 @@ internal static Scope CreateScope(ControllerContextStruct controllerContext)
 
                     if (headers is not null)
                     {
-                        SpanContextPropagator.Instance.AddHeadersToSpanAsTags(span, headers.Value, tracer.Settings.HeaderTags, SpanContextPropagator.HttpRequestHeadersTagPrefix);
+                        tracer.TracerManager.SpanContextPropagator.AddHeadersToSpanAsTags(span, headers.Value, tracer.Settings.HeaderTags, SpanContextPropagator.HttpRequestHeadersTagPrefix);
                     }
 
                     if (tracer.Settings.IpHeaderEnabled || Security.Instance.AppsecEnabled)

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNet/AspNetWebApi2Integration.cs

@@ -58,7 +58,7 @@ internal static Scope CreateScope(IHttpControllerContext controllerContext, out
                     {
                         // extract propagated http headers
                         headersCollection = new HttpHeadersCollection(request.Headers);
-                        extractedContext = SpanContextPropagator.Instance.Extract(headersCollection.Value).MergeBaggageInto(Baggage.Current);
+                        extractedContext = tracer.TracerManager.SpanContextPropagator.Extract(headersCollection.Value).MergeBaggageInto(Baggage.Current);
                     }
                     catch (Exception ex)
                     {
@@ -101,7 +101,7 @@ internal static Scope CreateScope(IHttpControllerContext controllerContext, out
 
                 if (headersCollection is not null)
                 {
-                    SpanContextPropagator.Instance.AddHeadersToSpanAsTags(scope.Span, headersCollection.Value, tracer.Settings.HeaderTags, SpanContextPropagator.HttpRequestHeadersTagPrefix, request.Headers.UserAgent.ToString());
+                    tracer.TracerManager.SpanContextPropagator.AddHeadersToSpanAsTags(scope.Span, headersCollection.Value, tracer.Settings.HeaderTags, SpanContextPropagator.HttpRequestHeadersTagPrefix, request.Headers.UserAgent.ToString());
                 }
 
                 tags.SetAnalyticsSampleRate(IntegrationId, tracer.Settings, enabledWithGlobalSetting: true);

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/Functions/AzureFunctionsCommon.cs

@@ -296,7 +296,7 @@ internal static void OverridePropagatedContext<TTarget, TTypeData>(Tracer tracer
                 // the existing datadog headers
                 var useNullableHeaders = !string.IsNullOrEmpty(useNullableHeadersCapability);
                 var context = new PropagationContext(span.Context, Baggage.Current);
-                SpanContextPropagator.Instance.Inject(context, new RpcHttpHeadersCollection<TTarget>(typedData.Http, useNullableHeaders));
+                tracer.TracerManager.SpanContextPropagator.Inject(context, new RpcHttpHeadersCollection<TTarget>(typedData.Http, useNullableHeaders));
             }
         }
 
@@ -342,7 +342,7 @@ private static PropagationContext ExtractPropagatedContextFromHttp<T>(T context,
                     return default;
                 }
 
-                return SpanContextPropagator.Instance.Extract(new HttpHeadersCollection(httpRequest.Headers));
+                return Tracer.Instance.TracerManager.SpanContextPropagator.Extract(new HttpHeadersCollection(httpRequest.Headers));
             }
             catch (Exception ex)
             {

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Grpc/GrpcDotNet/GrpcAspNetCoreServer/GrpcDotNetServerCommon.cs

@@ -1,4 +1,4 @@
-// <copyright file="GrpcDotNetServerCommon.cs" company="Datadog">
+// <copyright file="GrpcDotNetServerCommon.cs" company="Datadog">
 // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License.
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
 // </copyright>
@@ -35,7 +35,7 @@ internal static class GrpcDotNetServerCommon
                 var tags = new GrpcServerTags();
                 GrpcCommon.AddGrpcTags(tags, tracer, method.GrpcType, name: method.Name, path: method.FullName, serviceName: method.ServiceName);
 
-                var extractedContext = ExtractPropagatedContext(requestMessage).MergeBaggageInto(Baggage.Current);
+                var extractedContext = ExtractPropagatedContext(tracer, requestMessage).MergeBaggageInto(Baggage.Current);
 
                 // If we have a local span (e.g. from aspnetcore) then use that as the parent
                 // Otherwise, use the distributed context as the parent
@@ -57,14 +57,14 @@ internal static class GrpcDotNetServerCommon
             return scope;
         }
 
-        private static PropagationContext ExtractPropagatedContext(HttpRequest request)
+        private static PropagationContext ExtractPropagatedContext(Tracer tracer, HttpRequest request)
         {
             try
             {
                 // extract propagation details from http headers
                 if (request.Headers is { } requestHeaders)
                 {
-                    return SpanContextPropagator.Instance.Extract(new HeadersCollectionAdapter(requestHeaders));
+                    return tracer.TracerManager.SpanContextPropagator.Extract(new HeadersCollectionAdapter(requestHeaders));
                 }
             }
             catch (Exception ex)

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Grpc/GrpcDotNet/GrpcNetClient/GrpcDotNetClientCommon.cs

@@ -56,7 +56,7 @@ internal static class GrpcDotNetClientCommon
                 // add distributed tracing headers to the HTTP request
                 // These will be overwritten by the HttpClient integration if that is enabled, per the RFC
                 var context = new PropagationContext(span.Context, Baggage.Current);
-                SpanContextPropagator.Instance.Inject(context, new HttpHeadersCollection(requestMessage.Headers));
+                tracer.TracerManager.SpanContextPropagator.Inject(context, new HttpHeadersCollection(requestMessage.Headers));
 
                 // Add the request metadata as tags
                 if (grpcCall.Options.Headers is { Count: > 0 })

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Grpc/GrpcLegacy/Client/GrpcLegacyClientCommon.cs

@@ -39,7 +39,7 @@ internal static class GrpcLegacyClientCommon
             {
                 // try extracting all the details we need
                 var requestMetadataWrapper = new MetadataHeadersCollection(requestMetadata);
-                var existingContext = SpanContextPropagator.Instance.Extract(requestMetadataWrapper);
+                var existingContext = tracer.TracerManager.SpanContextPropagator.Extract(requestMetadataWrapper);
                 var existingSpanContext = existingContext.SpanContext;
 
                 // If this operation creates the trace, then we will need to re-apply the sampling priority
@@ -145,7 +145,7 @@ public static void InjectHeaders<TMethod, TCallOptions>(Tracer tracer, TMethod m
 
                 // Add the propagation headers
                 var context = new PropagationContext(span.Context, Baggage.Current);
-                SpanContextPropagator.Instance.Inject(context, collection);
+                tracer.TracerManager.SpanContextPropagator.Inject(context, collection);
             }
             catch (Exception ex)
             {

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Grpc/GrpcLegacy/Server/GrpcLegacyServerCommon.cs

@@ -1,4 +1,4 @@
-// <copyright file="GrpcLegacyServerCommon.cs" company="Datadog">
+// <copyright file="GrpcLegacyServerCommon.cs" company="Datadog">
 // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License.
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
 // </copyright>
@@ -35,7 +35,7 @@ internal class GrpcLegacyServerCommon
 
                 if (spanContext is null)
                 {
-                    var extractedContext = ExtractPropagatedContext(metadata).MergeBaggageInto(Baggage.Current);
+                    var extractedContext = ExtractPropagatedContext(tracer, metadata).MergeBaggageInto(Baggage.Current);
                     spanContext = extractedContext.SpanContext;
                 }
 
@@ -62,13 +62,13 @@ internal class GrpcLegacyServerCommon
             return scope;
         }
 
-        private static PropagationContext ExtractPropagatedContext(IMetadata? metadata)
+        private static PropagationContext ExtractPropagatedContext(Tracer tracer, IMetadata? metadata)
         {
             try
             {
                 if (metadata is not null)
                 {
-                    return SpanContextPropagator.Instance.Extract(new MetadataHeadersCollection(metadata));
+                    return tracer.TracerManager.SpanContextPropagator.Extract(new MetadataHeadersCollection(metadata));
                 }
             }
             catch (Exception ex)

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/HttpClient/HttpMessageHandlerCommon.cs

@@ -44,7 +44,7 @@ public static CallTargetState OnMethodBegin<TTarget, TRequest>(TTarget instance,
 
             // add propagation headers to the HTTP request
             var context = new PropagationContext(scope?.Span.Context, Baggage.Current);
-            SpanContextPropagator.Instance.Inject(context, new HttpHeadersCollection(headers));
+            tracer.TracerManager.SpanContextPropagator.Inject(context, new HttpHeadersCollection(headers));
 
             return scope is null ? CallTargetState.GetDefault() : new CallTargetState(scope);
         }

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/WebRequest/HttpWebRequest_BeginGetResponse_Integration.cs

@@ -65,7 +65,7 @@ internal static CallTargetState OnMethodBegin<TTarget>(TTarget instance, AsyncCa
                     // Additionally, add the request headers to a cache to indicate that distributed tracing headers were
                     // added by us, not the application
                     var context = new PropagationContext(span?.Context, Baggage.Current);
-                    SpanContextPropagator.Instance.Inject(context, request.Headers.Wrap());
+                    tracer.TracerManager.SpanContextPropagator.Inject(context, request.Headers.Wrap());
                     HeadersInjectedCache.SetInjectedHeaders(request.Headers);
                 }
             }

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/WebRequest/HttpWebRequest_EndGetResponseV9_Integration.cs

@@ -1,4 +1,4 @@
-// <copyright file="HttpWebRequest_EndGetResponseV9_Integration.cs" company="Datadog">
+// <copyright file="HttpWebRequest_EndGetResponseV9_Integration.cs" company="Datadog">
 // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License.
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
 // </copyright>
@@ -63,7 +63,7 @@ public class HttpWebRequest_EndGetResponseV9_Integration
                 // We've already propagated baggage through the HTTP headers at this point,
                 // and when this method is called this is presumably the "bottom" of the call chain,
                 // and it may have been called on an entirely different thread.
-                existingContext = SpanContextPropagator.Instance.Extract(headers);
+                existingContext = Tracer.Instance.TracerManager.SpanContextPropagator.Extract(headers);
             }
 
             var existingSpanContext = existingContext.SpanContext;

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/WebRequest/HttpWebRequest_EndGetResponse_Integration.cs

@@ -77,7 +77,7 @@ internal static CallTargetReturn<TReturn> OnMethodEnd<TTarget, TReturn>(TTarget
                     // We've already propagated baggage through the HTTP headers at this point,
                     // and when this method is called this is presumably the "bottom" of the call chain,
                     // and it may have been called on an entirely different thread.
-                    existingContext = SpanContextPropagator.Instance.Extract(headers);
+                    existingContext = Tracer.Instance.TracerManager.SpanContextPropagator.Extract(headers);
                 }
 
                 var existingSpanContext = existingContext.SpanContext;