Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
91a8430
Support .NET 11
martincostello Feb 14, 2026
2a3d8a0
Fix binding redirects
martincostello Feb 14, 2026
52b218e
Add link to issue
martincostello Feb 14, 2026
5b5960a
Update CompatibilitySuppressions
martincostello Feb 14, 2026
a053a17
Update CompatibilitySuppressions
martincostello Feb 14, 2026
14b0885
Update CompatibilitySuppressions
martincostello Feb 14, 2026
310789a
[AspNetCore] Update routing tests
martincostello Feb 16, 2026
c717fbc
Merge branch 'main' into dotnet-vnext
martincostello Mar 11, 2026
cf29edd
Merge branch 'main' into dotnet-vnext
martincostello Mar 13, 2026
dbad0c5
Update to .NET 11 preview 2
martincostello Mar 13, 2026
633075d
Fix new code analysis warnings
martincostello Mar 13, 2026
3957f3d
Fix tests
martincostello Mar 13, 2026
6597d96
Update .NET 11 container images
martincostello Mar 13, 2026
5c98245
Fix more analysis warnings
martincostello Mar 13, 2026
e27340e
Fix more analysis warnings
martincostello Mar 13, 2026
5090522
Merge branch 'main' into dotnet-vnext
martincostello Mar 16, 2026
91d093c
Merge branch 'main' into dotnet-vnext
martincostello Mar 17, 2026
54c9d07
Update Dockerfiles
martincostello Mar 17, 2026
b659bb3
Add net11.0 TFMs
martincostello Mar 17, 2026
d27695b
Add link to issue
martincostello Mar 17, 2026
d3fbf57
Merge branch 'main' into dotnet-vnext
martincostello Mar 18, 2026
086b939
Suppress IDE0370 warning
martincostello Mar 18, 2026
b83bcc1
Merge branch 'main' into dotnet-vnext
martincostello Mar 18, 2026
d37dc09
[AspNetCore] Add tests for QUERY support
martincostello Mar 18, 2026
dd93849
Merge branch 'main' into dotnet-vnext
martincostello Mar 18, 2026
e72c216
Merge branch 'main' into dotnet-vnext
martincostello Mar 19, 2026
6943b9b
Merge branch 'main' into dotnet-vnext
martincostello Mar 20, 2026
8e0c8ef
Merge branch 'main' into dotnet-vnext
martincostello Mar 20, 2026
17832fd
Fix-up merge
martincostello Mar 20, 2026
6ee570d
Merge branch 'main' into dotnet-vnext
martincostello Mar 27, 2026
3628159
[AspNetCore] Fix tests
martincostello Mar 27, 2026
f52f4de
Merge branch 'main' into dotnet-vnext
martincostello Apr 1, 2026
1b248e1
[Redis] Remove NET8_0
martincostello Apr 1, 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
2 changes: 1 addition & 1 deletion .github/workflows/Component.BuildTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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
test-case-filter:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
fail-fast: false
matrix:
os: [ windows-latest, ubuntu-24.04 ]
version: [ net462, net8.0, net10.0 ]
version: [ net462, net10.0, net11.0 ]
exclude:
- os: ubuntu-24.04
version: net462
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ jobs:
with:
project-name: OpenTelemetry.Instrumentation.AspNetCore
code-cov-name: Instrumentation.AspNetCore
tfm-list: '[ "net8.0", "net9.0", "net10.0" ]'
tfm-list: '[ "net10.0", "net11.0" ]'

build-test-instrumentation-aws:
needs: detect-changes
Expand All @@ -243,7 +243,7 @@ jobs:
with:
project-name: OpenTelemetry.Instrumentation.AWS
code-cov-name: Instrumentation.AWS
tfm-list: '[ "net472", "net8.0", "net9.0", "net10.0" ]'
tfm-list: '[ "net472", "net10.0", "net11.0" ]'

build-test-instrumentation-cassandra:
needs: detect-changes
Expand Down Expand Up @@ -319,7 +319,7 @@ jobs:
with:
project-name: OpenTelemetry.Instrumentation.EventCounters
code-cov-name: Instrumentation.EventCounters
tfm-list: '[ "net8.0", "net9.0", "net10.0" ]'
tfm-list: '[ "net10.0", "net11.0" ]'

build-test-instrumentation-grpccore:
needs: detect-changes
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [net8.0, net10.0]
version: [net10.0, net11.0]
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

Expand All @@ -32,7 +32,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [net8.0, net10.0]
version: [net10.0, net11.0]
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

Expand All @@ -47,7 +47,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [net8.0, net10.0]
version: [net10.0, net11.0]
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verifyaotcompat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
matrix:
os: [ ubuntu-24.04, windows-latest ]
version: [ net8.0, net9.0, net10.0 ]
version: [ net10.0, net11.0 ]

runs-on: ${{ matrix.os }}
steps:
Expand Down
33 changes: 14 additions & 19 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
-->
<ItemGroup Label="Production .NET packages">
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="[10.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="[10.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="[11.0.0-preview.2.26159.112,)" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="[11.0.0-preview.2.26159.112,)" />
<PackageVersion Include="Microsoft.Owin" Version="[4.2.2,)" />
<PackageVersion Include="Microsoft.Win32.Registry" Version="[5.0.0,)" />
<PackageVersion Include="System.Drawing.Common" Version="[4.7.2,)" />
Expand All @@ -56,21 +56,17 @@
<PackageVersion Include="System.Security.Cryptography.Xml" Version="[4.7.1,)" />
<PackageVersion Include="System.ServiceModel.Primitives" Version="[4.7.0,)" />
<PackageVersion Include="System.Text.Encodings.Web" Version="[4.7.2,)" />
<PackageVersion Include="System.Text.Json" Version="[8.0.5,)" />
<PackageVersion Include="System.Text.Json" Version="[10.0.0,)" />
</ItemGroup>
<!-- Version overrides for specific netX.0 TFMs -->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="[8.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Options" Version="[8.0.0,)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="[9.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Options" Version="[9.0.0,)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="[10.0.0,)" />
<PackageVersion Update="Microsoft.Extensions.Options" Version="[10.0.0,)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net11.0'">
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="[11.0.0-preview.2.26159.112,)" />
<PackageVersion Update="Microsoft.Extensions.Options" Version="[11.0.0-preview.2.26159.112,)" />
</ItemGroup>

<ItemGroup Label="Production other packages">
<PackageVersion Include="Amazon.Lambda.APIGatewayEvents" Version="[2.7.0,)" />
Expand Down Expand Up @@ -137,25 +133,24 @@
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.1.7" />
<PackageVersion Include="System.Reactive.Core" Version="6.1.0" />
<PackageVersion Include="System.Reflection.DispatchProxy" Version="4.8.2" />
<!-- These WCF dependencies are pinned until we drop support for net8.0 and net9.0 -->
<PackageVersion Include="System.ServiceModel.Http" Version="[8.1.2,)" />
<PackageVersion Include="System.ServiceModel.NetTcp" Version="[8.1.2,)" />
<PackageVersion Include="System.ServiceModel.Http" Version="10.0.652802" />
<PackageVersion Include="System.ServiceModel.NetTcp" Version="10.0.652802" />
<PackageVersion Include="Testcontainers.MsSql" Version="4.11.0" />
<PackageVersion Include="Testcontainers.MySql" Version="4.11.0" />
<PackageVersion Include="Testcontainers.PostgreSql" Version="4.11.0" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="[2.8.2,)" />
<PackageVersion Include="Xunit.SkippableFact" Version="1.5.61" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" Label="Non-production packages, such as for examples and tests, for .NET 9">
<PackageVersion Update="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.14" />
<PackageVersion Update="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.14" />
<PackageVersion Update="Microsoft.AspNetCore.SignalR.Client" Version="9.0.14" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))" Label="Non-production packages, such as for examples and tests, for .NET 10">
<PackageVersion Update="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.5" />
<PackageVersion Update="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.5" />
<PackageVersion Update="Microsoft.AspNetCore.SignalR.Client" Version="10.0.5" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))" Label="Non-production packages, such as for examples and tests, for .NET 11">
<PackageVersion Update="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="11.0.0-preview.2.26159.112" />
<PackageVersion Update="Microsoft.AspNetCore.Mvc.Testing" Version="11.0.0-preview.2.26159.112" />
<PackageVersion Update="Microsoft.AspNetCore.SignalR.Client" Version="11.0.0-preview.2.26159.112" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion build/Common.nonprod.props
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<PropertyGroup Label="Target frameworks used in by test projects">
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
<SupportedNetTargets>net10.0;net9.0;net8.0</SupportedNetTargets>
<SupportedNetTargets>net11.0;net10.0</SupportedNetTargets>
</PropertyGroup>

<ItemGroup Condition="'$(IsTestProject)' == 'true'">
Expand Down
4 changes: 2 additions & 2 deletions build/Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)debug.snk</AssemblyOriginatorKeyFile>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<NetFrameworkMinimumSupportedVersion>net462</NetFrameworkMinimumSupportedVersion>
<NetMinimumSupportedVersion>net8.0</NetMinimumSupportedVersion>
<NetMinimumSupportedVersion>net10.0</NetMinimumSupportedVersion>
<NetStandardMinimumSupportedVersion>netstandard2.0</NetStandardMinimumSupportedVersion>
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
<TargetFrameworksForLibraries>net10.0;$(NetMinimumSupportedVersion);$(NetStandardMinimumSupportedVersion)</TargetFrameworksForLibraries>
<TargetFrameworksForLibraries>net11.0;$(NetMinimumSupportedVersion);$(NetStandardMinimumSupportedVersion)</TargetFrameworksForLibraries>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AnalysisLevel>latest-all</AnalysisLevel>
<Nullable>enable</Nullable>
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 @@ -6,4 +6,4 @@ services:
args:
PUBLISH_FRAMEWORK: net10.0
TEST_SDK_VERSION: "10.0"
BUILD_SDK_VERSION: "10.0"
BUILD_SDK_VERSION: "11.0"
9 changes: 9 additions & 0 deletions build/docker-compose.net11.0.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: '3.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.

14 changes: 9 additions & 5 deletions examples/AspNet/Web.config
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,27 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Configuration" culture="neutral" publicKeyToken="adb9793829ddae60" />
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" culture="neutral" publicKeyToken="adb9793829ddae60" />
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" culture="neutral" publicKeyToken="adb9793829ddae60" />
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Options" culture="neutral" publicKeyToken="adb9793829ddae60" />
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Primitives" culture="neutral" publicKeyToken="adb9793829ddae60" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"sdk": {
"rollForward": "latestMajor",
"allowPrerelease": false,
"version": "10.0.201"
"version": "11.0.100-preview.2.26159.112"
}
}
3 changes: 1 addition & 2 deletions opentelemetry-dotnet-contrib.slnx
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
<File Path="build/Common.targets" />
<File Path="build/debug.snk" />
<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/opentelemetry-icon-color.png" />
<File Path="build/OpenTelemetryContrib.prod.ruleset" />
<File Path="build/OpenTelemetryContrib.test.ruleset" />
Expand Down
17 changes: 17 additions & 0 deletions src/OpenTelemetry.Exporter.Geneva/CompatibilitySuppressions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?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.Exporter.Geneva.EventNameExportMode</Target>
<Left>lib/net8.0/OpenTelemetry.Exporter.Geneva.dll</Left>
<Right>lib/netstandard2.0/OpenTelemetry.Exporter.Geneva.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:OpenTelemetry.Exporter.Geneva.ExceptionStackExportMode</Target>
<Left>lib/net8.0/OpenTelemetry.Exporter.Geneva.dll</Left>
<Right>lib/netstandard2.0/OpenTelemetry.Exporter.Geneva.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
</Suppressions>
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,12 @@ public ConnectionStringBuilder([NotNull] string? connectionString)
#else
var index = token.IndexOf(EqualSign);
#endif

#if NET11_0_OR_GREATER
if (index == -1 || index != token.LastIndexOf(EqualSign, StringComparison.Ordinal))
#else
if (index == -1 || index != token.LastIndexOf(EqualSign))
#endif
{
continue;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?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.Exporter.OneCollector.OneCollectorExporterSerializationExceptionStackTraceHandlingType</Target>
<Left>lib/net8.0/OpenTelemetry.Exporter.OneCollector.dll</Left>
<Right>lib/netstandard2.1/OpenTelemetry.Exporter.OneCollector.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
</Suppressions>
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,14 @@
<PackageReference Include="OpenTelemetry" />
</ItemGroup>

<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
<PackageReference Include="System.Text.Json" VersionOverride="[6.0.10,)" />
</ItemGroup>

<ItemGroup>
<Reference Include="System.Net.Http" Condition="'$([MSBuild]::GetTargetFrameworkIdentifier(`$(TargetFramework)`))' == '.NETFramework'" />
</ItemGroup>

<!-- This package is explicitly upgraded for .NET 8 to fix native AoT compatibility issues -->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" VersionOverride="8.0.2" />
</ItemGroup>

<ItemGroup>
<Compile Include="$(RepoRoot)\src\Shared\ExceptionExtensions.cs" Link="Includes\ExceptionExtensions.cs" />
<Compile Include="$(RepoRoot)\src\Shared\Guard.cs" Link="Includes\Guard.cs" />
Expand Down
17 changes: 17 additions & 0 deletions src/OpenTelemetry.Extensions.AWS/CompatibilitySuppressions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?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>CP0002</DiagnosticId>
<Target>M:OpenTelemetry.Extensions.AWS.AWSXRayIdGenerator.ReplaceTraceId</Target>
<Left>lib/net8.0/OpenTelemetry.Extensions.AWS.dll</Left>
<Right>lib/netstandard2.0/OpenTelemetry.Extensions.AWS.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:OpenTelemetry.Extensions.AWS.AWSXRayIdGenerator.ReplaceTraceId(OpenTelemetry.Trace.Sampler)</Target>
<Left>lib/net8.0/OpenTelemetry.Extensions.AWS.dll</Left>
<Right>lib/netstandard2.0/OpenTelemetry.Extensions.AWS.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
</Suppressions>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?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.Instrumentation.AWS.SemanticConventionVersion</Target>
<Left>lib/net8.0/OpenTelemetry.Instrumentation.AWS.dll</Left>
<Right>lib/netstandard2.0/OpenTelemetry.Instrumentation.AWS.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
</Suppressions>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?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.Instrumentation.AWSLambda.SemanticConventionVersion</Target>
<Left>lib/net8.0/OpenTelemetry.Instrumentation.AWSLambda.dll</Left>
<Right>lib/netstandard2.0/OpenTelemetry.Instrumentation.AWSLambda.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
</Suppressions>
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,11 @@ internal static PropagationContext ExtractParentContext(SNSEvent.SNSMessage? mes
var body = sqsMessage.Body;
if (body != null &&
#if NET
#if NET11_0_OR_GREATER
body.TrimStart().StartsWith('{', StringComparison.Ordinal) &&
#else
body.TrimStart().StartsWith('{') &&
#endif
body.Contains(SnsMessageAttributes, StringComparison.Ordinal))
#else
body.TrimStart().StartsWith("{", StringComparison.Ordinal) &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<PackageReference Include="System.Text.Json" />
</ItemGroup>

<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
<PackageReference Update="System.Text.Json" VersionOverride="[6.0.10,)" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ internal static class HttpContextExtensions
var endpoint = GetOriginalEndpoint(context);
var route = endpoint?.Metadata.GetMetadata<IRouteDiagnosticsMetadata>()?.Route;

#if !NET11_0_OR_GREATER
if (string.IsNullOrEmpty(route))
{
// For Razor Pages, the route template may be empty (e.g., for the Index page mapped to root "/").
Expand All @@ -32,7 +31,6 @@ internal static class HttpContextExtensions
return pageValue;
}
}
#endif

return route is not null ? ResolveHttpRoute(route) : null;
}
Expand Down
Loading