Support .NET 10

.github/workflows/Component.BuildTest.yml

@@ -22,7 +22,7 @@ on:
         required: false
         type: string
       tfm-list:
-        default: '[ "net462", "net8.0", "net9.0" ]'
+        default: '[ "net462", "net8.0", "net9.0", "net10.0" ]'
         required: false
         type: string
       test-case-filter:

.github/workflows/ci-Exporter.OneCollector-Integration.yml

@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ windows-latest, ubuntu-24.04 ]
-        version: [ net462, net8.0 ]
+        version: [ net462, net8.0, net10.0 ]
         exclude:
         - os: ubuntu-24.04
           version: net462

.github/workflows/ci.yml

@@ -229,7 +229,7 @@ jobs:
     with:
       project-name: OpenTelemetry.Instrumentation.AspNetCore
       code-cov-name: Instrumentation.AspNetCore
-      tfm-list: '[ "net8.0", "net9.0" ]'
+      tfm-list: '[ "net8.0", "net9.0", "net10.0" ]'
 
   build-test-instrumentation-aws:
     needs: detect-changes
@@ -241,7 +241,7 @@ jobs:
     with:
       project-name: OpenTelemetry.Instrumentation.AWS
       code-cov-name: Instrumentation.AWS
-      tfm-list: '[ "net472", "net8.0", "net9.0" ]'
+      tfm-list: '[ "net472", "net8.0", "net9.0", "net10.0" ]'
 
   build-test-instrumentation-cassandra:
     needs: detect-changes
@@ -317,7 +317,7 @@ jobs:
     with:
       project-name: OpenTelemetry.Instrumentation.EventCounters
       code-cov-name: Instrumentation.EventCounters
-      tfm-list: '[ "net8.0", "net9.0" ]'
+      tfm-list: '[ "net8.0", "net9.0", "net10.0" ]'
 
   build-test-instrumentation-grpccore:
     needs: detect-changes

.github/workflows/integration.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [net8.0]
+        version: [net8.0, net10.0]
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [net8.0]
+        version: [net8.0, net10.0]
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 

.github/workflows/verifyaotcompat.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
       matrix:
         os: [ ubuntu-24.04, windows-latest ]
-        version: [ net8.0, net9.0 ]
+        version: [ net8.0, net9.0, net10.0 ]
 
     runs-on: ${{ matrix.os }}
     steps:

Directory.Build.props

@@ -3,4 +3,8 @@
     <ArtifactsPath>$([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', 'artifacts'))</ArtifactsPath>
     <UseArtifactsOutput>true</UseArtifactsOutput>
   </PropertyGroup>
+  <!-- HACK Workaround for https://github.com/dotnet/sdk/issues/51265 -->
+  <PropertyGroup>
+    <RestoreEnablePackagePruning>false</RestoreEnablePackagePruning>
+  </PropertyGroup>
 </Project>

Directory.Packages.props

@@ -68,6 +68,10 @@
     <PackageVersion Update="Microsoft.Extensions.Configuration" Version="[9.0.0,)" />
     <PackageVersion Update="Microsoft.Extensions.Options" Version="[9.0.0,)" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
+    <PackageVersion Update="Microsoft.Extensions.Configuration" Version="[10.0.0-rc.2.25502.107,)" />
+    <PackageVersion Update="Microsoft.Extensions.Options" Version="[10.0.0-rc.2.25502.107,)" />
+  </ItemGroup>
 
   <ItemGroup Label="Production other packages">
     <PackageVersion Include="Amazon.Lambda.APIGatewayEvents" Version="[2.7.0,)" />
@@ -146,6 +150,11 @@
     <PackageVersion Update="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.10" />
     <PackageVersion Update="Microsoft.AspNetCore.SignalR.Client" Version="9.0.10" />
   </ItemGroup>
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" Label="Non-production packages, such as for examples and tests, for .NET 10">
+    <PackageVersion Update="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.0-rc.2.25502.107" />
+    <PackageVersion Update="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0-rc.2.25502.107" />
+    <PackageVersion Update="Microsoft.AspNetCore.SignalR.Client" Version="10.0.0-rc.2.25502.107" />
+  </ItemGroup>
 
 </Project>
 

build/Common.nonprod.props

@@ -21,7 +21,7 @@
 
   <PropertyGroup Label="Target frameworks used in by test projects">
     <!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
-    <SupportedNetTargets>net9.0;net8.0</SupportedNetTargets>
+    <SupportedNetTargets>net10.0;net9.0;net8.0</SupportedNetTargets>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(IsTestProject)' == 'true'">

build/docker-compose.net10.0.yml

@@ -0,0 +1,9 @@
+version: '3.7'
+
+services:
+  tests:
+    build:
+      args:
+        PUBLISH_FRAMEWORK: net10.0
+        TEST_SDK_VERSION: "10.0"
+        BUILD_SDK_VERSION: "10.0"

build/docker-compose.net8.0.yml

@@ -4,4 +4,4 @@ services:
       args:
         PUBLISH_FRAMEWORK: net8.0
         TEST_SDK_VERSION: "8.0"
-        BUILD_SDK_VERSION: "9.0"
+        BUILD_SDK_VERSION: "10.0"

build/docker-compose.net9.0.yml

@@ -4,4 +4,4 @@ services:
       args:
         PUBLISH_FRAMEWORK: net9.0
         TEST_SDK_VERSION: "9.0"
-        BUILD_SDK_VERSION: "9.0"
+        BUILD_SDK_VERSION: "10.0"

global.json

@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "rollForward": "latestFeature",
+    "rollForward": "latestMajor",
     "allowPrerelease": false,
-    "version": "9.0.306"
+    "version": "10.0.100-rc.2.25502.107"
   }
 }

opentelemetry-dotnet-contrib.sln

@@ -59,6 +59,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{824BD1DE
 		build\debug.snk = build\debug.snk
 		build\docker-compose.net8.0.yml = build\docker-compose.net8.0.yml
 		build\docker-compose.net9.0.yml = build\docker-compose.net9.0.yml
+		build\docker-compose.net10.0.yml = build\docker-compose.net10.0.yml
 		build\opentelemetry-icon-color.png = build\opentelemetry-icon-color.png
 		build\OpenTelemetryContrib.prod.ruleset = build\OpenTelemetryContrib.prod.ruleset
 		build\OpenTelemetryContrib.test.ruleset = build\OpenTelemetryContrib.test.ruleset

src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 1.13.1
 
 Released 2025-Oct-29

src/OpenTelemetry.Exporter.InfluxDB/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 1.0.0-alpha.5
 
 Released 2025-Oct-23

src/OpenTelemetry.Exporter.Instana/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 1.0.4
 
 Released 2025-Oct-23

src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 1.13.0
 
 Released 2025-Oct-24

src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj

@@ -19,11 +19,10 @@
 
   <ItemGroup>
     <PackageReference Include="OpenTelemetry" />
-    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
   <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-    <PackageReference Update="System.Text.Json" VersionOverride="[6.0.10,)" />
+    <PackageReference Include="System.Text.Json" VersionOverride="[6.0.10,)" />
   </ItemGroup>
 
   <ItemGroup>

src/OpenTelemetry.Extensions.AWS/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 1.13.0
 
 Released 2025-Oct-29

src/OpenTelemetry.Extensions.Enrichment/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 1.13.0-beta.1
 
 Released 2025-Oct-20

src/OpenTelemetry.Extensions/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 1.13.0-beta.1
 
 Released 2025-Oct-23

src/OpenTelemetry.Instrumentation.AWS/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 1.13.0
 
 Released 2025-Oct-29

src/OpenTelemetry.Instrumentation.AWSLambda/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 1.13.0
 
 Released 2025-Oct-29

src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 1.13.0
 
 Released 2025-Oct-22

src/OpenTelemetry.Instrumentation.Cassandra/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 1.0.0-beta.3
 
 Released 2025-Oct-23

src/OpenTelemetry.Instrumentation.ConfluentKafka/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 0.1.0-alpha.3
 
 Released 2025-Oct-23

src/OpenTelemetry.Instrumentation.ElasticsearchClient/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 1.13.0-beta.1
 
 Released 2025-Oct-23

src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 1.13.0-beta.2
 
 Released 2025-Nov-03

src/OpenTelemetry.Instrumentation.EventCounters/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 1.13.0-alpha.1
 
 Released 2025-Oct-23

src/OpenTelemetry.Instrumentation.GrpcCore/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 1.0.0-beta.7
 
 Released 2025-Oct-23

src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 1.13.0-beta.1
 
 Released 2025-Oct-22

src/OpenTelemetry.Instrumentation.Hangfire/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 1.13.0-beta.1
 
 Released 2025-Oct-23

src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 1.13.0
 
 Released 2025-Oct-22

src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerDiagnosticListener.cs

@@ -22,6 +22,7 @@ internal sealed class HttpHandlerDiagnosticListener : ListenerHandler
     internal static readonly AssemblyName AssemblyName = typeof(HttpHandlerDiagnosticListener).Assembly.GetName();
     internal static readonly bool IsNet7OrGreater = Environment.Version.Major >= 7;
     internal static readonly bool IsNet9OrGreater = Environment.Version.Major >= 9;
+    internal static readonly bool IsNet10OrGreater = Environment.Version.Major >= 10;
 
     // https://github.com/dotnet/runtime/blob/7d034ddbbbe1f2f40c264b323b3ed3d6b3d45e9a/src/libraries/System.Net.Http/src/System/Net/Http/DiagnosticsHandler.cs#L19
     internal static readonly string ActivitySourceName = AssemblyName.Name + ".HttpClient";
@@ -178,7 +179,8 @@ public void OnStopActivity(Activity activity, object? payload)
             var requestTaskStatus = GetRequestStatus(payload);
 
             var currentStatusCode = activity.Status;
-            if (requestTaskStatus != TaskStatus.RanToCompletion)
+
+            if (!IsNet10OrGreater && requestTaskStatus != TaskStatus.RanToCompletion)
             {
                 if (requestTaskStatus == TaskStatus.Canceled)
                 {

src/OpenTelemetry.Instrumentation.Owin/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 1.13.0-beta.1
 
 Released 2025-Oct-23

src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Add support for .NET 10.0.
+  ([#2822](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2822))
+
 ## 1.13.0-beta.1
 
 Released 2025-Oct-22