Support for .NET 8

.github/workflows/build-centos-native-container.yml

@@ -0,0 +1,33 @@
+name: Build on Centos Native Container
+
+on:
+  workflow_call:
+
+env:
+  NUGET_PACKAGES: ${{ github.workspace }}/packages
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+
+jobs:
+  build-centos-native-container:
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-20.04
+    timeout-minutes: 60
+    steps:
+    - uses: actions/[email protected]
+      with:
+        fetch-depth: 0 # fetching all, needed to correctly calculate version
+    - name: Build native library in Docker container
+      run: |
+        set -e
+        docker build -t mybuildimage -f "./docker/centos.dockerfile" ./docker
+        docker run -e OS_TYPE=linux-glibc --rm --mount type=bind,source="${GITHUB_WORKSPACE}",target=/project mybuildimage \
+          /bin/sh -c 'git config --global --add safe.directory /project && ./build.sh BuildNativeWorkflow'
+
+    - name: Publish native library Linux build
+      uses: actions/[email protected]
+      with:
+        name: bin-centos-native
+        path: bin/tracer-home
+      if: (${{ job.status }} != 'cancelled')
+      continue-on-error: true

.github/workflows/build-container.yml

@@ -15,8 +15,6 @@ jobs:
         include:
           - base-image: alpine
             os-type: linux-musl
-          - base-image: centos
-            os-type: linux-glibc
     runs-on: ubuntu-20.04
     timeout-minutes: 60
     steps:
@@ -35,10 +33,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 net7.0 -c Release ./test/test-applications/integrations/TestApplication.Smoke
+          dotnet publish -f net8.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/net7.0/publish/TestApplication.Smoke
+          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net8.0/publish/TestApplication.Smoke
             test "$(ls -A /var/log/opentelemetry/dotnet )"
         '
     - name: Publish Linux build

.github/workflows/build-nuget-packages.yml

@@ -29,8 +29,9 @@ jobs:
       - uses: actions/[email protected]
         with:
           dotnet-version: | 
-            6.0.416
-            7.0.403
+            6.0.417
+            7.0.404
+            8.0.100
 
       - name: Check for NuGet packages cache
         uses: actions/[email protected]
@@ -45,11 +46,11 @@ jobs:
           name: bin-windows-2022
           path: bin/ci-artifacts/bin-windows-2022
 
-      - name: Download CentOS Artifacts from build job
+      - name: Download Ubuntu Artifacts from build job
         uses: actions/[email protected]
         with:
-          name: bin-centos
-          path: bin/ci-artifacts/bin-centos
+          name: bin-ubuntu-20.04
+          path: bin/ci-artifacts/bin-ubuntu-20.04
 
       - name: Download Alpine Artifacts from build job
         uses: actions/[email protected]

.github/workflows/build.yml

@@ -27,8 +27,9 @@ jobs:
       - uses: actions/[email protected]
         with:
           dotnet-version: | 
-            6.0.416
-            7.0.403
+            6.0.417
+            7.0.404
+            8.0.100
       - name: Check for NuGet packages cache
         uses: actions/[email protected]
         id: nuget-cache
@@ -48,6 +49,17 @@ jobs:
 
       - run: ./build.cmd BuildWorkflow --no-restore ${{ steps.nuget-cache.outputs.cache-hit != 'true' }}
 
+      - name: Download native CentOS Artifacts from build job
+        if: ${{ matrix.machine == 'ubuntu-20.04' }}
+        uses: actions/[email protected]
+        with:
+          name: bin-centos-native
+          path: bin/ci-artifacts/bin-centos-native
+      - name: Replace Ubuntu native code by Centos artifacts
+        run: |
+          rm ./bin/tracer-home/linux-x64/OpenTelemetry.AutoInstrumentation.Native.so
+          cp ./bin/ci-artifacts/bin-centos-native/linux-x64/OpenTelemetry.AutoInstrumentation.Native.so ./bin/tracer-home/linux-x64/OpenTelemetry.AutoInstrumentation.Native.so
+        if: ${{ matrix.machine == 'ubuntu-20.04' }}
       - run: brew install coreutils
         if: ${{ runner.os == 'macOS' }}
       - name: Create test directory
@@ -57,10 +69,10 @@ jobs:
         shell: bash
         run: |
           set -e
-          dotnet publish -f net7.0 -c Release ./test/test-applications/integrations/TestApplication.Smoke
+          dotnet publish -f net8.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/net7.0/publish/TestApplication.Smoke
+          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net8.0/publish/TestApplication.Smoke
             test "$(ls -A '${{ matrix.log-dir }}' )"
       - name: Test the PowerShell module instructions from README.md
         if: ${{ runner.os == 'Windows' }}
@@ -70,12 +82,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/net7.0/TestApplication.Smoke.exe
+          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net8.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/net7.0/TestApplication.Smoke.exe
+          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net8.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." }
       - name: Upload binaries

.github/workflows/ci.yml

@@ -12,12 +12,16 @@ env:
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
 
 jobs:
-  build:
-    uses: ./.github/workflows/build.yml
-
   build-container:
     uses: ./.github/workflows/build-container.yml
 
+  build-centos-native:
+    uses: ./.github/workflows/build-centos-native-container.yml
+
+  build:
+    needs: build-centos-native
+    uses: ./.github/workflows/build.yml
+
   build-nuget-packages:
     needs: [ build, build-container ]
     uses: ./.github/workflows/build-nuget-packages.yml
@@ -27,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test-tfm: [ net7.0, net6.0, net462 ]
+        test-tfm: [ net8.0, net7.0, net6.0, net462 ]
         machine: [ windows-2022, ubuntu-20.04, macos-11 ]
         exclude:
           - test-tfm: net462
@@ -49,8 +53,9 @@ jobs:
       - uses: actions/[email protected]
         with:
           dotnet-version: | 
-            6.0.416
-            7.0.403
+            6.0.417
+            7.0.404
+            8.0.100
       - name: Check for NuGet packages cache
         uses: actions/[email protected]
         id: nuget-cache
@@ -94,8 +99,9 @@ jobs:
       - uses: actions/[email protected]
         with:
           dotnet-version: | 
-            6.0.416
-            7.0.403
+            6.0.417
+            7.0.404
+            8.0.100
       - name: Check for NuGet packages cache
         uses: actions/[email protected]
         id: nuget-cache
@@ -125,8 +131,9 @@ jobs:
       - uses: actions/[email protected]
         with:
           dotnet-version: | 
-            6.0.416
-            7.0.403
+            6.0.417
+            7.0.404
+            8.0.100
       - name: Check for NuGet packages cache
         uses: actions/[email protected]
         id: nuget-cache
@@ -150,7 +157,7 @@ jobs:
           path: test-artifacts/
 
   test-build-container:
-    needs: build-container
+    needs: [build, build-container]
     strategy:
       fail-fast: false
       matrix:
@@ -159,10 +166,10 @@ jobs:
             build-source: alpine
             os-type: linux-musl
           - base-image: centos
-            build-source: centos
+            build-source: ubuntu-20.04
             os-type: linux-glibc
           - base-image: debian
-            build-source: centos
+            build-source: ubuntu-20.04
             os-type: linux-glibc
     runs-on: ubuntu-20.04
     timeout-minutes: 60
@@ -199,8 +206,9 @@ jobs:
       - uses: actions/[email protected]
         with:
           dotnet-version: | 
-            6.0.416
-            7.0.403
+            6.0.417
+            7.0.404
+            8.0.100
       - name: Check for NuGet packages cache
         uses: actions/[email protected]
         id: nuget-cache

.github/workflows/dotnet-format.yml

@@ -22,10 +22,10 @@ jobs:
     - name: check out code
       uses: actions/[email protected]
 
-    - name: Setup .NET 7.0
+    - name: Setup .NET 8
       uses: actions/[email protected]
       with:
-        dotnet-version: 7.0.403
+        dotnet-version: 8.0.100
 
     - name: dotnet format
       run: dotnet format .\OpenTelemetry.AutoInstrumentation.sln --no-restore --verify-no-changes

.github/workflows/release-publish.yml

@@ -11,15 +11,16 @@ jobs:
       - uses: actions/[email protected]
         with:
           dotnet-version: | 
-            6.0.416
-            7.0.403
+            6.0.417
+            7.0.404
+            8.0.100
       - name: Test the PowerShell module instructions from README.md
         shell: powershell
         run: |
           mkdir testapp
           cd testapp
           dotnet new console
-          dotnet publish -f net7.0 -c Release
+          dotnet publish -f net8.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\*"
@@ -28,12 +29,12 @@ jobs:
           Install-OpenTelemetryCore
           $install_dir = Get-OpenTelemetryInstallDirectory
           Register-OpenTelemetryForCurrentSession -OTelServiceName "MyServiceDisplayName"
-          ./bin/Release/net7.0/publish/testapp
+          ./bin/Release/net8.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/net7.0/publish/testapp
+          ./bin/Release/net8.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
@@ -55,8 +56,9 @@ jobs:
       - uses: actions/[email protected]
         with:
           dotnet-version: | 
-            6.0.416
-            7.0.403
+            6.0.417
+            7.0.404
+            8.0.100
       - run: brew install coreutils
         if: ${{ runner.os == 'macOS' }}
       - name: Create test directory
@@ -69,13 +71,13 @@ jobs:
           mkdir testapp
           cd testapp
           dotnet new console
-          dotnet publish -f net7.0 -c Release
+          dotnet publish -f net8.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/net7.0/publish/testapp
+          ./bin/Release/net8.0/publish/testapp
             test "$(ls -A '${{ matrix.log-dir }}' )"
 
   shell-scripts-container:
@@ -95,12 +97,12 @@ jobs:
             mkdir testapp
             cd testapp
             dotnet new console
-            dotnet publish -f net7.0 -c Release
+            dotnet publish -f net8.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/net7.0/publish/testapp
+            ./bin/Release/net8.0/publish/testapp
               test "$(ls -A /var/log/opentelemetry/dotnet )"
           '

.github/workflows/release.yml

@@ -10,12 +10,16 @@ env:
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
 
 jobs:
-  build:
-    uses: ./.github/workflows/build.yml
-
   build-container:
     uses: ./.github/workflows/build-container.yml
 
+  build-centos-native:
+    uses: ./.github/workflows/build-centos-native-container.yml
+
+  build:
+    needs: build-centos-native
+    uses: ./.github/workflows/build.yml
+
   build-nuget-packages:
     needs: [ build, build-container ]
     uses: ./.github/workflows/build-nuget-packages.yml

.github/workflows/verify-test.yml

@@ -30,8 +30,9 @@ jobs:
       - uses: actions/[email protected]
         with:
           dotnet-version: | 
-            6.0.416
-            7.0.403
+            6.0.417
+            7.0.404
+            8.0.100
       - 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 }}
       - name: Upload logs
         uses: actions/[email protected]

CHANGELOG.md

@@ -9,6 +9,7 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
 
 ### Added
 
+- Add support for .NET 8.
 - Added support for [System.Data.SqlClient](https://www.nuget.org/packages/System.Data.SqlClient/)
   (NuGet package) traces instrumentation from `4.8.5`.
 - Ability to update installation via PS module (`OpenTelemetry.DotNet.Auto.psm1`).