Merge branch 'main' into exclude_semconv_sanity_checks

Author: joaopgrassi

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -54,6 +54,7 @@ body:
         - OpenTelemetry.Resources.Container
         - OpenTelemetry.Resources.Gcp
         - OpenTelemetry.Resources.Host
+        - OpenTelemetry.Resources.OperatingSystem
         - OpenTelemetry.Resources.Process
         - OpenTelemetry.Resources.ProcessRuntime
         - OpenTelemetry.Sampler.AWS

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -54,6 +54,7 @@ body:
         - OpenTelemetry.Resources.Container
         - OpenTelemetry.Resources.Gcp
         - OpenTelemetry.Resources.Host
+        - OpenTelemetry.Resources.OperatingSystem
         - OpenTelemetry.Resources.Process
         - OpenTelemetry.Resources.ProcessRuntime
         - OpenTelemetry.Sampler.AWS

.github/codecov.yml

@@ -134,6 +134,11 @@ flags:
     paths:
       - src/OpenTelemetry.Resources.Host
 
+  unittests-Resources.OperatingSystem:
+    carryforward: true
+    paths:
+      - src/OpenTelemetry.Resources.OperatingSystem
+
   unittests-Resources.Process:
     carryforward: true
     paths:

.github/component_owners.yml

@@ -53,6 +53,8 @@ components:
     - Yun-Ting
   src/OpenTelemetry.Instrumentation.Quartz/:
     - maldago
+  src/OpenTelemetry.Instrumentation.StackExchangeRedis/:
+    - matt-hensley
   src/OpenTelemetry.Instrumentation.Runtime/:
     - twenzel
     - xiang17
@@ -73,6 +75,9 @@ components:
   src/OpenTelemetry.Resources.Host/:
     - Kielek
     - lachmatt
+  src/OpenTelemetry.Resources.OperatingSystem/:
+    - Kielek
+    - lachmatt
   src/OpenTelemetry.Resources.Process/:
     - Kielek
     - lachmatt
@@ -148,6 +153,8 @@ components:
     - codeblanch
   test/OpenTelemetry.Instrumentation.Quartz.Tests/:
     - maldago
+  test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/:
+    - matt-hensley
   test/OpenTelemetry.Instrumentation.Runtime.Tests/:
     - twenzel
     - xiang17

.github/workflows/Component.BuildTest.yml

@@ -18,7 +18,7 @@ on:
         required: false
         type: string
       tfm-list:
-        default: '[ "net462", "net6.0", "net7.0", "net8.0" ]'
+        default: '[ "net462", "net6.0", "net8.0" ]'
         required: false
         type: string
 
@@ -33,6 +33,8 @@ jobs:
         exclude:
         - os: ubuntu-latest
           version: net462
+        - os: macos-latest
+          version: net462
 
     runs-on: ${{ matrix.os }}
 
@@ -73,6 +75,10 @@ jobs:
 
     - name: Setup dotnet
       uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: |
+          6.0.x
+          8.0.x
 
     - name: dotnet restore ${{ steps.resolve-project.outputs.title }}
       run: dotnet restore ${{ steps.resolve-project.outputs.project }} -p:EnablePackageValidation=true

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

@@ -29,7 +29,7 @@ jobs:
       fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
       matrix:
         os: [ windows-latest, ubuntu-latest ]
-        version: [ net462, net6.0, net7.0, net8.0 ]
+        version: [ net462, net6.0, net8.0 ]
         exclude:
         - os: ubuntu-latest
           version: net462

.github/workflows/ci.yml

@@ -58,6 +58,7 @@ jobs:
           resources-container: ['*/OpenTelemetry.Resources.Container*/**', '!**/*.md']
           resources-gcp: ['*/OpenTelemetry.Resources.Gcp*/**', '!**/*.md']
           resources-host: ['*/OpenTelemetry.Resources.Host*/**', '!**/*.md']
+          resources-operatingsystem: ['*/OpenTelemetry.Resources.OperatingSystem/**', '*/OpenTelemetry.Resources.OperatingSystem.Tests/**', '!**/*.md']
           resources-process: ['*/OpenTelemetry.Resources.Process/**', '*/OpenTelemetry.Resources.Process.Tests/**', '!**/*.md']
           resources-processruntime: ['*/OpenTelemetry.Resources.ProcessRuntime/**', '*/OpenTelemetry.Resources.ProcessRuntime.Tests/**', '!**/*.md']
           sampler-aws: ['*/OpenTelemetry.Sampler.AWS**/**', '!**/*.md']
@@ -195,7 +196,7 @@ jobs:
     with:
       project-name: OpenTelemetry.Instrumentation.AspNetCore
       code-cov-name: Instrumentation.AspNetCore
-      tfm-list: '[ "net6.0", "net7.0", "net8.0" ]'
+      tfm-list: '[ "net6.0", "net8.0" ]'
 
   build-test-instrumentation-aws:
     needs: detect-changes
@@ -218,7 +219,7 @@ jobs:
     with:
       project-name: Component[OpenTelemetry.Instrumentation.AWSLambda]
       code-cov-name: Instrumentation.AWSLambda
-      tfm-list: '[ "net6.0", "net7.0", "net8.0" ]'
+      tfm-list: '[ "net6.0", "net8.0" ]'
 
   build-test-instrumentation-cassandra:
     needs: detect-changes
@@ -284,7 +285,7 @@ jobs:
     with:
       project-name: OpenTelemetry.Instrumentation.EventCounters
       code-cov-name: Instrumentation.EventCounters
-      tfm-list: '[ "net6.0", "net7.0", "net8.0" ]'
+      tfm-list: '[ "net6.0", "net8.0" ]'
 
   build-test-instrumentation-grpccore:
     needs: detect-changes
@@ -484,6 +485,19 @@ jobs:
     with:
       project-name: Component[OpenTelemetry.Resources.Host]
       code-cov-name: Resources.Host
+      os-list: '[ "windows-latest", "ubuntu-latest", "macos-latest" ]'
+
+  build-test-resources-operatingsystem:
+    needs: detect-changes
+    if: |
+      contains(needs.detect-changes.outputs.changes, 'resources-operatingsystem')
+      || contains(needs.detect-changes.outputs.changes, 'build')
+      || contains(needs.detect-changes.outputs.changes, 'shared')
+    uses: ./.github/workflows/Component.BuildTest.yml
+    with:
+      project-name: Component[OpenTelemetry.Resources.OperatingSystem]
+      code-cov-name: Resources.OperatingSystem
+      os-list: '[ "windows-latest", "ubuntu-latest", "macos-latest" ]'
 
   build-test-resources-process:
     needs: detect-changes
@@ -561,6 +575,7 @@ jobs:
       || contains(needs.detect-changes.outputs.changes, 'resources-azure')
       || contains(needs.detect-changes.outputs.changes, 'resources-container')
       || contains(needs.detect-changes.outputs.changes, 'resources-host')
+      || contains(needs.detect-changes.outputs.changes, 'resources-operatingsystem')
       || contains(needs.detect-changes.outputs.changes, 'resources-process')
       || contains(needs.detect-changes.outputs.changes, 'resources-processruntime')
       || contains(needs.detect-changes.outputs.changes, 'sampler-aws')

.github/workflows/integration.yml

@@ -14,22 +14,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [net6.0, net7.0, net8.0]
+        version: [net6.0, net8.0]
     steps:
       - uses: actions/checkout@v4
 
-      - name: Run redis docker-compose
-        run: docker-compose --file=test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build
+      - name: Run redis docker compose
+        run: docker compose --file=test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build
 
   kafka-integration-test:
     if: inputs.job == 'all' || inputs.job == 'kafka-integration-test'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        version: [net6.0, net7.0, net8.0]
+        version: [net6.0, net8.0]
     steps:
       - uses: actions/checkout@v4
 
-      - name: Run kafka docker-compose
-        run: docker-compose --file=test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build
+      - name: Run kafka docker compose
+        run: docker compose --file=test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build

.github/workflows/prepare-release.yml

@@ -44,6 +44,7 @@ on:
         - OpenTelemetry.Resources.Container
         - OpenTelemetry.Resources.Gcp
         - OpenTelemetry.Resources.Host
+        - OpenTelemetry.Resources.OperatingSystem
         - OpenTelemetry.Resources.Process
         - OpenTelemetry.Resources.ProcessRuntime
         - OpenTelemetry.Sampler.AWS

CONTRIBUTING.md

@@ -35,7 +35,7 @@ You can contribute to this project from a Windows, macOS or Linux machine.
 On all platforms, the minimum requirements are:
 
 * Git client and command line tools.
-* .NET 7.0+
+* .NET 8.0+
 
 Please note that individual project requirements might vary.