Make W3C Correlation default and leverage native W3C support from new System.Diagnostics.DiagnosticSource Activity

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## Version 2.8.0-beta2
+- [Make W3C Correlation default and leverage native W3C support from Activity.](https://github.com/microsoft/ApplicationInsights-aspnetcore/pull/958)
 - [Correct names for Asp.Net Core EventCounters.](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/945)
 - [Obsolete extension methods on IWebHostBuilder in favor of AddApplicationInsights extension method on IServiceCollection.](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/919)
 - [Remove support for deprecated x-ms based correlation headers.](https://github.com/microsoft/ApplicationInsights-aspnetcore/issues/939)

src/Microsoft.ApplicationInsights.AspNetCore/DiagnosticListeners/Implementation/RequestResponseHeaders.cs

@@ -29,5 +29,14 @@ internal static class RequestResponseHeaders
         /// Correlation-Context header.
         /// </summary>
         public const string CorrelationContextHeader = "Correlation-Context";
+
+        //
+        // Summary:
+        //     W3C traceparent header name.
+        public const string TraceParentHeader = "traceparent";
+        //
+        // Summary:
+        //     W3C tracestate header name.
+        public const string TraceStateHeader = "tracestate";
     }
 }

src/Microsoft.ApplicationInsights.AspNetCore/Extensions/RequestCollectionOptions.cs

@@ -19,7 +19,7 @@ public RequestCollectionOptions()
 #else
             this.TrackExceptions = true;
 #endif
-            this.EnableW3CDistributedTracing = false;
+            this.EnableW3CDistributedTracing = true;
         }
 
         /// <summary>

src/Microsoft.ApplicationInsights.AspNetCore/Implementation/TelemetryConfigurationOptionsSetup.cs

@@ -95,7 +95,11 @@ public void Configure(TelemetryConfiguration configuration)
 
                 if (applicationInsightsServiceOptions.RequestCollectionOptions.EnableW3CDistributedTracing)
                 {
-                    this.EnableW3CHeaders(configuration);
+                    configuration.EnableW3CCorrelation = true;
+                }
+                else
+                {
+                    configuration.EnableW3CCorrelation = false;
                 }
 
                 configuration.DefaultTelemetrySink.TelemetryProcessorChainBuilder.Build();
@@ -202,10 +206,5 @@ private void DisableHeartBeatIfConfigured()
                 }
             }
         }
-
-        private void EnableW3CHeaders(TelemetryConfiguration configuration)
-        {
-            configuration.TelemetryInitializers.Add(new W3COperationCorrelationTelemetryInitializer());
-        }
     }
 }

src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj

@@ -73,14 +73,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.11.0-beta1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.11.0-beta1-build12825" />
     <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.11.0-beta1" />
     <PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.11.0-beta1" />
     <PackageReference Include="Microsoft.ApplicationInsights.WindowsServer" Version="2.11.0-beta1" />
-    <PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.11.0-beta1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.11.0-beta1-build12825" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.0.2" />           
     <PackageReference Include="System.Text.Encodings.Web" Version="4.3.1" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.5.0" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.6.0-preview7.19362.9" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' ">

src/Microsoft.ApplicationInsights.AspNetCore/RequestTrackingTelemetryModule.cs

@@ -89,6 +89,8 @@ public void Initialize(TelemetryConfiguration configuration)
 
                             this.subscriptions?.Add(DiagnosticListener.AllListeners.Subscribe(this));
 
+                            // Questionable to modify the configuration here.
+                            configuration.EnableW3CCorrelation = this.CollectionOptions.EnableW3CDistributedTracing;
                             this.isInitialized = true;
                         }
                     }

test/Microsoft.ApplicationInsights.AspNetCore.Tests/AspNetCoreMajorVersion.cs

@@ -0,0 +1,8 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.ApplicationInsights.AspNetCore.Tests
+{
+    public enum AspNetCoreMajorVersion { One, Two, Three};
+}

test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests.cs

@@ -1050,7 +1050,7 @@ public static void HeartbeatIsDisabledWithServiceOptions()
             }
 
             [Fact]
-            public static void W3CIsDisabledByDefault()
+            public static void W3CIsEnabledByDefault()
             {
                 var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/");
                 IServiceProvider serviceProvider = services.BuildServiceProvider();
@@ -1066,30 +1066,29 @@ public static void W3CIsDisabledByDefault()
                 Assert.Single(requestTracking);
                 Assert.Single(dependencyTracking);
 
-                Assert.False(requestTracking.Single().CollectionOptions.EnableW3CDistributedTracing);
-                Assert.False(dependencyTracking.Single().EnableW3CHeadersInjection);
+                Assert.True(requestTracking.Single().CollectionOptions.EnableW3CDistributedTracing);
+                Assert.True(dependencyTracking.Single().EnableW3CHeadersInjection);
             }
 
             [Fact]
-            public static void W3CIsEnabledWhenConfiguredInOptions()
+            public static void W3CIsDisabledWhenConfiguredInOptions()
             {
                 var services = CreateServicesAndAddApplicationinsightsTelemetry(null, 
                     "http://localhost:1234/v2/track/", 
-                    o => o.RequestCollectionOptions.EnableW3CDistributedTracing = true);
+                    o => o.RequestCollectionOptions.EnableW3CDistributedTracing = false);
                 IServiceProvider serviceProvider = services.BuildServiceProvider();
                 var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration();
-
-                Assert.Contains(telemetryConfiguration.TelemetryInitializers, t => t is W3COperationCorrelationTelemetryInitializer);
-
+
                 var modules = serviceProvider.GetServices<ITelemetryModule>().ToList();
 
                 var requestTracking = modules.OfType<RequestTrackingTelemetryModule>().ToList();
                 var dependencyTracking = modules.OfType<DependencyTrackingTelemetryModule>().ToList();
                 Assert.Single(requestTracking);
                 Assert.Single(dependencyTracking);
 
-                Assert.True(requestTracking.Single().CollectionOptions.EnableW3CDistributedTracing);
-                Assert.True(dependencyTracking.Single().EnableW3CHeadersInjection);
+                Assert.False(requestTracking.Single().CollectionOptions.EnableW3CDistributedTracing);
+                Assert.False(dependencyTracking.Single().EnableW3CHeadersInjection);
+                Assert.False(telemetryConfiguration.EnableW3CCorrelation);
             }
 
             private static int GetTelemetryProcessorsCountInConfiguration<T>(TelemetryConfiguration telemetryConfiguration)

test/Microsoft.ApplicationInsights.AspNetCore.Tests/Helpers/CommonMocks.cs

@@ -7,15 +7,15 @@
     public static class CommonMocks
     {
         public const string InstrumentationKey = "REQUIRED";
-        public const string InstrumentationKeyHash = "0KNjBVW77H/AWpjTEcI7AP0atNgpasSkEll22AtqaVk=";
         public const string TestApplicationId = nameof(TestApplicationId);
 
-        public static TelemetryClient MockTelemetryClient(Action<ITelemetry> onSendCallback)
+        public static TelemetryClient MockTelemetryClient(Action<ITelemetry> onSendCallback, bool isW3C = true)
         {
             return new TelemetryClient(new TelemetryConfiguration()
             {
                 InstrumentationKey = InstrumentationKey,
-                TelemetryChannel = new FakeTelemetryChannel { OnSend = onSendCallback }
+                TelemetryChannel = new FakeTelemetryChannel { OnSend = onSendCallback },
+                EnableW3CCorrelation = isW3C
             });
         }