From cbfe2fd28dff477bf5109c4435ba7b9ee9938b65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borja=20Dom=C3=ADnguez=20V=C3=A1zquez?= Date: Mon, 31 Mar 2025 22:25:37 +0200 Subject: [PATCH 1/8] Add netstandard2.0 compatibility to Microsoft.Extensions.Telemetry and dependencies --- ...oft.Extensions.DependencyInjection.AutoActivation.csproj | 1 + .../Microsoft.Extensions.Telemetry.Abstractions.csproj | 1 + .../Microsoft.Extensions.Telemetry.csproj | 1 + .../Sampling/RandomProbabilisticSampler.cs | 6 +++--- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Libraries/Microsoft.Extensions.DependencyInjection.AutoActivation/Microsoft.Extensions.DependencyInjection.AutoActivation.csproj b/src/Libraries/Microsoft.Extensions.DependencyInjection.AutoActivation/Microsoft.Extensions.DependencyInjection.AutoActivation.csproj index 7d02c3f1e90..c9682fdcd58 100644 --- a/src/Libraries/Microsoft.Extensions.DependencyInjection.AutoActivation/Microsoft.Extensions.DependencyInjection.AutoActivation.csproj +++ b/src/Libraries/Microsoft.Extensions.DependencyInjection.AutoActivation/Microsoft.Extensions.DependencyInjection.AutoActivation.csproj @@ -1,6 +1,7 @@ Microsoft.Extensions.DependencyInjection + $(NetCoreTargetFrameworks);netstandard2.0; Extensions to auto-activate registered singletons in the dependency injection system. Fundamentals diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Microsoft.Extensions.Telemetry.Abstractions.csproj b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Microsoft.Extensions.Telemetry.Abstractions.csproj index 08a379be0e6..cf794a07a01 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Microsoft.Extensions.Telemetry.Abstractions.csproj +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Microsoft.Extensions.Telemetry.Abstractions.csproj @@ -1,6 +1,7 @@  Microsoft.Extensions.Telemetry + $(NetCoreTargetFrameworks);netstandard2.0; Common abstractions for high-level telemetry primitives. Telemetry diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.csproj b/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.csproj index 46e815ccd80..58f876a7aca 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.csproj +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.csproj @@ -1,6 +1,7 @@  Microsoft.Extensions.Diagnostics + $(NetCoreTargetFrameworks);netstandard2.0; Provides canonical implementations of telemetry abstractions. Telemetry diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Sampling/RandomProbabilisticSampler.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Sampling/RandomProbabilisticSampler.cs index f092a5c4bc9..c3c117e3d2b 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Sampling/RandomProbabilisticSampler.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Sampling/RandomProbabilisticSampler.cs @@ -3,7 +3,7 @@ using System; using System.Linq; -#if !NETFRAMEWORK +#if !NETFRAMEWORK && !NETSTANDARD using System.Security.Cryptography; #endif using Microsoft.Extensions.Logging; @@ -22,7 +22,7 @@ internal sealed class RandomProbabilisticSampler : LoggingSampler, IDisposable { internal RandomProbabilisticSamplerFilterRule[] LastKnownGoodSamplerRules; -#if NETFRAMEWORK +#if NETFRAMEWORK || NETSTANDARD private static readonly System.Threading.ThreadLocal _randomInstance = new(() => new Random()); #endif @@ -50,7 +50,7 @@ public override bool ShouldSample(in LogEntry logEntry) return true; } -#if NETFRAMEWORK +#if NETFRAMEWORK || NETSTANDARD return _randomInstance.Value!.Next(int.MaxValue) < int.MaxValue * probability; #else return RandomNumberGenerator.GetInt32(int.MaxValue) < int.MaxValue * probability; From 545ae4c071f294544793f9f87541a6c96cadc2f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borja=20Dom=C3=ADnguez?= Date: Mon, 23 Jun 2025 12:31:27 +0200 Subject: [PATCH 2/8] Update Microsoft.Extensions.AmbientMetadata.Application.csproj --- .../Microsoft.Extensions.AmbientMetadata.Application.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Libraries/Microsoft.Extensions.AmbientMetadata.Application/Microsoft.Extensions.AmbientMetadata.Application.csproj b/src/Libraries/Microsoft.Extensions.AmbientMetadata.Application/Microsoft.Extensions.AmbientMetadata.Application.csproj index f631a4047bb..8a408ec9926 100644 --- a/src/Libraries/Microsoft.Extensions.AmbientMetadata.Application/Microsoft.Extensions.AmbientMetadata.Application.csproj +++ b/src/Libraries/Microsoft.Extensions.AmbientMetadata.Application/Microsoft.Extensions.AmbientMetadata.Application.csproj @@ -1,6 +1,7 @@ Microsoft.Extensions.AmbientMetadata + $(NetCoreTargetFrameworks);netstandard2.0; Runtime information provider for application-level ambient metadata. Telemetry From 22db3d3963f5cdfe0f9e185253ecd176f03714ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borja=20Dom=C3=ADnguez=20V=C3=A1zquez?= Date: Mon, 7 Jul 2025 11:40:18 +0200 Subject: [PATCH 3/8] Add CompatibilitySuppressions.xml --- .../CompatibilitySuppressions.xml | 25 +++++++++++++++ .../CompatibilitySuppressions.xml | 32 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/CompatibilitySuppressions.xml create mode 100644 src/Libraries/Microsoft.Extensions.Telemetry/CompatibilitySuppressions.xml diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/CompatibilitySuppressions.xml b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/CompatibilitySuppressions.xml new file mode 100644 index 00000000000..0c9f0e5d71a --- /dev/null +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/CompatibilitySuppressions.xml @@ -0,0 +1,25 @@ + + + + + CP0002 + F:Microsoft.Extensions.Http.Diagnostics.HttpRouteParameterRedactionMode.Loose + lib/net462/Microsoft.Extensions.Telemetry.Abstractions.dll + lib/netstandard2.0/Microsoft.Extensions.Telemetry.Abstractions.dll + true + + + CP0002 + F:Microsoft.Extensions.Http.Diagnostics.HttpRouteParameterRedactionMode.None + lib/net462/Microsoft.Extensions.Telemetry.Abstractions.dll + lib/netstandard2.0/Microsoft.Extensions.Telemetry.Abstractions.dll + true + + + CP0002 + F:Microsoft.Extensions.Http.Diagnostics.HttpRouteParameterRedactionMode.Strict + lib/net462/Microsoft.Extensions.Telemetry.Abstractions.dll + lib/netstandard2.0/Microsoft.Extensions.Telemetry.Abstractions.dll + true + + \ No newline at end of file diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/CompatibilitySuppressions.xml b/src/Libraries/Microsoft.Extensions.Telemetry/CompatibilitySuppressions.xml new file mode 100644 index 00000000000..247a83b176c --- /dev/null +++ b/src/Libraries/Microsoft.Extensions.Telemetry/CompatibilitySuppressions.xml @@ -0,0 +1,32 @@ + + + + + CP0002 + M:Microsoft.Extensions.Diagnostics.Sampling.RandomProbabilisticSamplerFilterRule.#ctor(System.Double,System.String,System.Nullable{Microsoft.Extensions.Logging.LogLevel},System.Nullable{System.Int32},System.String) + lib/net462/Microsoft.Extensions.Telemetry.dll + lib/netstandard2.0/Microsoft.Extensions.Telemetry.dll + true + + + CP0002 + M:Microsoft.Extensions.Diagnostics.Sampling.RandomProbabilisticSamplerFilterRule.get_EventId + lib/net462/Microsoft.Extensions.Telemetry.dll + lib/netstandard2.0/Microsoft.Extensions.Telemetry.dll + true + + + CP0002 + M:Microsoft.Extensions.Diagnostics.Sampling.RandomProbabilisticSamplerFilterRule.get_LogLevel + lib/net462/Microsoft.Extensions.Telemetry.dll + lib/netstandard2.0/Microsoft.Extensions.Telemetry.dll + true + + + CP0002 + M:Microsoft.Extensions.Logging.SamplingLoggerBuilderExtensions.AddRandomProbabilisticSampler(Microsoft.Extensions.Logging.ILoggingBuilder,System.Double,System.Nullable{Microsoft.Extensions.Logging.LogLevel}) + lib/net462/Microsoft.Extensions.Telemetry.dll + lib/netstandard2.0/Microsoft.Extensions.Telemetry.dll + true + + \ No newline at end of file From a4698a8a2a235276bf36b450e62756bf5808806e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borja=20Dom=C3=ADnguez?= Date: Mon, 7 Jul 2025 11:41:28 +0200 Subject: [PATCH 4/8] Update src/Libraries/Microsoft.Extensions.AmbientMetadata.Application/Microsoft.Extensions.AmbientMetadata.Application.csproj Co-authored-by: Evgeny Fedorov <25526458+evgenyfedorov2@users.noreply.github.com> --- .../Microsoft.Extensions.AmbientMetadata.Application.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Libraries/Microsoft.Extensions.AmbientMetadata.Application/Microsoft.Extensions.AmbientMetadata.Application.csproj b/src/Libraries/Microsoft.Extensions.AmbientMetadata.Application/Microsoft.Extensions.AmbientMetadata.Application.csproj index 8a408ec9926..86f07dc205f 100644 --- a/src/Libraries/Microsoft.Extensions.AmbientMetadata.Application/Microsoft.Extensions.AmbientMetadata.Application.csproj +++ b/src/Libraries/Microsoft.Extensions.AmbientMetadata.Application/Microsoft.Extensions.AmbientMetadata.Application.csproj @@ -1,7 +1,7 @@ Microsoft.Extensions.AmbientMetadata - $(NetCoreTargetFrameworks);netstandard2.0; + $(NetCoreTargetFrameworks);netstandard2.0;net462 Runtime information provider for application-level ambient metadata. Telemetry From a6c467075591a71b4a97e68be09d08ab98f5bc1b Mon Sep 17 00:00:00 2001 From: Evgeny Fedorov <25526458+evgenyfedorov2@users.noreply.github.com> Date: Mon, 7 Jul 2025 13:32:58 +0200 Subject: [PATCH 5/8] Update Microsoft.Extensions.DependencyInjection.AutoActivation.csproj --- ...crosoft.Extensions.DependencyInjection.AutoActivation.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Libraries/Microsoft.Extensions.DependencyInjection.AutoActivation/Microsoft.Extensions.DependencyInjection.AutoActivation.csproj b/src/Libraries/Microsoft.Extensions.DependencyInjection.AutoActivation/Microsoft.Extensions.DependencyInjection.AutoActivation.csproj index c9682fdcd58..5dd62090e1e 100644 --- a/src/Libraries/Microsoft.Extensions.DependencyInjection.AutoActivation/Microsoft.Extensions.DependencyInjection.AutoActivation.csproj +++ b/src/Libraries/Microsoft.Extensions.DependencyInjection.AutoActivation/Microsoft.Extensions.DependencyInjection.AutoActivation.csproj @@ -1,7 +1,7 @@ Microsoft.Extensions.DependencyInjection - $(NetCoreTargetFrameworks);netstandard2.0; + $(NetCoreTargetFrameworks);netstandard2.0;net462 Extensions to auto-activate registered singletons in the dependency injection system. Fundamentals From 3ed9ecbc4b9d414a8aeb17facfd25acdbe29bc15 Mon Sep 17 00:00:00 2001 From: Evgeny Fedorov <25526458+evgenyfedorov2@users.noreply.github.com> Date: Mon, 7 Jul 2025 13:33:15 +0200 Subject: [PATCH 6/8] Update Microsoft.Extensions.Telemetry.csproj --- .../Microsoft.Extensions.Telemetry.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.csproj b/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.csproj index 8b6b3d44f26..8ff5676e349 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.csproj +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.csproj @@ -1,7 +1,7 @@  Microsoft.Extensions.Diagnostics - $(NetCoreTargetFrameworks);netstandard2.0; + $(NetCoreTargetFrameworks);netstandard2.0;net462 Provides canonical implementations of telemetry abstractions. Telemetry From 528428ec43f3f991654beb216559929a188b021f Mon Sep 17 00:00:00 2001 From: Evgeny Fedorov <25526458+evgenyfedorov2@users.noreply.github.com> Date: Mon, 7 Jul 2025 13:33:36 +0200 Subject: [PATCH 7/8] Delete src/Libraries/Microsoft.Extensions.Telemetry/CompatibilitySuppressions.xml --- .../CompatibilitySuppressions.xml | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 src/Libraries/Microsoft.Extensions.Telemetry/CompatibilitySuppressions.xml diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/CompatibilitySuppressions.xml b/src/Libraries/Microsoft.Extensions.Telemetry/CompatibilitySuppressions.xml deleted file mode 100644 index 247a83b176c..00000000000 --- a/src/Libraries/Microsoft.Extensions.Telemetry/CompatibilitySuppressions.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - CP0002 - M:Microsoft.Extensions.Diagnostics.Sampling.RandomProbabilisticSamplerFilterRule.#ctor(System.Double,System.String,System.Nullable{Microsoft.Extensions.Logging.LogLevel},System.Nullable{System.Int32},System.String) - lib/net462/Microsoft.Extensions.Telemetry.dll - lib/netstandard2.0/Microsoft.Extensions.Telemetry.dll - true - - - CP0002 - M:Microsoft.Extensions.Diagnostics.Sampling.RandomProbabilisticSamplerFilterRule.get_EventId - lib/net462/Microsoft.Extensions.Telemetry.dll - lib/netstandard2.0/Microsoft.Extensions.Telemetry.dll - true - - - CP0002 - M:Microsoft.Extensions.Diagnostics.Sampling.RandomProbabilisticSamplerFilterRule.get_LogLevel - lib/net462/Microsoft.Extensions.Telemetry.dll - lib/netstandard2.0/Microsoft.Extensions.Telemetry.dll - true - - - CP0002 - M:Microsoft.Extensions.Logging.SamplingLoggerBuilderExtensions.AddRandomProbabilisticSampler(Microsoft.Extensions.Logging.ILoggingBuilder,System.Double,System.Nullable{Microsoft.Extensions.Logging.LogLevel}) - lib/net462/Microsoft.Extensions.Telemetry.dll - lib/netstandard2.0/Microsoft.Extensions.Telemetry.dll - true - - \ No newline at end of file From 65233d5ddfdd4c5b8b90e50389ddf14f8ab4a3fc Mon Sep 17 00:00:00 2001 From: Evgeny Fedorov <25526458+evgenyfedorov2@users.noreply.github.com> Date: Mon, 7 Jul 2025 13:34:00 +0200 Subject: [PATCH 8/8] Delete src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/CompatibilitySuppressions.xml --- .../CompatibilitySuppressions.xml | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/CompatibilitySuppressions.xml diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/CompatibilitySuppressions.xml b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/CompatibilitySuppressions.xml deleted file mode 100644 index 0c9f0e5d71a..00000000000 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/CompatibilitySuppressions.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - CP0002 - F:Microsoft.Extensions.Http.Diagnostics.HttpRouteParameterRedactionMode.Loose - lib/net462/Microsoft.Extensions.Telemetry.Abstractions.dll - lib/netstandard2.0/Microsoft.Extensions.Telemetry.Abstractions.dll - true - - - CP0002 - F:Microsoft.Extensions.Http.Diagnostics.HttpRouteParameterRedactionMode.None - lib/net462/Microsoft.Extensions.Telemetry.Abstractions.dll - lib/netstandard2.0/Microsoft.Extensions.Telemetry.Abstractions.dll - true - - - CP0002 - F:Microsoft.Extensions.Http.Diagnostics.HttpRouteParameterRedactionMode.Strict - lib/net462/Microsoft.Extensions.Telemetry.Abstractions.dll - lib/netstandard2.0/Microsoft.Extensions.Telemetry.Abstractions.dll - true - - \ No newline at end of file