Merge branch 'main' into exclude_semconv_sanity_checks

.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.
 

README.md

@@ -15,14 +15,56 @@ projects.
 For information on how to contribute, consult [the contributing
 guidelines](./CONTRIBUTING.md).
 
+## Project status
+
+This repository is a collection of components maintained by different
+authors and groups. As such, components shipped from this repository (via
+[Nuget](https://www.nuget.org/)) may be at different stability/maturity levels.
+The status for each individual component is mentioned in its respective
+`README.md` file and will fall into one of the following categories:
+
+### Development
+
+Component is currently in development and is NOT available on
+[Nuget](https://www.nuget.org/).
+
+### Alpha
+
+The component is ready to be used for limited non-critical workloads and the
+authors of this component would welcome your feedback. Bugs and performance
+problems should be reported, but component owners might not work on them right
+away. Components can go through significant breaking changes and there are no
+backward compatibility guarantees. Package versions in this status have the
+`-alpha` extension (eg: opentelemetry.exporter.abc-1.0.0-alpha.1).
+
+### Beta
+
+Same as Alpha, but comparatively more stable. Package versions in this status
+have the `-beta` extension (eg: opentelemetry.exporter.abc-1.0.0-beta.1).
+
+### Release candidate
+
+Component is close to stability. There may be minimal breaking changes between
+releases. A component at this stage is expected to have had exposure to
+non-critical production workloads already during its **Alpha/Beta** phase(s),
+making it suitable for broader usage. Package versions in this status have the
+`-rc` extension (eg: opentelemetry.exporter.abc-1.0.0-rc.1).
+
+### Stable
+
+The component is ready for general availability. Bugs and performance problems
+should be reported and the component owner(s) SHOULD triage and/or resolve them
+in a timely manner. The package versions MUST follow [SemVer
+V2](https://semver.org/spec/v2.0.0.html).
+
 ## Support
 
 This repository is maintained by [.NET Contrib maintainers](#maintainers) team
 and [.NET Contrib approvers](#approvers) who can help with reviews and code
 approval. However, as individual components are developed by numerous
 contributors, approvers and maintainers are not expected to directly contribute
-to every component. The list of owners for each component can be found
-[here](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/main/.github/component_owners.yml).
+to every component. The list of owners for each component can be found in
+component's `Readme.md` file.
 
 ### Triagers
 
@@ -50,7 +92,6 @@ repository](https://github.com/open-telemetry/community/blob/main/community-memb
 * [Cijo Thomas](https://github.com/cijothomas), Microsoft
 * [Mikel Blanchard](https://github.com/CodeBlanch), Microsoft
 * [Piotr Kiełkowicz](https://github.com/Kielek), Splunk
-* [Vishwesh Bankwar](https://github.com/vishweshbankwar), Microsoft
 
 *Find more about the maintainer role in [community
 repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*
@@ -62,6 +103,7 @@ repository](https://github.com/open-telemetry/community/blob/main/community-memb
 * [Prashant Srivastava](https://github.com/srprash)
 * [Sergey Kanzhelev](https://github.com/SergeyKanzhelev)
 * [Utkarsh Umesan Pillai](https://github.com/utpilla)
+* [Vishwesh Bankwar](https://github.com/vishweshbankwar)
 
 Even though, anybody can contribute, there are benefits of being a member of our
 community. See to the [community membership

build/Common.nonprod.props

@@ -21,23 +21,20 @@
       Refer to https://docs.microsoft.com/en-us/nuget/concepts/package-versioning for semver syntax.
     -->
     <BenchmarkDotNetPkgVer>[0.13.12,0.14)</BenchmarkDotNetPkgVer>
-    <DotNetXUnitCliVer>[2.3.1,3.0)</DotNetXUnitCliVer>
     <MicrosoftExtensionsHostingPkgVer>8.0.0</MicrosoftExtensionsHostingPkgVer>
-    <MicrosoftNETTestSdkPkgVer>[17.9.0,18.0)</MicrosoftNETTestSdkPkgVer>
+    <MicrosoftNETTestSdkPkgVer>[17.11.1,18.0)</MicrosoftNETTestSdkPkgVer>
     <OpenTelemetryExporterInMemoryPkgVer>$(OpenTelemetryCoreLatestVersion)</OpenTelemetryExporterInMemoryPkgVer>
     <OpenTelemetryExporterInMemoryLatestPreReleasePkgVer>$(OpenTelemetryCoreLatestPrereleaseVersion)</OpenTelemetryExporterInMemoryLatestPreReleasePkgVer>
-    <SupportedNetTargets>net8.0;net7.0;net6.0</SupportedNetTargets>
-    <XUnitRunnerVisualStudioPkgVer>[2.8.1,3.0)</XUnitRunnerVisualStudioPkgVer>
-    <XUnitPkgVer>[2.8.1,3.0)</XUnitPkgVer>
-    <WiremockNetPkgVer>[1.5.58,2.0)</WiremockNetPkgVer>
+    <SupportedNetTargets>net8.0;net6.0</SupportedNetTargets>
+    <XUnitRunnerVisualStudioPkgVer>[2.8.2,3.0)</XUnitRunnerVisualStudioPkgVer>
+    <XUnitPkgVer>[2.9.0,3.0)</XUnitPkgVer>
+    <WiremockNetPkgVer>[1.6.1,2.0)</WiremockNetPkgVer>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(IsTestProject)' == 'true'">
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPkgVer)" />
     <PackageReference Include="xunit" Version="$(XUnitPkgVer)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioPkgVer)" PrivateAssets="All" />
-
-    <DotNetCliToolReference Include="dotnet-xunit" Version="$(DotNetXUnitCliVer)" />
   </ItemGroup>
 
   <Target Name="SkipVSTestForInvalidTargetFramework" BeforeTargets="VSTest" Condition="'$(IsTestProject)' == 'true'">

build/Common.props

@@ -13,6 +13,10 @@
     <AnalysisLevel>latest-all</AnalysisLevel>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <NuGetAudit>true</NuGetAudit>
+    <!-- NuGetAuditMode will be uncommented in the future PR when all issues will be fixed. -->
+    <!--<NuGetAuditMode>all</NuGetAuditMode>-->
+    <NuGetAuditLevel>low</NuGetAuditLevel>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
@@ -42,10 +46,10 @@
     <OpenTelemetryCoreUnstableLatestVersion>[1.9.0-beta.2]</OpenTelemetryCoreUnstableLatestVersion>
     <OpenTelemetryCoreLatestVersion>[1.9.0,2.0)</OpenTelemetryCoreLatestVersion>
     <OpenTelemetryCoreLatestPrereleaseVersion>[1.9.0-rc.1]</OpenTelemetryCoreLatestPrereleaseVersion>
-    <StackExchangeRedisPkgVer>[2.1.58,3.0)</StackExchangeRedisPkgVer>
-    <ConfluentKafkaPkgVer>[2.3.0,3.0)</ConfluentKafkaPkgVer>
+    <StackExchangeRedisPkgVer>[2.6.122,3.0)</StackExchangeRedisPkgVer>
+    <ConfluentKafkaPkgVer>[2.4.0,3.0)</ConfluentKafkaPkgVer>
     <CassandraCSharpDriverPkgVer>[3.16.0,4.0)</CassandraCSharpDriverPkgVer>
-    <StyleCopAnalyzersPkgVer>[1.2.0-beta.507,2.0)</StyleCopAnalyzersPkgVer>
+    <StyleCopAnalyzersPkgVer>[1.2.0-beta.556,2.0)</StyleCopAnalyzersPkgVer>
     <SystemNetHttp>[4.3.4,)</SystemNetHttp>
     <SystemReflectionEmitLightweightPkgVer>4.7.0</SystemReflectionEmitLightweightPkgVer>
     <SystemTextJsonPkgVer>[6.0.0,)</SystemTextJsonPkgVer>

build/OpenTelemetryContrib.prod.ruleset

@@ -9,5 +9,7 @@
     <Rule Id="SA1401" Action="None" />
     <Rule Id="SA1512" Action="None" />
     <Rule Id="SA1600" Action="None" />
+    <Rule Id="SA1601" Action="None" />
+    <Rule Id="SA1602" Action="None" />
   </Rules>
 </RuleSet>

build/scripts/add-labels.psm1

@@ -99,12 +99,12 @@ function AddLabelsOnPullRequestsBasedOnFilesChanged {
         $rootInfraFiles.Contains($fullFileName) -or
         $fileExtension -eq ".props" -or
         $fileExtension -eq ".targets" -or
-        $fileChanged.StartsWith('test\openTelemetry.aotcompatibility'))
+        $fileChanged.StartsWith('test/openTelemetry.aotcompatibility'))
     {
         $added = $labelsToAdd.Add("infra")
     }
 
-    if ($fileChanged.StartsWith('test\benchmarks'))
+    if ($fileChanged.StartsWith('test/benchmarks'))
     {
         $added = $labelsToAdd.Add("perf")
     }

examples/AspNet/Examples.AspNet.csproj

@@ -53,7 +53,7 @@
     <PackageReference Include="Microsoft.AspNet.Mvc" Version="[5.3.0,6.0)" />
     <PackageReference Include="Microsoft.AspNet.WebPages" Version="[3.3.0,4.0)" />
     <PackageReference Include="OpenTelemetry" Version="$(OpenTelemetryCoreLatestVersion)" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
     <PackageReference Include="OpenTelemetry.Exporter.Console" Version="$(OpenTelemetryCoreLatestVersion)" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="$(OpenTelemetryCoreLatestVersion)" />
     <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="$(OpenTelemetryCoreLatestVersion)" />

examples/InfluxDB/Examples.InfluxDB/Examples.InfluxDB.csproj

@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Examples.InfluxDB</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.4.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
   </ItemGroup>
 
   <ItemGroup>