Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
9cd222b
Support .NET 11
martincostello Feb 15, 2026
44b57c4
Bump System.Diagnostics.DiagnosticSource
martincostello Feb 15, 2026
52ccdd6
Fix path check
martincostello Feb 15, 2026
4fc224a
Fix NU1510 warning
martincostello Feb 15, 2026
7ed07ef
Update CompatibilitySuppressions
martincostello Feb 15, 2026
f361c14
Add EOL
martincostello Feb 15, 2026
7ae2d3e
Merge branch 'main' into dotnet-vnext
martincostello Mar 11, 2026
3e5d0a1
Update to .NET 11 preview 2
martincostello Mar 11, 2026
b42ea8e
Fix new code analysis warnings
martincostello Mar 13, 2026
211f776
Merge branch 'main' into dotnet-vnext
martincostello Mar 13, 2026
89ae793
Fix more warnings
martincostello Mar 15, 2026
c4f5de2
Fix W3C context tests for .NET 11
martincostello Mar 15, 2026
93df166
Fix more style warnings
martincostello Mar 15, 2026
74dbad9
Add link to issue
martincostello Mar 15, 2026
af0faf1
Update W3C workaround
martincostello Mar 15, 2026
4048309
Merge branch 'main' into dotnet-vnext
martincostello Mar 16, 2026
4a92225
Merge branch 'main' into dotnet-vnext
martincostello Mar 16, 2026
a4fdc6f
Merge branch 'main' into dotnet-vnext
martincostello Mar 17, 2026
aeeb7f2
Fix build
martincostello Mar 17, 2026
8bc8840
Merge branch 'main' into dotnet-vnext
martincostello Mar 19, 2026
677ad6c
Merge branch 'main' into dotnet-vnext
martincostello Mar 25, 2026
7e44e02
Merge branch 'main' into dotnet-vnext
martincostello Mar 27, 2026
29a41be
[API] Fix IDE0200 warnings
martincostello Mar 27, 2026
ca26772
Merge branch 'main' into dotnet-vnext
martincostello Apr 1, 2026
052edda
Merge branch 'main' into dotnet-vnext
martincostello Apr 15, 2026
ccd198c
Update to .NET 11 preview 3
martincostello Apr 15, 2026
6b03050
[OpenTelemetry] Fix warnings
martincostello Apr 15, 2026
f3d4129
[Propagators] Fix new warning
martincostello Apr 15, 2026
97b6f64
[Hosting] Fix tests
martincostello Apr 15, 2026
44e79e4
[Infra] Skip failing test
martincostello Apr 15, 2026
fcca6e4
Merge branch 'main' into dotnet-vnext
martincostello Apr 21, 2026
a4cbfd6
[Infra] Fix build
martincostello Apr 21, 2026
5aae9a4
[Infra] Fix W3C tests
martincostello Apr 21, 2026
22f1aa3
[Infra] Revert changes
martincostello Apr 21, 2026
f3f0804
Merge branch 'main' into dotnet-vnext
martincostello Apr 21, 2026
6b7cc5a
Merge branch 'main' into dotnet-vnext
martincostello Apr 23, 2026
99fe730
[Infra] Update TFMs
martincostello Apr 23, 2026
0275f47
[Infra] Fix lint warnings
martincostello Apr 23, 2026
94a6c63
Merge branch 'main' into dotnet-vnext
martincostello May 7, 2026
b110433
[Infra] Fix new code analysis warnings
martincostello May 7, 2026
14dff69
[Infra] Fix code analysis warnings
martincostello May 7, 2026
77618b1
[Infra] Fix tests
martincostello May 7, 2026
627f561
[Infra] Update to .NET 11 preview 4 (#4)
martincostello May 12, 2026
29942d6
[Infra] Update container hashes
martincostello May 12, 2026
dcc16bb
Merge branch 'main' into dotnet-vnext
martincostello May 13, 2026
c6aa62d
Merge branch 'main' into dotnet-vnext
martincostello May 14, 2026
b64d68d
[Infra] Fix tests
martincostello May 14, 2026
b68ebc4
[Infra] Fix DiagnosticSource version
martincostello May 15, 2026
ba93eb2
[Infra] Handle ActivityTraceFlags.RandomTraceId
martincostello May 15, 2026
99c1cf3
Merge branch 'main' into dotnet-vnext
martincostello May 18, 2026
f2c63db
[Infra] Fix merge
martincostello May 18, 2026
d4bd147
[OpenTelemetry] Fix circular reference
martincostello May 18, 2026
63d99f6
[OTLP] Fix test
martincostello May 18, 2026
1d519ce
[OTLP] Fix test
martincostello May 18, 2026
0168b87
Merge branch 'main' into dotnet-vnext
martincostello May 19, 2026
ed9b6fe
Merge branch 'main' into dotnet-vnext
martincostello May 22, 2026
6fafc5e
[Infra] Fix code analysis warning
martincostello May 22, 2026
de81a3c
[API] Fix tests
martincostello May 22, 2026
b789759
Merge branch 'main' into dotnet-vnext
martincostello May 30, 2026
05898c6
[Infra] Update benchmarks
martincostello May 30, 2026
381756c
[Infra] Fix new code analysis warnings
martincostello May 30, 2026
f5b79fa
Merge branch 'main' into dotnet-vnext
martincostello Jun 11, 2026
28f2d07
Update to .NET 11 preview 5
martincostello Jun 11, 2026
4a10a40
[Infra] Fix IDE0027 warning
martincostello Jun 11, 2026
d98e6af
[Infra] Fix CI
martincostello Jun 11, 2026
e49d967
[Infra] Set SOURCE_DATE_EPOCH
martincostello Jun 14, 2026
4769103
Merge branch 'main' into dotnet-vnext
martincostello Jun 16, 2026
8aba1d7
[Infra] Fix build
martincostello Jun 16, 2026
947f45e
[Infra] Suppress IDE0066
martincostello Jun 16, 2026
f3bbaf7
Merge branch 'main' into dotnet-vnext
martincostello Jun 18, 2026
aa27d46
[Infra] Fix new code analysis warnings
martincostello Jun 18, 2026
6c1bdce
Merge branch 'main' into dotnet-vnext
martincostello Jun 24, 2026
df2f68e
[Infra] Add missing override
martincostello Jun 24, 2026
f7f44c1
Merge branch 'main' into dotnet-vnext
martincostello Jul 3, 2026
6cecb63
[Infra] Fix spacing
martincostello Jul 3, 2026
f73ebbd
[Infra] Fix code analysis warnings
martincostello Jul 3, 2026
d73b114
[Infra] Fix new code analysis warnings
martincostello Jul 3, 2026
1dc8b3d
Merge branch 'main' into dotnet-vnext
martincostello Jul 3, 2026
e4b59e0
[Infra] Fix new code analysis warnings
martincostello Jul 3, 2026
f153b44
Merge branch 'main' into dotnet-vnext
martincostello Jul 3, 2026
b802571
Merge branch 'main' into dotnet-vnext
martincostello Jul 3, 2026
95c55a3
Merge branch 'main' into dotnet-vnext
martincostello Jul 10, 2026
70ed852
[Infra] Fix IDE0074 warning
martincostello Jul 10, 2026
78e64d6
Merge branch 'main' into dotnet-vnext
martincostello Jul 15, 2026
5df5d62
[Infra] Update to .NET 11 preview 6
martincostello Jul 15, 2026
ac6c081
Merge branch 'main' into dotnet-vnext
martincostello Jul 15, 2026
d73584a
Merge branch 'main' into dotnet-vnext
martincostello Jul 16, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/Component.BuildTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
required: false
type: string
tfm-list:
default: '[ "net462", "net8.0", "net9.0", "net10.0" ]'
default: '[ "net462", "net10.0", "net11.0" ]'
required: false
type: string
trigger:
Expand Down Expand Up @@ -75,8 +75,7 @@ jobs:
uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0
with:
dotnet-version: |
8.0.x
9.0.x
10.0.x

- name: Setup .NET
uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ jobs:
strategy:
fail-fast: ${{ github.event_name == 'merge_group' }}
matrix:
version: [ net8.0, net9.0, net10.0 ]
version: [ net10.0, net11.0 ]
env:
FRAMEWORK_VERSION: ${{ matrix.version }}
steps:
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
strategy:
fail-fast: ${{ github.event_name == 'merge_group' }}
matrix:
version: [ net8.0, net9.0, net10.0 ]
version: [ net10.0, net11.0 ]
steps:
- name: Checkout code
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
Expand Down Expand Up @@ -240,7 +240,7 @@ jobs:
- name: Run benchmarks
shell: pwsh
run: |
$runtimes = @("net10.0")
$runtimes = @("net11.0")
if ($IsWindows) {
$runtimes += "net462"
}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/concurrency-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- ubuntu-24.04
# renovate: datasource=github-runners depType=github-runner
- windows-2025
version: [ net8.0, net10.0 ]
version: [ net10.0, net11.0 ]
project: [ OpenTelemetry.Tests, OpenTelemetry.Api.Tests ]

runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verifyaotcompat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- ubuntu-24.04
# renovate: datasource=github-runners depType=github-runner
- windows-2025
version: [ net8.0, net9.0, net10.0 ]
version: [ net10.0, net11.0 ]

runs-on: ${{ matrix.os }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dotnet test test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj --filter "FullyQ
**Test for a specific TFM** (Windows also supports `net462`):

```sh
dotnet test --framework net10.0
dotnet test --framework net11.0
```

**Check code formatting:**
Expand Down
49 changes: 17 additions & 32 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,42 +12,35 @@
-->
<ItemGroup>
<!-- Default to latest versions for all TFMs -->
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[10.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[10.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Abstractions" Version="[10.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="[10.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="[10.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[11.0.0-preview.6.26359.118,)" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[11.0.0-preview.6.26359.118,)" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Abstractions" Version="[11.0.0-preview.6.26359.118,)" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="[11.0.0-preview.6.26359.118,)" />
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="[11.0.0-preview.6.26359.118,)" />
</ItemGroup>
<!-- Version overrides for specific netX.0 TFMs -->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageVersion Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[8.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[8.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Diagnostics.Abstractions" Version="[8.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Hosting.Abstractions" Version="[8.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Logging.Configuration" Version="[8.0.0,)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageVersion Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[9.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[9.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Diagnostics.Abstractions" Version="[9.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Hosting.Abstractions" Version="[9.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Logging.Configuration" Version="[9.0.0,)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageVersion Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[10.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[10.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Diagnostics.Abstractions" Version="[10.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Hosting.Abstractions" Version="[10.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Logging.Configuration" Version="[10.0.0,)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net11.0'">
<PackageVersion Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[11.0.0-preview.6.26359.118,)" />
<PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[11.0.0-preview.6.26359.118,)" />
<PackageVersion Update="Microsoft.Extensions.Diagnostics.Abstractions" Version="[11.0.0-preview.6.26359.118,)" />
<PackageVersion Update="Microsoft.Extensions.Hosting.Abstractions" Version="[11.0.0-preview.6.26359.118,)" />
<PackageVersion Update="Microsoft.Extensions.Logging.Configuration" Version="[11.0.0-preview.6.26359.118,)" />
</ItemGroup>

<!--
System.Diagnostics.DiagnosticSource is exempted from the requirement to match the major version of
the runtime so that new APIs and/or semantic conventions are available to all versions of .NET.
See https://github.com/open-telemetry/opentelemetry-dotnet/issues/5973 for more details.
-->
<ItemGroup>
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="[10.0.0,)" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="[11.0.0-preview.6.26359.118,)" />
</ItemGroup>

<!--
Expand Down Expand Up @@ -82,10 +75,6 @@
<PackageVersion Include="System.Text.Encodings.Web" Version="[4.7.2,)" />
<PackageVersion Include="System.Text.Json" Version="[4.7.2,)" />

<!-- Mitigate https://msrc.microsoft.com/update-guide/vulnerability/CVE-2024-43485. -->
<!-- Newer NETCoreApp runtimes need to be redirected to safe versions. -->
<PackageVersion Update="System.Text.Encodings.Web" Version="[8.0.0,)" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />
<PackageVersion Update="System.Text.Json" Version="[8.0.5,)" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />
</ItemGroup>

<!--
Expand Down Expand Up @@ -131,16 +120,12 @@
<PackageVersion Include="xunit.runner.visualstudio" Version="[2.8.2,)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.29" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.18" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.10" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net11.0'">
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="11.0.0-preview.6.26359.118" />
</ItemGroup>

</Project>
3 changes: 1 addition & 2 deletions OpenTelemetry.slnx
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
<File Path="build/OpenTelemetry.snk.base64" />
<File Path="build/docfx.cmd" />
<File Path="build/docker-compose.net10.0.yml" />
<File Path="build/docker-compose.net8.0.yml" />
<File Path="build/docker-compose.net9.0.yml" />
<File Path="build/docker-compose.net11.0.yml" />
<File Path="build/GlobalAttrExclusions.txt" />
<File Path="build/opentelemetry-icon-color.png" />
<File Path="build/OpenTelemetry.prod.loose.ruleset" />
Expand Down
8 changes: 4 additions & 4 deletions benchmark.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ The baseline branch, tag, or commit to benchmark for comparison. Defaults to "ma
The BenchmarkDotNet job to use (e.g. "Short"). Defaults to "Default".

.PARAMETER Runtimes
One or more target frameworks to benchmark. Defaults to "net10.0".
One or more target frameworks to benchmark. Defaults to "net11.0".

.PARAMETER EnableMemoryDiagnoser
Enables the BenchmarkDotNet memory diagnoser.
Expand All @@ -46,7 +46,7 @@ Runs only the target benchmark and skips the baseline ref.
Runs the matching benchmarks for the current branch only.

.EXAMPLE
./benchmark.ps1 @("*ExporterBenchmarks*") -Target my-feature -Job Short -Runtimes @("net10.0", "net462")
./benchmark.ps1 @("*ExporterBenchmarks*") -Target my-feature -Job Short -Runtimes @("net11.0", "net462")

Runs the matching exporter benchmarks for the my-feature branch and main using the
"Short" job for .NET 10 and .NET Framework 4.6.2.
Expand All @@ -57,7 +57,7 @@ param(
[Parameter(Mandatory = $false)][string] $Target,
[Parameter(Mandatory = $false)][string] $Baseline = "main",
[Parameter(Mandatory = $false)][string] $Job = "Default",
[Parameter(Mandatory = $false)][string[]] $Runtimes = @("net10.0"),
[Parameter(Mandatory = $false)][string[]] $Runtimes = @("net11.0"),
[Parameter(Mandatory = $false)][switch] $EnableMemoryDiagnoser,
[Parameter(Mandatory = $false)][switch] $EnableEventPipeProfiler,
[Parameter(Mandatory = $false)][switch] $SkipBaseline
Expand Down Expand Up @@ -130,7 +130,7 @@ function ConvertTo-SafePathSegment {
}

$Configuration = "Release"
$Framework = "net10.0"
$Framework = "net11.0"

if (-not ($Runtimes | Where-Object { $_ -notmatch "^net4\d+$" })) {
$Framework = "net462"
Expand Down
2 changes: 1 addition & 1 deletion build/Common.nonprod.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<PropertyGroup>
<DefaultTargetFrameworkForExampleApps>net10.0</DefaultTargetFrameworkForExampleApps>
<DefaultTargetFrameworkForExampleApps>net11.0</DefaultTargetFrameworkForExampleApps>
</PropertyGroup>

<PropertyGroup Condition="$(MSBuildProjectName.EndsWith('.Tests')) OR $(MSBuildProjectName.EndsWith('.FuzzTests'))">
Expand Down
17 changes: 9 additions & 8 deletions build/Common.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<!-- TODO Restore to latest once .NET 11 is stable -->
<LangVersion>preview</LangVersion>
<SignAssembly>true</SignAssembly>
<RepoRoot>$([System.IO.Directory]::GetParent($(MSBuildThisFileDirectory)).Parent.FullName)</RepoRoot>
<StrongNameKeyBase64File>$(MSBuildThisFileDirectory)OpenTelemetry.snk.base64</StrongNameKeyBase64File>
Expand Down Expand Up @@ -97,19 +98,19 @@ finally
<NetFrameworkSupportedVersions>net481;net48;net472;net471;net47;net462</NetFrameworkSupportedVersions>

<!-- production TFMs -->
<TargetFrameworksForLibraries>net10.0;net9.0;net8.0;netstandard2.0;$(NetFrameworkMinimumSupportedVersion)</TargetFrameworksForLibraries>
<TargetFrameworksForLibrariesExtended>net10.0;net9.0;net8.0;netstandard2.1;netstandard2.0;$(NetFrameworkMinimumSupportedVersion)</TargetFrameworksForLibrariesExtended>
<TargetFrameworksForPrometheusAspNetCore>net10.0;net9.0;net8.0</TargetFrameworksForPrometheusAspNetCore>
<TargetFrameworksForLibraries>net11.0;net10.0;netstandard2.0;$(NetFrameworkMinimumSupportedVersion)</TargetFrameworksForLibraries>
<TargetFrameworksForLibrariesExtended>net11.0;net10.0;netstandard2.1;netstandard2.0;$(NetFrameworkMinimumSupportedVersion)</TargetFrameworksForLibrariesExtended>
<TargetFrameworksForPrometheusAspNetCore>net11.0;net10.0</TargetFrameworksForPrometheusAspNetCore>
<TargetFrameworksRequiringSystemTextJsonDirectReference>netstandard2.1;netstandard2.0;$(NetFrameworkMinimumSupportedVersion)</TargetFrameworksRequiringSystemTextJsonDirectReference>

<!-- non-production TFMs -->
<TargetFrameworksForAspNetCoreTests>net10.0;net9.0;net8.0</TargetFrameworksForAspNetCoreTests>
<TargetFrameworksForAotCompatibilityTests>net10.0;net9.0;net8.0</TargetFrameworksForAotCompatibilityTests>
<TargetFrameworksForDocs>net10.0;net9.0;net8.0</TargetFrameworksForDocs>
<TargetFrameworksForAspNetCoreTests>net11.0;net10.0</TargetFrameworksForAspNetCoreTests>
<TargetFrameworksForAotCompatibilityTests>net11.0;net10.0</TargetFrameworksForAotCompatibilityTests>
<TargetFrameworksForDocs>net11.0;net10.0</TargetFrameworksForDocs>
<TargetFrameworksForDocs Condition="$(OS) == 'Windows_NT' And '$(UsingMicrosoftNETSdkWeb)' != 'True'">
$(TargetFrameworksForDocs);$(NetFrameworkSupportedVersions)
</TargetFrameworksForDocs>
<TargetFrameworksForTests>net10.0;net9.0;net8.0</TargetFrameworksForTests>
<TargetFrameworksForTests>net11.0;net10.0</TargetFrameworksForTests>
<TargetFrameworksForTests Condition="$(OS) == 'Windows_NT'">
$(TargetFrameworksForTests);$(NetFrameworkMinimumSupportedVersion)
</TargetFrameworksForTests>
Expand Down
2 changes: 1 addition & 1 deletion build/docker-compose.net10.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ services:
args:
PUBLISH_FRAMEWORK: net10.0
TEST_SDK_VERSION: "10.0"
BUILD_SDK_VERSION: "10.0"
BUILD_SDK_VERSION: "11.0"
7 changes: 7 additions & 0 deletions build/docker-compose.net11.0.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
services:
tests:
build:
args:
PUBLISH_FRAMEWORK: net11.0
TEST_SDK_VERSION: "11.0"
BUILD_SDK_VERSION: "11.0"
7 changes: 0 additions & 7 deletions build/docker-compose.net8.0.yml

This file was deleted.

7 changes: 0 additions & 7 deletions build/docker-compose.net9.0.yml

This file was deleted.

1 change: 0 additions & 1 deletion examples/MicroserviceExample/Utils/Utils.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
<PackageReference Include="RabbitMQ.Client" />
</ItemGroup>

Expand Down
10 changes: 4 additions & 6 deletions examples/MicroserviceExample/WebApi/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
ARG SDK_VERSION=10.0
FROM mcr.microsoft.com/dotnet/sdk:8.0.423@sha256:89ce6291bde9acdf59594e79fb8277c6d84c46e4b1f5bf126a4f18766e4bd597 AS dotnet-sdk-8.0
FROM mcr.microsoft.com/dotnet/sdk:9.0.316@sha256:ee0d20fbc3dfc60ae2d9d9115a9b750c18576a47f24073119dd09d93e072cb89 AS dotnet-sdk-9.0
ARG SDK_VERSION=11.0
FROM mcr.microsoft.com/dotnet/sdk:10.0.302@sha256:ed034a8bf0b24ded0cbbac07e17825d8e9ebfe21e308191d0f7421eaf5ad4664 AS dotnet-sdk-10.0
FROM mcr.microsoft.com/dotnet/sdk:11.0.100-preview.6@sha256:030c48b4cf79d68d5cae35afb9e529ce66bc7d40397ac11a8a52fc8e14ced226 AS dotnet-sdk-11.0

FROM dotnet-sdk-${SDK_VERSION} AS build
ARG PUBLISH_CONFIGURATION=Release
ARG PUBLISH_FRAMEWORK=net10.0
ARG PUBLISH_FRAMEWORK=net11.0
WORKDIR /app
COPY . ./
RUN dotnet publish ./examples/MicroserviceExample/WebApi -c "${PUBLISH_CONFIGURATION}" -f "${PUBLISH_FRAMEWORK}" -o /out -p:IntegrationBuild=true

FROM mcr.microsoft.com/dotnet/aspnet:8.0.29@sha256:9822a6201c64c9f38b8a190832a7ae21cd30150d509b3ea170fd83b4f4e6166a AS dotnet-aspnet-8.0
FROM mcr.microsoft.com/dotnet/aspnet:9.0.18@sha256:8b9f90e53d41154d42e537517aef22e8fe497baabd43e423d5f2edafd06f04f6 AS dotnet-aspnet-9.0
FROM mcr.microsoft.com/dotnet/aspnet:10.0.10@sha256:1fa23fc4872d95fd71c2833ebe65d7e84a43b2d51a31d119516852f13d9505a7 AS dotnet-aspnet-10.0
FROM mcr.microsoft.com/dotnet/aspnet:11.0.0-preview.6@sha256:b2ebd23166ecc80db02c1086ccfdf266ce738d315036f44303bd2e03bd9d7907 AS dotnet-aspnet-11.0

FROM dotnet-aspnet-${SDK_VERSION} AS runtime
WORKDIR /app
Expand Down
10 changes: 4 additions & 6 deletions examples/MicroserviceExample/WorkerService/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
ARG SDK_VERSION=10.0
ARG SDK_VERSION=11.0

FROM mcr.microsoft.com/dotnet/sdk:8.0.423@sha256:89ce6291bde9acdf59594e79fb8277c6d84c46e4b1f5bf126a4f18766e4bd597 AS dotnet-sdk-8.0
FROM mcr.microsoft.com/dotnet/sdk:9.0.316@sha256:ee0d20fbc3dfc60ae2d9d9115a9b750c18576a47f24073119dd09d93e072cb89 AS dotnet-sdk-9.0
FROM mcr.microsoft.com/dotnet/sdk:10.0.302@sha256:ed034a8bf0b24ded0cbbac07e17825d8e9ebfe21e308191d0f7421eaf5ad4664 AS dotnet-sdk-10.0
FROM mcr.microsoft.com/dotnet/sdk:11.0.100-preview.6@sha256:030c48b4cf79d68d5cae35afb9e529ce66bc7d40397ac11a8a52fc8e14ced226 AS dotnet-sdk-11.0

FROM dotnet-sdk-${SDK_VERSION} AS build
ARG PUBLISH_CONFIGURATION=Release
ARG PUBLISH_FRAMEWORK=net10.0
ARG PUBLISH_FRAMEWORK=net11.0
WORKDIR /app
COPY . ./
RUN dotnet publish ./examples/MicroserviceExample/WorkerService -c "${PUBLISH_CONFIGURATION}" -f "${PUBLISH_FRAMEWORK}" -o /out -p:IntegrationBuild=true

FROM mcr.microsoft.com/dotnet/aspnet:8.0.29@sha256:9822a6201c64c9f38b8a190832a7ae21cd30150d509b3ea170fd83b4f4e6166a AS dotnet-aspnet-8.0
FROM mcr.microsoft.com/dotnet/aspnet:9.0.18@sha256:8b9f90e53d41154d42e537517aef22e8fe497baabd43e423d5f2edafd06f04f6 AS dotnet-aspnet-9.0
FROM mcr.microsoft.com/dotnet/aspnet:10.0.10@sha256:1fa23fc4872d95fd71c2833ebe65d7e84a43b2d51a31d119516852f13d9505a7 AS dotnet-aspnet-10.0
FROM mcr.microsoft.com/dotnet/aspnet:11.0.0-preview.6@sha256:b2ebd23166ecc80db02c1086ccfdf266ce738d315036f44303bd2e03bd9d7907 AS dotnet-aspnet-11.0

FROM dotnet-aspnet-${SDK_VERSION} AS runtime
WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"allowPrerelease": false,
"version": "10.0.302"
"version": "11.0.100-preview.6.26359.118"
}
}
31 changes: 31 additions & 0 deletions src/OpenTelemetry.Api/CompatibilitySuppressions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:OpenTelemetry.Trace.SpanKind</Target>
<Left>lib/net8.0/OpenTelemetry.Api.dll</Left>
<Right>lib/netstandard2.0/OpenTelemetry.Api.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:OpenTelemetry.Trace.StatusCode</Target>
<Left>lib/net8.0/OpenTelemetry.Api.dll</Left>
<Right>lib/netstandard2.0/OpenTelemetry.Api.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:OpenTelemetry.Trace.SpanKind</Target>
<Left>lib/net9.0/OpenTelemetry.Api.dll</Left>
<Right>lib/netstandard2.0/OpenTelemetry.Api.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:OpenTelemetry.Trace.StatusCode</Target>
<Left>lib/net9.0/OpenTelemetry.Api.dll</Left>
<Right>lib/netstandard2.0/OpenTelemetry.Api.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
</Suppressions>
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public sealed class B3Propagator : TextMapPropagator

private static readonly HashSet<string> AllFields = [XB3TraceId, XB3SpanId, XB3ParentSpanId, XB3Sampled, XB3Flags];

private static readonly HashSet<string> SampledValues = new(StringComparer.Ordinal) { SampledValue, LegacySampledValue };
private static readonly HashSet<string> SampledValues = [with(StringComparer.Ordinal), SampledValue, LegacySampledValue];

private readonly bool singleHeader;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ internal static bool TryExtractBaggage(
continue;
}

baggageDictionary ??= new(StringComparer.Ordinal);
baggageDictionary ??= [with(StringComparer.Ordinal)];
baggageDictionary[key] = value;
}
}
Expand Down
Loading