Fix ASP.NET Core Traces Instrumentation for .NET7+

CHANGELOG.md

@@ -19,6 +19,9 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
 
 ### Fixed
 
+- Fix ASP.NET Core traces instrumentation for .NET7. It is now using native
+  support by `Microsoft.AspNetCore` instead of `OpenTelemetry.Instrumentation.AspNetCore`.
+
 ## [1.3.0](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.3.0)
 
 - [Core components](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#core-components):

build/Build.Steps.cs

@@ -586,6 +586,7 @@ void RemoveFilesInNetFolderAvailableInAdditionalStore()
                     }
                     else if (folderRuntimeName == TargetFramework.NET7_0 || folderRuntimeName == TargetFramework.NET8_0)
                     {
+                        depsJson.RollFrameworkForward(TargetFramework.NET6_0, TargetFramework.NET8_0, architectureStores);
                         depsJson.RollFrameworkForward(TargetFramework.NET7_0, TargetFramework.NET8_0, architectureStores);
                     }
 

src/OpenTelemetry.AutoInstrumentation/Configurations/EnvironmentConfigurationTracerHelper.cs

@@ -168,9 +168,15 @@ public static TracerProviderBuilder AddAspNetInstrumentation(TracerProviderBuild
         public static TracerProviderBuilder AddAspNetCoreInstrumentation(TracerProviderBuilder builder, PluginManager pluginManager, LazyInstrumentationLoader lazyInstrumentationLoader)
         {
             DelayedInitialization.Traces.AddAspNetCore(lazyInstrumentationLoader, pluginManager);
-            return builder
-                .AddSource("OpenTelemetry.Instrumentation.AspNetCore")
-                .AddLegacySource("Microsoft.AspNetCore.Hosting.HttpRequestIn");
+
+            if (Environment.Version.Major == 6)
+            {
+                return builder
+                    .AddSource("OpenTelemetry.Instrumentation.AspNetCore")
+                    .AddLegacySource("Microsoft.AspNetCore.Hosting.HttpRequestIn");
+            }
+
+            return builder.AddSource("Microsoft.AspNetCore");
         }
 
         public static TracerProviderBuilder AddGraphQLInstrumentation(TracerProviderBuilder builder, PluginManager pluginManager, LazyInstrumentationLoader lazyInstrumentationLoader, TracerSettings tracerSettings)

test/IntegrationTests/HttpTests.cs

@@ -37,7 +37,11 @@ public void SubmitTraces(string propagators)
             return true;
         });
         Span? serverSpan = null;
+#if NET7_0_OR_GREATER
+        collector.Expect("Microsoft.AspNetCore", span =>
+#else
         collector.Expect("OpenTelemetry.Instrumentation.AspNetCore", span =>
+#endif
         {
             serverSpan = span;
             return true;