.NET9 support (#3796)

* Typo fix * Update End OF Support validation rule * Update Min Supported framework rule * Update code space * CHANGELOG * Update developing documentation * Update documentation * Use .NET9 in build pipeline drops .NET7 and .NET6 * Bump LangVersion to 13 * Update SDK Version analyzer * Compile against .NET9 drops .NET6 and .NET7 * Adjust nuke build * Fix build tests * Update examples documentation * Cleanup net6 references in project files * Fix tests * Cleanup target frameworks for generated tests targets * Adjust conditional compilation * Remove legacy code from LogBuilderExtensions * Fix dev comment * Adjust CI to execute scripts tests against .net9 * revert demo target versions. It should be fixed just after next release * Centos Stream9 - install .NET9 * Fix LoggingBuilder integration for version 9.* * drop debugger launch * cleanup using * sync versions in the comments * DuckTyping - include GH item in TODO comment * TransientDependenciesTests - update comment
open-telemetry · Nov 21, 2024 · e205769 · e205769
1 parent 5c98a61
commit e205769
Show file tree

Hide file tree

Showing 157 changed files with 463 additions and 731 deletions.
diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
@@ -43,10 +43,10 @@ jobs:
         docker build -t mybuildimage -f "./docker/${{ matrix.base-image }}.dockerfile" ./docker
         docker run --mount type=bind,source="${GITHUB_WORKSPACE}",target=/project --rm mybuildimage /bin/sh -c '
           set -e
-          dotnet publish -f net8.0 -c Release ./test/test-applications/integrations/TestApplication.Smoke
+          dotnet publish -f net9.0 -c Release ./test/test-applications/integrations/TestApplication.Smoke
           export OTEL_DOTNET_AUTO_HOME="${PWD}/bin/tracer-home"
           . ./instrument.sh
-          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net8.0/publish/TestApplication.Smoke
+          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net9.0/publish/TestApplication.Smoke
             test "$(ls -A /var/log/opentelemetry/dotnet )"
         '
 

diff --git a/.github/workflows/build-nuget-packages.yml b/.github/workflows/build-nuget-packages.yml
@@ -31,9 +31,8 @@ jobs:
         uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # tag: v4.1.0
         with:
           dotnet-version: | 
-            6.0.427
-            7.0.410
-            8.0.403
+            8.0.404
+            9.0.100
 
       - name: Check for NuGet packages cache
         uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # tag: v4.1.2

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -42,9 +42,8 @@ jobs:
         uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # tag: v4.1.0
         with:
           dotnet-version: | 
-            6.0.427
-            7.0.410
-            8.0.403
+            8.0.404
+            9.0.100
 
       - name: Check for NuGet packages cache
         uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # tag: v4.1.2
@@ -102,10 +101,10 @@ jobs:
         shell: bash
         run: |
           set -e
-          dotnet publish -f net8.0 -c Release ./test/test-applications/integrations/TestApplication.Smoke
+          dotnet publish -f net9.0 -c Release ./test/test-applications/integrations/TestApplication.Smoke
           export OTEL_DOTNET_AUTO_HOME="${PWD}/bin/tracer-home"
           . ./instrument.sh
-          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net8.0/publish/TestApplication.Smoke
+          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net9.0/publish/TestApplication.Smoke
             test "$(ls -A '${{ matrix.log-dir }}' )"
 
       - name: Test the Windows PowerShell module instructions from README.md
@@ -116,12 +115,12 @@ jobs:
           Import-Module "${PWD}/bin/installation-scripts/OpenTelemetry.DotNet.Auto.psm1"
           [System.Environment]::SetEnvironmentVariable("OTEL_DOTNET_AUTO_INSTALL_DIR", "${PWD}/bin/tracer-home", [System.EnvironmentVariableTarget]::Machine)
           Register-OpenTelemetryForCurrentSession -OTelServiceName "MyServiceDisplayName"
-          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net8.0/TestApplication.Smoke.exe
+          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net9.0/TestApplication.Smoke.exe
           if (-not $?) { throw "dotnet help returned exit code: $LASTEXITCODE" }
           if (-not (Test-Path $log_path)) { throw "Log file does not exist. Instrumentation test failed." }
           Remove-Item $log_path
           Unregister-OpenTelemetryForCurrentSession
-          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net8.0/TestApplication.Smoke.exe
+          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net9.0/TestApplication.Smoke.exe
           if (-not $?) { throw "dotnet help returned exit code: $LASTEXITCODE" }
           if (Test-Path $log_path) { throw "Log file exists. Instrumentation unregister failed." }
 

diff --git a/.github/workflows/check-sdk-versions.yml b/.github/workflows/check-sdk-versions.yml
@@ -15,10 +15,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag: v4.2.2
 
-      - name: Setup .NET 8
+      - name: Setup .NET
         uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # tag: v4.1.0
         with:
-          dotnet-version: 8.0.403
+          dotnet-version: 9.0.100
 
       - name: Run VerifySdkVersions
         run: ./build.cmd VerifySdkVersions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test-tfm: [ net8.0, net7.0, net6.0, net462 ]
+        test-tfm: [ net9.0, net8.0, net462 ]
         machine: [ windows-2022, ubuntu-20.04, macos-13, otel-linux-arm64 ]
         exclude:
           - test-tfm: net462
@@ -66,9 +66,8 @@ jobs:
         uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # tag: v4.1.0
         with:
           dotnet-version: | 
-            6.0.427
-            7.0.410
-            8.0.403
+            8.0.404
+            9.0.100
 
       - name: Check for NuGet packages cache
         uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # tag: v4.1.2
@@ -131,9 +130,8 @@ jobs:
         uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # tag: v4.1.0
         with:
           dotnet-version: | 
-            6.0.427
-            7.0.410
-            8.0.403
+            8.0.404
+            9.0.100
 
       - name: Check for NuGet packages cache
         uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # tag: v4.1.2
@@ -171,9 +169,8 @@ jobs:
         uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # tag: v4.1.0
         with:
           dotnet-version: | 
-            6.0.427
-            7.0.410
-            8.0.403
+            8.0.404
+            9.0.100
 
       - name: Check for NuGet packages cache
         uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # tag: v4.1.2
@@ -276,9 +273,8 @@ jobs:
         uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # tag: v4.1.0
         with:
           dotnet-version: | 
-            6.0.427
-            7.0.410
-            8.0.403
+            8.0.404
+            9.0.100
 
       - name: Check for NuGet packages cache
         uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # tag: v4.1.2

diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml
@@ -22,10 +22,10 @@ jobs:
     - name: Checkout
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag: v4.2.2
 
-    - name: Setup .NET 8
+    - name: Setup .NET
       uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # tag: v4.1.0
       with:
-        dotnet-version: 8.0.403
+        dotnet-version: 9.0.100
 
     - name: dotnet format
       run: dotnet format .\OpenTelemetry.AutoInstrumentation.sln --no-restore --verify-no-changes
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
@@ -13,17 +13,16 @@ jobs:
         uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # tag: v4.1.0
         with:
           dotnet-version: | 
-            6.0.427
-            7.0.410
-            8.0.403
+            8.0.404
+            9.0.100
             
       - name: Test the PowerShell module instructions from README.md
         shell: powershell
         run: |
           mkdir testapp
           cd testapp
           dotnet new console
-          dotnet publish -f net8.0 -c Release
+          dotnet publish -f net9.0 -c Release
           $module_url = "https://github.com/${{ github.repository }}/releases/download/${{ github.event.release.tag_name }}/OpenTelemetry.DotNet.Auto.psm1"
           $dl_path = Join-Path $env:temp "OpenTelemetry.DotNet.Auto.psm1"
           $log_path = "C:\ProgramData\OpenTelemetry .NET AutoInstrumentation\logs\*"
@@ -32,12 +31,12 @@ jobs:
           Install-OpenTelemetryCore
           $install_dir = Get-OpenTelemetryInstallDirectory
           Register-OpenTelemetryForCurrentSession -OTelServiceName "MyServiceDisplayName"
-          ./bin/Release/net8.0/publish/testapp
+          ./bin/Release/net9.0/publish/testapp
           if (-not $?) { throw "dotnet help returned exit code: $LASTEXITCODE" }
           if (-not (Test-Path $log_path)) { throw "Log file does not exist. Instrumentation test failed." }
           Remove-Item $log_path
           Unregister-OpenTelemetryForCurrentSession
-          ./bin/Release/net8.0/publish/testapp
+          ./bin/Release/net9.0/publish/testapp
           if (-not $?) { throw "dotnet help returned exit code: $LASTEXITCODE" }
           if (Test-Path $log_path) { throw "Log file exists. Instrumentation unregister failed." }
           Uninstall-OpenTelemetryCore
@@ -68,9 +67,8 @@ jobs:
         uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # tag: v4.1.0
         with:
           dotnet-version: | 
-            6.0.427
-            7.0.410
-            8.0.403
+            8.0.404
+            9.0.100
 
       - name: Install MacOS CoreUtils
         if: ${{ runner.os == 'macOS' }}
@@ -87,13 +85,13 @@ jobs:
           mkdir testapp
           cd testapp
           dotnet new console
-          dotnet publish -f net8.0 -c Release
+          dotnet publish -f net9.0 -c Release
           curl -sSfL https://github.com/${{ github.repository }}/releases/download/${{ github.event.release.tag_name }}/otel-dotnet-auto-install.sh -O
           sh ./otel-dotnet-auto-install.sh
             test "$(ls -A "$HOME/.otel-dotnet-auto")"
           curl -sSfL https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/instrument.sh -O
           . ./instrument.sh
-          ./bin/Release/net8.0/publish/testapp
+          ./bin/Release/net9.0/publish/testapp
             test "$(ls -A '${{ matrix.log-dir }}' )"
 
   shell-scripts-container:

diff --git a/.github/workflows/verify-test.yml b/.github/workflows/verify-test.yml
@@ -41,9 +41,8 @@ jobs:
         uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # tag: v4.1.0
         with:
           dotnet-version: | 
-            6.0.427
-            7.0.410
-            8.0.403
+            8.0.404
+            9.0.100
 
       - name: Run BuildTracer and ManagedTests
         run: ./build.cmd BuildTracer ManagedTests --containers ${{ matrix.containers }} --test-project "${{ github.event.inputs.testProject }}" --test-name '"${{ github.event.inputs.testName }}"' --test-count ${{ github.event.inputs.count }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
 
 ### Added
 
+- Support for .NET9.
 - Support for [RabbitMQ.Client](https://www.nuget.org/packages/RabbitMQ.Client/)
   traces instrumentation for versions `7.0.0`+.
 
@@ -20,6 +21,7 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
 
 ### Removed
 
+- Support for .NET 6 and .NET 7. Both framework reached end of support.
 - Support for macOS Monterey 12 x64.
   macOs libraries are built and tested against [macOS Ventura 13 x64](https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md).
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,6 +4,6 @@
   <PropertyGroup>
     <IsPackable>false</IsPackable>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>13.0</LangVersion>
   </PropertyGroup>
 </Project>
diff --git a/build/Build.NuGet.Steps.cs b/build/Build.NuGet.Steps.cs
@@ -150,28 +150,13 @@ partial class Build
         .Description("Builds the TestApplications.* used by the NuGetPackagesTests")
         .Executes(() =>
         {
-            string MapToNet8RuntimeIdentifiers(string oldRuntimeIdentifier)
-            {
-#if NET8_0_OR_GREATER
-                return oldRuntimeIdentifier;
-#else
-                switch (oldRuntimeIdentifier)
-                {
-                    case "ubuntu.20.04-x64": return "linux-x64";
-                    case "osx.11.0-x64": return "osx-x64";
-                    case "win10-x64": return "win-x64";
-                }
-                throw new NotSupportedException($"{oldRuntimeIdentifier} is not supported. Extend MapToNet8RuntimeIdentifiers.");
-#endif
-            }
-
             foreach (var packagesTestApplicationProject in Solution.GetNuGetPackagesTestApplications())
             {
                 // Unlike the integration apps these require a restore step.
                 DotNetBuild(s => s
                     .SetProjectFile(packagesTestApplicationProject)
                     .SetProperty("NuGetPackageVersion", VersionHelper.GetVersion())
-                    .SetRuntime(MapToNet8RuntimeIdentifiers(RuntimeInformation.RuntimeIdentifier))
+                    .SetRuntime(RuntimeInformation.RuntimeIdentifier)
                     .SetSelfContained(true)
                     .SetConfiguration(BuildConfiguration)
                     .SetPlatform(Platform));

diff --git a/build/Build.Steps.cs b/build/Build.Steps.cs
@@ -44,15 +44,11 @@ partial class Build
     private static readonly IEnumerable<TargetFramework> TargetFrameworks = new[]
     {
         TargetFramework.NET462,
-        TargetFramework.NET6_0
+        TargetFramework.NET8_0
     };
 
     private static readonly IEnumerable<TargetFramework> TestFrameworks = TargetFrameworks
-        .Concat(TargetFramework.NET7_0
-#if  NET8_0_OR_GREATER
-            , TargetFramework.NET8_0
-#endif
-            );
+        .Concat(TargetFramework.NET9_0);
 
     Target CreateRequiredDirectories => _ => _
         .Unlisted()
@@ -291,24 +287,24 @@ DotNetBuildSettings BuildTestApplication(DotNetBuildSettings x) =>
                 .SetFramework(TargetFramework.NETCore3_1)
                 .SetOutput(TracerHomeDirectory / MapToFolderOutput(TargetFramework.NETCore3_1)));
 
-            // AutoInstrumentationLoader publish is needed only for .NET 6.0 to support load from AutoInstrumentationStartupHook.
+            // AutoInstrumentationLoader publish is needed only for .NET 8.0 to support load from AutoInstrumentationStartupHook.
             DotNetPublish(s => s
                 .SetProject(Solution.GetProjectByName(Projects.AutoInstrumentationLoader))
                 .SetConfiguration(BuildConfiguration)
                 .SetTargetPlatformAnyCPU()
                 .EnableNoBuild()
                 .SetNoRestore(NoRestore)
-                .SetFramework(TargetFramework.NET6_0)
-                .SetOutput(TracerHomeDirectory / MapToFolderOutput(TargetFramework.NET6_0)));
+                .SetFramework(TargetFramework.NET8_0)
+                .SetOutput(TracerHomeDirectory / MapToFolderOutput(TargetFramework.NET8_0)));
 
             DotNetPublish(s => s
                 .SetProject(Solution.GetProjectByName(Projects.AutoInstrumentationAspNetCoreBootstrapper))
                 .SetConfiguration(BuildConfiguration)
                 .SetTargetPlatformAnyCPU()
                 .EnableNoBuild()
                 .SetNoRestore(NoRestore)
-                .SetFramework(TargetFramework.NET6_0)
-                .SetOutput(TracerHomeDirectory / MapToFolderOutput(TargetFramework.NET6_0)));
+                .SetFramework(TargetFramework.NET8_0)
+                .SetOutput(TracerHomeDirectory / MapToFolderOutput(TargetFramework.NET8_0)));
 
             RemoveFilesInNetFolderAvailableInAdditionalStore();
 
@@ -593,14 +589,9 @@ void RemoveFilesInNetFolderAvailableInAdditionalStore()
                     // To allow roll forward for applications, like Roslyn, that target one tfm
                     // but have a later runtime move the libraries under the original tfm folder
                     // to the latest one.
-                    if (folderRuntimeName == TargetFramework.NET6_0)
-                    {
-                        depsJson.RollFrameworkForward(TargetFramework.NET6_0, TargetFramework.NET8_0, architectureStores);
-                    }
-                    else if (folderRuntimeName == TargetFramework.NET7_0 || folderRuntimeName == TargetFramework.NET8_0)
+                    if (folderRuntimeName == TargetFramework.NET8_0 || folderRuntimeName == TargetFramework.NET9_0)
                     {
-                        depsJson.RollFrameworkForward(TargetFramework.NET6_0, TargetFramework.NET8_0, architectureStores);
-                        depsJson.RollFrameworkForward(TargetFramework.NET7_0, TargetFramework.NET8_0, architectureStores);
+                        depsJson.RollFrameworkForward(TargetFramework.NET8_0, TargetFramework.NET9_0, architectureStores);
                     }
 
                     // Write the updated deps.json file.

diff --git a/build/Directory.Packages.props b/build/Directory.Packages.props
@@ -5,5 +5,6 @@
     <PackageVersion Include="Mono.Cecil" Version="0.11.6" />
     <PackageVersion Include="Nuke.Common" Version="8.1.4" />
     <PackageVersion Include="Nuget.CommandLine" Version="6.11.1" />
+    <PackageVersion Include="System.Runtime.Serialization.Formatters" Version="9.0.0" />
   </ItemGroup>
 </Project>
diff --git a/build/Extensions/DepsJsonExtensions.cs b/build/Extensions/DepsJsonExtensions.cs
@@ -11,9 +11,8 @@ public static string GetFolderRuntimeName(this JsonObject depsJson)
         var runtimeName = depsJson["runtimeTarget"]["name"].GetValue<string>();
         var folderRuntimeName = runtimeName switch
         {
-            ".NETCoreApp,Version=v6.0" => "net6.0",
-            ".NETCoreApp,Version=v7.0" => "net7.0",
             ".NETCoreApp,Version=v8.0" => "net8.0",
+            ".NETCoreApp,Version=v9.0" => "net9.0",
             _ => throw new ArgumentOutOfRangeException(nameof(runtimeName), runtimeName,
                 "This value is not supported. You have probably introduced new .NET version to AutoInstrumentation")
         };