Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 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
40420cb
Merge branch 'main' into dotnet-vnext
martincostello Apr 15, 2026
5454255
Update to .NET 11 preview 3
martincostello Apr 15, 2026
dfc4a0c
Merge branch 'main' into dotnet-vnext
martincostello Apr 21, 2026
8ce5ba5
[Infra] Fix build
martincostello Apr 21, 2026
4870d7c
Merge branch 'main' into dotnet-vnext
martincostello Apr 23, 2026
897ca68
[Infra] Update TFMs
martincostello Apr 23, 2026
5e03a70
[Infra] Fix build
martincostello Apr 23, 2026
ab3863c
Merge branch 'main' into dotnet-vnext
martincostello Apr 24, 2026
f75ea3a
Merge branch 'main' into dotnet-vnext
martincostello Apr 27, 2026
e2cf38d
[Infra] Fix build
martincostello Apr 27, 2026
757f8e1
Merge branch 'main' into dotnet-vnext
martincostello Apr 28, 2026
f061f6c
[Instana] Fix compiler warnings
martincostello Apr 28, 2026
516ce9f
[AspNetCore] Do not add built-in tags for v11+ (#2)
martincostello Apr 30, 2026
b498842
Merge branch 'main' into dotnet-vnext
martincostello Apr 30, 2026
cfe618f
[AspNetCore] Address comments
martincostello May 1, 2026
6c16dd0
Merge branch 'main' into dotnet-vnext
martincostello May 7, 2026
dd5d788
[Infra] Fix build
martincostello May 7, 2026
15b1de3
[Infra] Fix benchmark
martincostello May 7, 2026
c4826c4
Merge branch 'main' into dotnet-vnext
martincostello May 7, 2026
a4370d5
Merge branch 'main' into dotnet-vnext
martincostello May 12, 2026
a53c86b
[Infra] Update to .NET 11 preview 4 (#3)
martincostello May 12, 2026
144ae92
Merge branch 'main' into dotnet-vnext
martincostello May 14, 2026
2dc4ff5
[Infra] Update package version overrides
martincostello May 14, 2026
88c6341
[SqlClient] Fix trace flags to handle random
martincostello May 15, 2026
3700122
[Extensions.AWS] Fix sampling behaviour
martincostello May 15, 2026
1b3baf0
Merge branch 'main' into dotnet-vnext
martincostello May 18, 2026
3fa4838
[Infra] Fix build
martincostello May 18, 2026
592649c
Merge branch 'main' into dotnet-vnext
martincostello May 19, 2026
a8717e3
[AspNetCore] Fix merge
martincostello May 19, 2026
f3a4e73
[Infra] Fix code analysis warnings
martincostello May 19, 2026
2ad4c15
Merge branch 'main' into dotnet-vnext
martincostello May 19, 2026
32211da
Merge branch 'main' into dotnet-vnext
martincostello May 22, 2026
4e3fb86
Merge branch 'main' into dotnet-vnext
martincostello May 30, 2026
48776ed
Merge branch 'main' into dotnet-vnext
martincostello Jun 2, 2026
d9d00d9
Merge branch 'main' into dotnet-vnext
martincostello Jun 11, 2026
f2ba3ba
Update to .NET 11 preview 5
martincostello Jun 11, 2026
32e202d
[Infra] Fix new code analysis warnings
martincostello Jun 11, 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 @@ -37,7 +37,7 @@ jobs:
- ubuntu-24.04
# renovate: datasource=github-runners depType=github-runner
- windows-2025
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 @@ -260,7 +260,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" ]'
trigger: ${{ github.event_name }}

build-test-instrumentation-aws:
Expand All @@ -273,7 +273,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" ]'
trigger: ${{ github.event_name }}

build-test-instrumentation-cassandra:
Expand Down Expand Up @@ -334,7 +334,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" ]'
trigger: ${{ github.event_name }}

build-test-instrumentation-grpccore:
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
35 changes: 15 additions & 20 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,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.5.26302.115,)" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="[11.0.0-preview.5.26302.115,)" />
<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 @@ -58,21 +58,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.5.26302.115,)" />
<PackageVersion Update="Microsoft.Extensions.Options" Version="[11.0.0-preview.5.26302.115,)" />
</ItemGroup>

<ItemGroup Label="Production other packages">
<PackageVersion Include="Amazon.Lambda.APIGatewayEvents" Version="[2.7.0,)" />
Expand Down Expand Up @@ -140,9 +136,8 @@
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.2.1" />
<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.Cassandra" Version="4.12.0" />
<PackageVersion Include="Testcontainers.Kafka" Version="4.12.0" />
<PackageVersion Include="Testcontainers.MsSql" Version="4.12.0" />
Expand All @@ -153,17 +148,17 @@
<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.17" />
<PackageVersion Update="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.17" />
<PackageVersion Update="Microsoft.AspNetCore.SignalR.Client" Version="9.0.17" />
<PackageVersion Update="Microsoft.AspNetCore.TestHost" Version="9.0.17" />
</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.9" />
<PackageVersion Update="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.9" />
<PackageVersion Update="Microsoft.AspNetCore.SignalR.Client" Version="10.0.9" />
<PackageVersion Update="Microsoft.AspNetCore.TestHost" Version="10.0.9" />
</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.5.26302.115" />
<PackageVersion Update="Microsoft.AspNetCore.Mvc.Testing" Version="11.0.0-preview.5.26302.115" />
<PackageVersion Update="Microsoft.AspNetCore.SignalR.Client" Version="11.0.0-preview.5.26302.115" />
<PackageVersion Update="Microsoft.AspNetCore.TestHost" Version="11.0.0-preview.5.26302.115" />
</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
15 changes: 9 additions & 6 deletions examples/InfluxDB/Examples.InfluxDB/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,8 @@
using OpenTelemetry.Metrics;
using OpenTelemetry.Resources;

Action<ResourceBuilder> configureResource = r => r.AddService(
serviceName: "influx-exporter-test",
serviceVersion: typeof(Program).Assembly.GetName().Version?.ToString() ?? "unknown",
serviceInstanceId: Environment.MachineName);

using var meterProvider = Sdk.CreateMeterProviderBuilder()
.ConfigureResource(configureResource)
.ConfigureResource(ConfigureResource)
.AddRuntimeInstrumentation()
.AddInfluxDBMetricsExporter(options =>
{
Expand All @@ -27,3 +22,11 @@
meterProvider.ForceFlush();

await Task.Delay(TimeSpan.FromSeconds(10));

static void ConfigureResource(ResourceBuilder builder)
{
builder.AddService(
serviceName: "influx-exporter-test",
serviceVersion: typeof(Program).Assembly.GetName().Version?.ToString() ?? "unknown",
serviceInstanceId: Environment.MachineName);
}
3 changes: 1 addition & 2 deletions examples/wcf/shared/Examples.Wcf.Shared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
<!-- Upgrade transitive references to resolve NuGet Audit warnings -->
<ItemGroup>
<PackageReference Include="System.Drawing.Common" />
<PackageReference Include="System.Security.Cryptography.Xml" Condition=" '$(TargetFramework)' != 'net8.0' "/>
<PackageReference Include="System.Security.Cryptography.Xml" VersionOverride="[8.0.3,)" Condition=" '$(TargetFramework)' == 'net8.0' " />
<PackageReference Include="System.Security.Cryptography.Xml" VersionOverride="10.0.9" Condition=" '$(TargetFramework)' == 'net10.0' " />
</ItemGroup>

<ItemGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier(`$(TargetFramework)`))' == '.NETFramework'">
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.301"
"version": "11.0.100-preview.5.26302.115"
}
}
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 @@ -46,7 +46,9 @@ public void AddExtensionAttribute(KeyValuePair<string, object?> attribute)
Debug.Assert(fieldInformation?.FieldName != null, "fieldInformation.FieldName was null");
Debug.Assert(fieldInformation?.EncodedFieldName.EncodedUtf8Bytes.Length > 0, "fieldInformation.EncodedFieldName was empty");

#pragma warning disable IDE0370 // Remove unnecessary suppression
var extensionName = fieldInformation!.ExtensionName!;
#pragma warning restore IDE0370 // Remove unnecessary suppression

#if NET
ref var lookupIndexRef = ref CollectionsMarshal.GetValueRefOrAddDefault(this.keys, extensionName, out var existed);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,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>
Loading
Loading