s/TextMapPropagator/DistributedContextPropagator

Author: shirhatti

src/Hosting/Hosting/src/GenericHost/GenericWebHostBuilder.cs

@@ -87,7 +87,7 @@ public GenericWebHostBuilder(IHostBuilder builder, WebHostBuilderOptions options
                 services.TryAddSingleton(sp => new DiagnosticListener("Microsoft.AspNetCore"));
                 services.TryAddSingleton<DiagnosticSource>(sp => sp.GetRequiredService<DiagnosticListener>());
                 services.TryAddSingleton(sp => new ActivitySource("Microsoft.AspNetCore"));
-                services.TryAddSingleton(sp => TextMapPropagator.Default);
+                services.TryAddSingleton(DistributedContextPropagator.Current);
 
                 services.TryAddSingleton<IHttpContextFactory, DefaultHttpContextFactory>();
                 services.TryAddScoped<IMiddlewareFactory, MiddlewareFactory>();

src/Hosting/Hosting/src/GenericHost/GenericWebHostedService.cs

@@ -26,7 +26,7 @@ public GenericWebHostService(IOptions<GenericWebHostServiceOptions> options,
                                      ILoggerFactory loggerFactory,
                                      DiagnosticListener diagnosticListener,
                                      ActivitySource activitySource,
-                                     TextMapPropagator propagator,
+                                     DistributedContextPropagator propagator,
                                      IHttpContextFactory httpContextFactory,
                                      IApplicationBuilderFactory applicationBuilderFactory,
                                      IEnumerable<IStartupFilter> startupFilters,
@@ -54,7 +54,7 @@ public GenericWebHostService(IOptions<GenericWebHostServiceOptions> options,
         public ILogger LifetimeLogger { get; }
         public DiagnosticListener DiagnosticListener { get; }
         public ActivitySource ActivitySource { get; }
-        public TextMapPropagator Propagator { get; }
+        public DistributedContextPropagator Propagator { get; }
         public IHttpContextFactory HttpContextFactory { get; }
         public IApplicationBuilderFactory ApplicationBuilderFactory { get; }
         public IEnumerable<IStartupFilter> StartupFilters { get; }

src/Hosting/Hosting/src/Internal/HostingApplication.cs

@@ -24,7 +24,7 @@ public HostingApplication(
             ILogger logger,
             DiagnosticListener diagnosticSource,
             ActivitySource activitySource,
-            TextMapPropagator propagator,
+            DistributedContextPropagator propagator,
             IHttpContextFactory httpContextFactory)
         {
             _application = application;

src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs

@@ -28,14 +28,14 @@ internal class HostingApplicationDiagnostics
 
         private readonly ActivitySource _activitySource;
         private readonly DiagnosticListener _diagnosticListener;
-        private readonly TextMapPropagator _propagator;
+        private readonly DistributedContextPropagator _propagator;
         private readonly ILogger _logger;
 
         public HostingApplicationDiagnostics(
             ILogger logger,
             DiagnosticListener diagnosticListener,
             ActivitySource activitySource,
-            TextMapPropagator propagator)
+            DistributedContextPropagator propagator)
         {
             _logger = logger;
             _diagnosticListener = diagnosticListener;
@@ -283,21 +283,20 @@ private static void RecordRequestStartEventLog(HttpContext httpContext)
                 return null;
             }
             var headers = httpContext.Request.Headers;
-
-            _propagator.Extract(headers, static (object carrier, string fieldName, out string? value) =>
-            {
-                value = default;
-                var headers = ((IHeaderDictionary)carrier);
-                var values = headers[fieldName];
-                if (values.Count == 0)
+            _propagator.ExtractTraceIdAndState(headers,
+                static (object? carrier, string fieldName, out string? fieldValue, out IEnumerable<string>? fieldValues) =>
                 {
-                    return false;
-                }
-                value = values;
-                return true;
-            },
-
-            out string? requestId, out string? traceState);
+                    fieldValue = default;
+                    fieldValues = default;
+                    if (carrier is null)
+                    {
+                        return;
+                    }
+                    var headers = (IHeaderDictionary)carrier;
+                    fieldValue = headers[fieldName];
+                },
+                out var requestId,
+                out var traceState);
 
             if (requestId is not null)
             {
@@ -310,15 +309,19 @@ private static void RecordRequestStartEventLog(HttpContext httpContext)
 
             if (!string.IsNullOrEmpty(requestId))
             {
-                _propagator.Extract(headers, static (object carrier, string fieldName, out string? value) =>
+                var baggage = _propagator.ExtractBaggage(headers, static (object? carrier, string fieldName, out string? fieldValue, out IEnumerable<string>? fieldValues) =>
                 {
-                    var headers = ((IHeaderDictionary)carrier);
-                    value = headers[fieldName];
-                    return true;
-                }, out IEnumerable<KeyValuePair<string, string?>>? baggage);
+                    fieldValue = default;
+                    fieldValues = default;
+                    if (carrier is null)
+                    {
+                        return;
+                    }
+                    var headers = (IHeaderDictionary)carrier;
+                    fieldValue = headers[fieldName];
+                });
 
-                // AddBaggage adds items at the beginning  of the list, so we need to add them in reverse to keep the same order as the client
-                // An order could be important if baggage has two items with the same key (that is allowed by the contract)
+                // Order could be important if baggage has two items with the same key (that is allowed by the contract)
                 if (baggage is not null)
                 {
                     foreach (var baggageItem in baggage)

src/Hosting/Hosting/src/Internal/WebHost.cs

@@ -157,7 +157,7 @@ public async Task StartAsync(CancellationToken cancellationToken = default)
 
             var diagnosticSource = _applicationServices.GetRequiredService<DiagnosticListener>();
             var activitySource = _applicationServices.GetRequiredService<ActivitySource>();
-            var propagator = _applicationServices.GetRequiredService<TextMapPropagator>();
+            var propagator = _applicationServices.GetRequiredService<DistributedContextPropagator>();
             var httpContextFactory = _applicationServices.GetRequiredService<IHttpContextFactory>();
             var hostingApp = new HostingApplication(application, _logger, diagnosticSource, activitySource, propagator, httpContextFactory);
             await Server.StartAsync(hostingApp, cancellationToken).ConfigureAwait(false);

src/Hosting/Hosting/src/WebHostBuilder.cs

@@ -293,7 +293,7 @@ private IServiceCollection BuildCommonServices(out AggregateException? hostingSt
             services.TryAddSingleton(sp => new DiagnosticListener("Microsoft.AspNetCore"));
             services.TryAddSingleton<DiagnosticSource>(sp => sp.GetRequiredService<DiagnosticListener>());
             services.TryAddSingleton(sp => new ActivitySource("Microsoft.AspNetCore"));
-            services.TryAddSingleton(sp => TextMapPropagator.Default);
+            services.TryAddSingleton(DistributedContextPropagator.Current);
 
             services.AddTransient<IApplicationBuilderFactory, ApplicationBuilderFactory>();
             services.AddTransient<IHttpContextFactory, DefaultHttpContextFactory>();

src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs

@@ -552,7 +552,7 @@ private static HostingApplication CreateApplication(out FeatureCollection featur
                 logger ?? new NullScopeLogger(),
                 diagnosticListener ?? new NoopDiagnosticListener(),
                 activitySource ?? new ActivitySource("Microsoft.AspNetCore"),
-                TextMapPropagator.Default,
+                DistributedContextPropagator.CreateDefaultPropagator(),
                 httpContextFactory.Object);
 
             return hostingApplication;

src/Hosting/Hosting/test/HostingApplicationTests.cs

@@ -196,7 +196,7 @@ private static HostingApplication CreateApplication(IHttpContextFactory httpCont
                 NullLogger.Instance,
                 new DiagnosticListener("Microsoft.AspNetCore"),
                 activitySource ?? new ActivitySource("Microsoft.AspNetCore"),
-                TextMapPropagator.Default,
+                DistributedContextPropagator.CreateDefaultPropagator(),
                 httpContextFactory);
 
             return hostingApplication;