From dacaf073799b57f21d62d7427b516a591dbaafb6 Mon Sep 17 00:00:00 2001 From: joegoldman2 <147369450+joegoldman@users.noreply.github.com> Date: Tue, 1 Oct 2024 05:38:50 +0000 Subject: [PATCH 1/5] [Exporter.OneCollector] Remove .NET 6 target --- .../CompatibilitySuppressions.xml | 44 ++++++++++++++++++- .../Internal/CallbackManager.cs | 2 +- .../Serialization/BatchSerializationResult.cs | 2 +- .../CommonSchemaJsonSerializationHelper.cs | 4 +- .../Transports/TransportSendRequest.cs | 2 +- ...OpenTelemetry.Exporter.OneCollector.csproj | 7 ++- ...ry.Exporter.OneCollector.Benchmarks.csproj | 6 +-- ...lemetry.Exporter.OneCollector.Tests.csproj | 4 +- 8 files changed, 56 insertions(+), 15 deletions(-) diff --git a/src/OpenTelemetry.Exporter.OneCollector/CompatibilitySuppressions.xml b/src/OpenTelemetry.Exporter.OneCollector/CompatibilitySuppressions.xml index c1b34f2891..1a2f58849c 100644 --- a/src/OpenTelemetry.Exporter.OneCollector/CompatibilitySuppressions.xml +++ b/src/OpenTelemetry.Exporter.OneCollector/CompatibilitySuppressions.xml @@ -2,11 +2,53 @@ + + CP0003 + OpenTelemetry.Exporter.OneCollector, Version=1.6.1.0, Culture=neutral, PublicKeyToken=7bd6737fe5b67e3c + lib/net462/OpenTelemetry.Exporter.OneCollector.dll + lib/net462/OpenTelemetry.Exporter.OneCollector.dll + true + + + CP0003 + OpenTelemetry.Exporter.OneCollector, Version=1.6.1.0, Culture=neutral, PublicKeyToken=7bd6737fe5b67e3c + lib/net6.0/OpenTelemetry.Exporter.OneCollector.dll + lib/netstandard2.1/OpenTelemetry.Exporter.OneCollector.dll + true + + + CP0003 + OpenTelemetry.Exporter.OneCollector, Version=1.6.1.0, Culture=neutral, PublicKeyToken=7bd6737fe5b67e3c + lib/net7.0/OpenTelemetry.Exporter.OneCollector.dll + lib/netstandard2.1/OpenTelemetry.Exporter.OneCollector.dll + true + + + CP0003 + OpenTelemetry.Exporter.OneCollector, Version=1.6.1.0, Culture=neutral, PublicKeyToken=7bd6737fe5b67e3c + lib/netstandard2.0/OpenTelemetry.Exporter.OneCollector.dll + lib/netstandard2.0/OpenTelemetry.Exporter.OneCollector.dll + true + + + CP0003 + OpenTelemetry.Exporter.OneCollector, Version=1.6.1.0, Culture=neutral, PublicKeyToken=7bd6737fe5b67e3c + lib/netstandard2.1/OpenTelemetry.Exporter.OneCollector.dll + lib/netstandard2.1/OpenTelemetry.Exporter.OneCollector.dll + true + + + CP0008 + T:OpenTelemetry.Exporter.OneCollector.OneCollectorExporterSerializationExceptionStackTraceHandlingType + lib/net6.0/OpenTelemetry.Exporter.OneCollector.dll + lib/netstandard2.1/OpenTelemetry.Exporter.OneCollector.dll + true + CP0008 T:OpenTelemetry.Exporter.OneCollector.OneCollectorExporterSerializationExceptionStackTraceHandlingType lib/net7.0/OpenTelemetry.Exporter.OneCollector.dll - lib/net6.0/OpenTelemetry.Exporter.OneCollector.dll + lib/netstandard2.1/OpenTelemetry.Exporter.OneCollector.dll true diff --git a/src/OpenTelemetry.Exporter.OneCollector/Internal/CallbackManager.cs b/src/OpenTelemetry.Exporter.OneCollector/Internal/CallbackManager.cs index 513bcf83d5..ad33c02d29 100644 --- a/src/OpenTelemetry.Exporter.OneCollector/Internal/CallbackManager.cs +++ b/src/OpenTelemetry.Exporter.OneCollector/Internal/CallbackManager.cs @@ -20,7 +20,7 @@ public IDisposable Add(T callback) lock (this.lockObject) { -#if NET8_0_OR_GREATER +#if NET ObjectDisposedException.ThrowIf(this.disposed, nameof(CallbackManager)); #else if (this.disposed) diff --git a/src/OpenTelemetry.Exporter.OneCollector/Internal/Serialization/BatchSerializationResult.cs b/src/OpenTelemetry.Exporter.OneCollector/Internal/Serialization/BatchSerializationResult.cs index c3cc86222f..d7b6b94b86 100644 --- a/src/OpenTelemetry.Exporter.OneCollector/Internal/Serialization/BatchSerializationResult.cs +++ b/src/OpenTelemetry.Exporter.OneCollector/Internal/Serialization/BatchSerializationResult.cs @@ -5,7 +5,7 @@ namespace OpenTelemetry.Exporter.OneCollector; internal readonly struct BatchSerializationResult { -#if NET8_0_OR_GREATER +#if NET public required int NumberOfItemsSerialized { get; init; } public required int NumberOfItemsDropped { get; init; } diff --git a/src/OpenTelemetry.Exporter.OneCollector/Internal/Serialization/CommonSchemaJsonSerializationHelper.cs b/src/OpenTelemetry.Exporter.OneCollector/Internal/Serialization/CommonSchemaJsonSerializationHelper.cs index db94e2d1fd..dd3e4a4539 100644 --- a/src/OpenTelemetry.Exporter.OneCollector/Internal/Serialization/CommonSchemaJsonSerializationHelper.cs +++ b/src/OpenTelemetry.Exporter.OneCollector/Internal/Serialization/CommonSchemaJsonSerializationHelper.cs @@ -101,7 +101,7 @@ public static void SerializeValueToJson(object? value, Utf8JsonWriter writer) writer.WriteStringValue(v); return; -#if NET8_0_OR_GREATER +#if NET case DateOnly v: JsonMetadataServices.DateOnlyConverter.Write(writer, v, null!); return; @@ -111,7 +111,7 @@ public static void SerializeValueToJson(object? value, Utf8JsonWriter writer) JsonMetadataServices.TimeSpanConverter.Write(writer, v, null!); return; -#if NET8_0_OR_GREATER +#if NET case TimeOnly v: JsonMetadataServices.TimeOnlyConverter.Write(writer, v, null!); return; diff --git a/src/OpenTelemetry.Exporter.OneCollector/Internal/Transports/TransportSendRequest.cs b/src/OpenTelemetry.Exporter.OneCollector/Internal/Transports/TransportSendRequest.cs index 2c71d15b6d..7ed65321d4 100644 --- a/src/OpenTelemetry.Exporter.OneCollector/Internal/Transports/TransportSendRequest.cs +++ b/src/OpenTelemetry.Exporter.OneCollector/Internal/Transports/TransportSendRequest.cs @@ -20,7 +20,7 @@ public TransportSendRequest() #endif } -#if NET8_0_OR_GREATER +#if NET public required string ItemType { get; init; } public required OneCollectorExporterSerializationFormatType ItemSerializationFormat { get; init; } diff --git a/src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj b/src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj index 3b3c96d5e3..f35f18c4c2 100644 --- a/src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj +++ b/src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj @@ -1,11 +1,10 @@ - true - An OpenTelemetry .NET exporter that sends telemetry to Microsoft OneCollector - OpenTelemetry Authors - net8.0;net6.0;netstandard2.1;netstandard2.0 + net8.0;netstandard2.1;netstandard2.0 $(TargetFrameworks);net462 + true + An OpenTelemetry .NET exporter that sends telemetry to Microsoft OneCollector. Exporter.OneCollector- true - $(SupportedNetTargets) + net8.0 $(TargetFrameworks);net48;net472;net471;net47;net462 + Exe + Benchmark project for OpenTelemetry .NET OneCollectorExporter. diff --git a/test/OpenTelemetry.Exporter.OneCollector.Tests/OpenTelemetry.Exporter.OneCollector.Tests.csproj b/test/OpenTelemetry.Exporter.OneCollector.Tests/OpenTelemetry.Exporter.OneCollector.Tests.csproj index 54c7e19491..db60863040 100644 --- a/test/OpenTelemetry.Exporter.OneCollector.Tests/OpenTelemetry.Exporter.OneCollector.Tests.csproj +++ b/test/OpenTelemetry.Exporter.OneCollector.Tests/OpenTelemetry.Exporter.OneCollector.Tests.csproj @@ -1,10 +1,10 @@ - Unit test project for OpenTelemetry .NET OneCollectorExporter. - $(SupportedNetTargets) + net8.0 $(TargetFrameworks);net48;net472;net471;net47;net462 + Unit test project for OpenTelemetry .NET OneCollectorExporter. From 9f8d19157427b5342af4a535be28301a2ddec055 Mon Sep 17 00:00:00 2001 From: joegoldman2 <147369450+joegoldman@users.noreply.github.com> Date: Tue, 1 Oct 2024 05:48:49 +0000 Subject: [PATCH 2/5] Add changelog entry --- src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md b/src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md index ad0bb5a576..79451efd20 100644 --- a/src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Drop support for .NET 6 as this target is no longer supported. + ([#2123](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2123)) + ## 1.10.0-alpha.1 Released 2024-Sep-06 From 0289ed69f8ff1a844d81e7cd7a20ad6cf12049a4 Mon Sep 17 00:00:00 2001 From: joegoldman2 <147369450+joegoldman@users.noreply.github.com> Date: Tue, 1 Oct 2024 06:03:49 +0000 Subject: [PATCH 3/5] Update CompatibilitySuppressions.xml --- .../CompatibilitySuppressions.xml | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/src/OpenTelemetry.Exporter.OneCollector/CompatibilitySuppressions.xml b/src/OpenTelemetry.Exporter.OneCollector/CompatibilitySuppressions.xml index 1a2f58849c..9d4d66e28f 100644 --- a/src/OpenTelemetry.Exporter.OneCollector/CompatibilitySuppressions.xml +++ b/src/OpenTelemetry.Exporter.OneCollector/CompatibilitySuppressions.xml @@ -2,41 +2,6 @@ - - CP0003 - OpenTelemetry.Exporter.OneCollector, Version=1.6.1.0, Culture=neutral, PublicKeyToken=7bd6737fe5b67e3c - lib/net462/OpenTelemetry.Exporter.OneCollector.dll - lib/net462/OpenTelemetry.Exporter.OneCollector.dll - true - - - CP0003 - OpenTelemetry.Exporter.OneCollector, Version=1.6.1.0, Culture=neutral, PublicKeyToken=7bd6737fe5b67e3c - lib/net6.0/OpenTelemetry.Exporter.OneCollector.dll - lib/netstandard2.1/OpenTelemetry.Exporter.OneCollector.dll - true - - - CP0003 - OpenTelemetry.Exporter.OneCollector, Version=1.6.1.0, Culture=neutral, PublicKeyToken=7bd6737fe5b67e3c - lib/net7.0/OpenTelemetry.Exporter.OneCollector.dll - lib/netstandard2.1/OpenTelemetry.Exporter.OneCollector.dll - true - - - CP0003 - OpenTelemetry.Exporter.OneCollector, Version=1.6.1.0, Culture=neutral, PublicKeyToken=7bd6737fe5b67e3c - lib/netstandard2.0/OpenTelemetry.Exporter.OneCollector.dll - lib/netstandard2.0/OpenTelemetry.Exporter.OneCollector.dll - true - - - CP0003 - OpenTelemetry.Exporter.OneCollector, Version=1.6.1.0, Culture=neutral, PublicKeyToken=7bd6737fe5b67e3c - lib/netstandard2.1/OpenTelemetry.Exporter.OneCollector.dll - lib/netstandard2.1/OpenTelemetry.Exporter.OneCollector.dll - true - CP0008 T:OpenTelemetry.Exporter.OneCollector.OneCollectorExporterSerializationExceptionStackTraceHandlingType From 8ef81a2e3953359077f71cc8f83de9a1c0be6dce Mon Sep 17 00:00:00 2001 From: joegoldman2 <147369450+joegoldman@users.noreply.github.com> Date: Tue, 1 Oct 2024 07:28:13 +0000 Subject: [PATCH 4/5] Introduce SupportedNetTargetsWithoutNet6 --- build/Common.nonprod.props | 1 + .../OpenTelemetry.Exporter.OneCollector.Benchmarks.csproj | 2 +- .../OpenTelemetry.Exporter.OneCollector.Tests.csproj | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/Common.nonprod.props b/build/Common.nonprod.props index 1b7ed15854..9f866b82f1 100644 --- a/build/Common.nonprod.props +++ b/build/Common.nonprod.props @@ -30,6 +30,7 @@ $(OpenTelemetryCoreLatestVersion) $(OpenTelemetryCoreLatestPrereleaseVersion) net8.0;net6.0 + net8.0 [2.8.2,3.0) [2.9.0,3.0) [1.6.3,2.0) diff --git a/test/OpenTelemetry.Exporter.OneCollector.Benchmarks/OpenTelemetry.Exporter.OneCollector.Benchmarks.csproj b/test/OpenTelemetry.Exporter.OneCollector.Benchmarks/OpenTelemetry.Exporter.OneCollector.Benchmarks.csproj index 255647c61d..fadee8c359 100644 --- a/test/OpenTelemetry.Exporter.OneCollector.Benchmarks/OpenTelemetry.Exporter.OneCollector.Benchmarks.csproj +++ b/test/OpenTelemetry.Exporter.OneCollector.Benchmarks/OpenTelemetry.Exporter.OneCollector.Benchmarks.csproj @@ -2,7 +2,7 @@ - net8.0 + $(SupportedNetTargetsWithoutNet6) $(TargetFrameworks);net48;net472;net471;net47;net462 Exe Benchmark project for OpenTelemetry .NET OneCollectorExporter. diff --git a/test/OpenTelemetry.Exporter.OneCollector.Tests/OpenTelemetry.Exporter.OneCollector.Tests.csproj b/test/OpenTelemetry.Exporter.OneCollector.Tests/OpenTelemetry.Exporter.OneCollector.Tests.csproj index db60863040..e6a96e44f9 100644 --- a/test/OpenTelemetry.Exporter.OneCollector.Tests/OpenTelemetry.Exporter.OneCollector.Tests.csproj +++ b/test/OpenTelemetry.Exporter.OneCollector.Tests/OpenTelemetry.Exporter.OneCollector.Tests.csproj @@ -2,7 +2,7 @@ - net8.0 + $(SupportedNetTargetsWithoutNet6) $(TargetFrameworks);net48;net472;net471;net47;net462 Unit test project for OpenTelemetry .NET OneCollectorExporter. From e30aa5a59bb19b24031a59e0bc5ad07c95607478 Mon Sep 17 00:00:00 2001 From: Mikel Blanchard Date: Tue, 1 Oct 2024 12:37:59 -0700 Subject: [PATCH 5/5] Tweaks. --- .../OpenTelemetry.Exporter.OneCollector.csproj | 2 +- .../OpenTelemetry.Exporter.OneCollector.Benchmarks.csproj | 5 ++++- .../OpenTelemetry.Exporter.OneCollector.Tests.csproj | 4 ---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj b/src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj index f35f18c4c2..5cea309c2c 100644 --- a/src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj +++ b/src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj @@ -23,7 +23,7 @@ - + diff --git a/test/OpenTelemetry.Exporter.OneCollector.Benchmarks/OpenTelemetry.Exporter.OneCollector.Benchmarks.csproj b/test/OpenTelemetry.Exporter.OneCollector.Benchmarks/OpenTelemetry.Exporter.OneCollector.Benchmarks.csproj index fadee8c359..7493cb836e 100644 --- a/test/OpenTelemetry.Exporter.OneCollector.Benchmarks/OpenTelemetry.Exporter.OneCollector.Benchmarks.csproj +++ b/test/OpenTelemetry.Exporter.OneCollector.Benchmarks/OpenTelemetry.Exporter.OneCollector.Benchmarks.csproj @@ -10,11 +10,14 @@ - + + + + diff --git a/test/OpenTelemetry.Exporter.OneCollector.Tests/OpenTelemetry.Exporter.OneCollector.Tests.csproj b/test/OpenTelemetry.Exporter.OneCollector.Tests/OpenTelemetry.Exporter.OneCollector.Tests.csproj index e6a96e44f9..15509b13c8 100644 --- a/test/OpenTelemetry.Exporter.OneCollector.Tests/OpenTelemetry.Exporter.OneCollector.Tests.csproj +++ b/test/OpenTelemetry.Exporter.OneCollector.Tests/OpenTelemetry.Exporter.OneCollector.Tests.csproj @@ -7,10 +7,6 @@ Unit test project for OpenTelemetry .NET OneCollectorExporter. - - - -