resolve PR comments

src/OpenTelemetry.Instrumentation.AspNetCore/AspNetCoreInstrumentation.cs

@@ -25,33 +25,9 @@ internal class AspNetCoreInstrumentation : IDisposable
     {
         private readonly DiagnosticSourceSubscriber diagnosticSourceSubscriber;
 
-        private readonly Func<string, object, object, bool> isEnabled = (activityName, obj1, obj2) =>
-        {
-            if (activityName.Equals("Microsoft.AspNetCore.Hosting.HttpRequestIn"))
-            {
-                return false;
-            }
-
-            return true;
-        };
-
         public AspNetCoreInstrumentation(HttpInListener httpInListener)
         {
-            // For .NET7.0 activity will be created using activitySource.
-            // https://github.com/dotnet/aspnetcore/blob/main/src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs#L327
-            // However, in case when activity creation returns null (due to sampling)
-            // the framework will fall back to creating activity anyways due to active diagnostic source listener
-            // To prevent this, isEnabled is implemented which will return false always
-            // so that the sampler's decision is respected.
-            if (HttpInListener.IsNet7OrGreater)
-            {
-                this.diagnosticSourceSubscriber = new DiagnosticSourceSubscriber(httpInListener, this.isEnabled);
-            }
-            else
-            {
-                this.diagnosticSourceSubscriber = new DiagnosticSourceSubscriber(httpInListener, null);
-            }
-
+            this.diagnosticSourceSubscriber = new DiagnosticSourceSubscriber(httpInListener, null);
             this.diagnosticSourceSubscriber.Subscribe();
         }
 

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

@@ -87,7 +87,7 @@ public override void OnStartActivity(Activity activity, object payload)
             // By this time, samplers have already run and
             // activity.IsAllDataRequested populated accordingly.
 
-            if (Sdk.SuppressInstrumentation || (IsNet7OrGreater && string.IsNullOrEmpty(activity.Source.Name)))
+            if (Sdk.SuppressInstrumentation)
             {
                 return;
             }
@@ -203,11 +203,6 @@ public override void OnStartActivity(Activity activity, object payload)
 
         public override void OnStopActivity(Activity activity, object payload)
         {
-            if (IsNet7OrGreater && string.IsNullOrEmpty(activity.Source.Name))
-            {
-                return;
-            }
-
             if (activity.IsAllDataRequested)
             {
                 _ = this.stopContextFetcher.TryFetch(payload, out HttpContext context);
@@ -275,11 +270,6 @@ public override void OnStopActivity(Activity activity, object payload)
 
         public override void OnCustom(string name, Activity activity, object payload)
         {
-            if (IsNet7OrGreater && string.IsNullOrEmpty(activity.Source.Name))
-            {
-                return;
-            }
-
             if (name == "Microsoft.AspNetCore.Mvc.BeforeAction")
             {
                 if (activity.IsAllDataRequested)
@@ -309,11 +299,6 @@ public override void OnCustom(string name, Activity activity, object payload)
 
         public override void OnException(Activity activity, object payload)
         {
-            if (IsNet7OrGreater && string.IsNullOrEmpty(activity.Source.Name))
-            {
-                return;
-            }
-
             if (activity.IsAllDataRequested)
             {
                 if (!this.stopExceptionFetcher.TryFetch(payload, out Exception exc) || exc == null)

src/OpenTelemetry.Instrumentation.AspNetCore/TracerProviderBuilderExtensions.cs

@@ -53,6 +53,9 @@ internal static TracerProviderBuilder AddAspNetCoreInstrumentation(
             this TracerProviderBuilder builder,
             AspNetCoreInstrumentation instrumentation)
         {
+            // For .NET7.0 onwards activity will be created using activitySource.
+            // https://github.com/dotnet/aspnetcore/blob/main/src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs#L327
+            // For .NET6.0 and below, we will continue to use legacy way.
             if (HttpInListener.IsNet7OrGreater)
             {
                 builder.AddSource(HttpInListener.FrameworkActivitySourceName);