Remove ActivitySourceAdapter from AspNetCore

src/OpenTelemetry.Instrumentation.AspNetCore/AspNetCoreInstrumentation.cs

@@ -13,9 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // </copyright>
+
 using System;
 using OpenTelemetry.Instrumentation.AspNetCore.Implementation;
-using OpenTelemetry.Trace;
 
 namespace OpenTelemetry.Instrumentation.AspNetCore
 {
@@ -29,11 +29,10 @@ internal class AspNetCoreInstrumentation : IDisposable
         /// <summary>
         /// Initializes a new instance of the <see cref="AspNetCoreInstrumentation"/> class.
         /// </summary>
-        /// <param name="activitySource">ActivitySource adapter instance.</param>
         /// <param name="options">Configuration options for ASP.NET Core instrumentation.</param>
-        public AspNetCoreInstrumentation(ActivitySourceAdapter activitySource, AspNetCoreInstrumentationOptions options)
+        public AspNetCoreInstrumentation(AspNetCoreInstrumentationOptions options)
         {
-            this.diagnosticSourceSubscriber = new DiagnosticSourceSubscriber(new HttpInListener("Microsoft.AspNetCore", options, activitySource), null);
+            this.diagnosticSourceSubscriber = new DiagnosticSourceSubscriber(new HttpInListener("Microsoft.AspNetCore", options), null);
             this.diagnosticSourceSubscriber.Subscribe();
         }
 

src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs

@@ -45,14 +45,12 @@ internal class HttpInListener : ListenerHandler
         private readonly PropertyFetcher<string> beforeActionTemplateFetcher = new PropertyFetcher<string>("Template");
         private readonly bool hostingSupportsW3C;
         private readonly AspNetCoreInstrumentationOptions options;
-        private readonly ActivitySourceAdapter activitySource;
 
-        public HttpInListener(string name, AspNetCoreInstrumentationOptions options, ActivitySourceAdapter activitySource)
+        public HttpInListener(string name, AspNetCoreInstrumentationOptions options)
             : base(name)
         {
             this.hostingSupportsW3C = typeof(HttpRequest).Assembly.GetName().Version.Major >= 3;
             this.options = options ?? throw new ArgumentNullException(nameof(options));
-            this.activitySource = activitySource;
         }
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope", Justification = "The objects should not be disposed.")]
@@ -81,36 +79,37 @@ public override void OnStartActivity(Activity activity, object payload)
                 return;
             }
 
+            ActivityContext activityContext = default;
+            Activity originalActivityCurrent = Activity.Current;
+            if (activity.ParentSpanId == default)
+            {
+                Activity.Current = null;
+            }
+            else
+            {
+                activityContext = new ActivityContext(activity.TraceId, activity.ParentSpanId, activity.ActivityTraceFlags, activity.TraceStateString, true);
+            }
+
             var request = context.Request;
             var textMapPropagator = Propagators.DefaultTextMapPropagator;
             if (!this.hostingSupportsW3C || !(textMapPropagator is TraceContextPropagator))
             {
                 var ctx = textMapPropagator.Extract(default, request, HttpRequestHeaderValuesGetter);
-
-                if (ctx.ActivityContext.IsValid()
-                    && ctx.ActivityContext != new ActivityContext(activity.TraceId, activity.ParentSpanId, activity.ActivityTraceFlags, activity.TraceStateString, true))
-                {
-                    // Create a new activity with its parent set from the extracted context.
-                    // This makes the new activity as a "sibling" of the activity created by
-                    // Asp.Net Core.
-                    Activity newOne = new Activity(ActivityNameByHttpInListener);
-                    newOne.SetParentId(ctx.ActivityContext.TraceId, ctx.ActivityContext.SpanId, ctx.ActivityContext.TraceFlags);
-                    newOne.TraceStateString = ctx.ActivityContext.TraceState;
-
-                    // Starting the new activity make it the Activity.Current one.
-                    newOne.Start();
-                    activity = newOne;
-                }
-
+                activityContext = ctx.ActivityContext;
                 if (ctx.Baggage != default)
                 {
                     Baggage.Current = ctx.Baggage;
                 }
             }
 
-            this.activitySource.Start(activity, ActivityKind.Server, ActivitySource);
+            activity = ActivitySource.StartActivity(ActivityNameByHttpInListener, ActivityKind.Server, activityContext);
 
-            if (activity.IsAllDataRequested)
+            if (activity == null)
+            {
+                Activity.Current = originalActivityCurrent;
+            }
+
+            if (activity?.IsAllDataRequested ?? false)
             {
                 var path = (request.PathBase.HasValue || request.Path.HasValue) ? (request.PathBase + request.Path).ToString() : "/";
                 activity.DisplayName = path;
@@ -208,8 +207,6 @@ public override void OnStopActivity(Activity activity, object payload)
                 // the one created by the instrumentation.
                 // And retrieve it here, and set it to Current.
             }
-
-            this.activitySource.Stop(activity);
         }
 
         public override void OnCustom(string name, Activity activity, object payload)

src/OpenTelemetry.Instrumentation.AspNetCore/TracerProviderBuilderExtensions.cs

@@ -16,6 +16,7 @@
 
 using System;
 using OpenTelemetry.Instrumentation.AspNetCore;
+using OpenTelemetry.Instrumentation.AspNetCore.Implementation;
 
 namespace OpenTelemetry.Trace
 {
@@ -41,7 +42,9 @@ public static TracerProviderBuilder AddAspNetCoreInstrumentation(
 
             var aspnetCoreOptions = new AspNetCoreInstrumentationOptions();
             configureAspNetCoreInstrumentationOptions?.Invoke(aspnetCoreOptions);
-            builder.AddDiagnosticSourceInstrumentation((activitySource) => new AspNetCoreInstrumentation(activitySource, aspnetCoreOptions));
+
+            builder.AddSource(HttpInListener.ActivitySourceName);
+            builder.AddInstrumentation(() => new AspNetCoreInstrumentation(aspnetCoreOptions));
 
             return builder;
         }

test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs

@@ -171,15 +171,9 @@ public async Task SuccessfulTemplateControllerCallUsesParentContext()
             Assert.Equal(3, activityProcessor.Invocations.Count); // begin and end was called
             var activity = (Activity)activityProcessor.Invocations[2].Arguments[0];
 
-#if !NETCOREAPP2_1
-            // ASP.NET Core after 2.x is W3C aware and hence Activity created by it
-            // must be used.
-            Assert.Equal("Microsoft.AspNetCore.Hosting.HttpRequestIn", activity.OperationName);
-#else
             // ASP.NET Core before 3.x is not W3C aware and hence Activity created by it
             // is always ignored and new one is created by the Instrumentation
             Assert.Equal("ActivityCreatedByHttpInListener", activity.OperationName);
-#endif
             Assert.Equal(ActivityKind.Server, activity.Kind);
             Assert.Equal("api/Values/{id}", activity.DisplayName);
             Assert.Equal("/api/values/2", activity.GetTagValue(SpanAttributeConstants.HttpPathKey) as string);

test/OpenTelemetry.Instrumentation.AspNetCore.Tests/IncomingRequestsCollectionsIsAccordingToTheSpecTests.cs

@@ -59,15 +59,18 @@ public async Task SuccessfulTemplateControllerCallGeneratesASpan(
             bool recordException = false)
         {
             var processor = new Mock<BaseProcessor<Activity>>();
+            TracerProvider tracerProvider = null;
 
             // Arrange
             using (var client = this.factory
                 .WithWebHostBuilder(builder =>
                     builder.ConfigureTestServices((IServiceCollection services) =>
                     {
                         services.AddSingleton<CallbackMiddleware.CallbackMiddlewareImpl>(new TestCallbackMiddlewareImpl(statusCode, reasonPhrase));
-                        services.AddOpenTelemetryTracing((builder) => builder.AddAspNetCoreInstrumentation(options => options.RecordException = recordException)
-                        .AddProcessor(processor.Object));
+                        tracerProvider = Sdk.CreateTracerProviderBuilder()
+                            .AddAspNetCoreInstrumentation(options => options.RecordException = recordException)
+                            .AddProcessor(processor.Object)
+                            .Build();
                     }))
                 .CreateClient())
             {
@@ -140,6 +143,7 @@ public async Task SuccessfulTemplateControllerCallGeneratesASpan(
 
             activity.Dispose();
             processor.Object.Dispose();
+            tracerProvider?.Dispose();
         }
 
         private void ValidateTagValue(Activity activity, string attribute, string expectedValue)

test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTests.server.cs

@@ -31,7 +31,7 @@ namespace OpenTelemetry.Instrumentation.Grpc.Tests
 {
     public partial class GrpcTests : IDisposable
     {
-        private const string OperationNameHttpRequestIn = "Microsoft.AspNetCore.Hosting.HttpRequestIn";
+        private const string OperationNameHttpRequestIn = "ActivityCreatedByHttpInListener";
         private const string OperationNameGrpcOut = "Grpc.Net.Client.GrpcOut";
 
         private readonly GrpcServer<GreeterService> server;