Merge branch 'main' into main

Author: sandy2008

.editorconfig

@@ -156,6 +156,10 @@ dotnet_diagnostic.IDE0005.severity = warning
 # RS0041: Public members should not use oblivious types
 dotnet_diagnostic.RS0041.severity = suggestion
 
+[*Tests.cs]
+# CA1515: Disable making types internal for Tests classes. It is required by xunit
+dotnet_diagnostic.CA1515.severity = none
+
 [**/obj/**.cs]
 generated_code = true
 

Directory.Packages.props

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <OTelLatestStableVer>1.11.1</OTelLatestStableVer>
+    <OTelLatestStableVer>1.11.2</OTelLatestStableVer>
 
     <!--
         This is typically the latest annual release of .NET. Use this wherever

src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md

@@ -7,6 +7,10 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+## 1.11.2
+
+Released 2025-Mar-04
+
 ## 1.11.1
 
 Released 2025-Jan-22

src/OpenTelemetry.Api/CHANGELOG.md

@@ -6,8 +6,12 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+## 1.11.2
+
+Released 2025-Mar-04
+
 * Revert optimize performance of `TraceContextPropagator.Extract` introduced
-  in #5749 to resolve #6158.
+  in #5749 to resolve [GHSA-8785-wc3w-h8q6](https://github.com/open-telemetry/opentelemetry-dotnet/security/advisories/GHSA-8785-wc3w-h8q6).
   ([#6161](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6161))
 
 ## 1.11.1

src/OpenTelemetry.Exporter.Console/CHANGELOG.md

@@ -6,6 +6,10 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+## 1.11.2
+
+Released 2025-Mar-04
+
 ## 1.11.1
 
 Released 2025-Jan-22

src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md

@@ -6,6 +6,10 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+## 1.11.2
+
+Released 2025-Mar-04
+
 ## 1.11.1
 
 Released 2025-Jan-22

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md

@@ -7,6 +7,10 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+## 1.11.2
+
+Released 2025-Mar-04
+
 * Fixed a bug in .NET Framework gRPC export client where the default success
   export response was incorrectly marked as false, now changed to true, ensuring
   exports are correctly marked as successful.

src/OpenTelemetry.Exporter.Prometheus.AspNetCore/CHANGELOG.md

@@ -7,8 +7,12 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
-* Updated OpenTelemetry core component version(s) to `1.11.1`.
-  ([#6088](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6088))
+## 1.11.2-beta.1
+
+Released 2025-Mar-05
+
+* Updated OpenTelemetry core component version(s) to `1.11.2`.
+  ([#6169](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6169))
 
 ## 1.11.0-beta.1
 

src/OpenTelemetry.Exporter.Prometheus.HttpListener/CHANGELOG.md

@@ -7,8 +7,12 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
-* Updated OpenTelemetry core component version(s) to `1.11.1`.
-  ([#6088](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6088))
+## 1.11.2-beta.1
+
+Released 2025-Mar-05
+
+* Updated OpenTelemetry core component version(s) to `1.11.2`.
+  ([#6169](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6169))
 
 ## 1.11.0-beta.1
 

src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md

@@ -6,6 +6,10 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+## 1.11.2
+
+Released 2025-Mar-04
+
 ## 1.11.1
 
 Released 2025-Jan-22

src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md

@@ -6,6 +6,10 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+## 1.11.2
+
+Released 2025-Mar-04
+
 ## 1.11.1
 
 Released 2025-Jan-22

src/OpenTelemetry.Extensions.Propagators/CHANGELOG.md

@@ -6,6 +6,10 @@ covering all components see: [Release Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+## 1.11.2
+
+Released 2025-Mar-04
+
 ## 1.11.1
 
 Released 2025-Jan-22

src/OpenTelemetry.Shims.OpenTracing/CHANGELOG.md

@@ -6,8 +6,12 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
-* Updated OpenTelemetry core component version(s) to `1.11.1`.
-  ([#6088](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6088))
+## 1.11.2-beta.1
+
+Released 2025-Mar-05
+
+* Updated OpenTelemetry core component version(s) to `1.11.2`.
+  ([#6169](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6169))
 
 ## 1.11.0-beta.1
 

src/OpenTelemetry/CHANGELOG.md

@@ -6,6 +6,10 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+## 1.11.2
+
+Released 2025-Mar-04
+
 ## 1.11.1
 
 Released 2025-Jan-22

test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/Metrics/TestMeterProviderBuilder.cs

@@ -6,7 +6,7 @@
 
 namespace OpenTelemetry.Api.ProviderBuilderExtensions.Tests;
 
-public sealed class TestMeterProviderBuilder : MeterProviderBuilder, IMeterProviderBuilder, IDisposable
+internal sealed class TestMeterProviderBuilder : MeterProviderBuilder, IMeterProviderBuilder, IDisposable
 {
     public TestMeterProviderBuilder()
     {
@@ -17,9 +17,9 @@ public TestMeterProviderBuilder()
 
     public ServiceProvider? ServiceProvider { get; private set; }
 
-    public List<string> Meters { get; } = new();
+    public List<string> Meters { get; } = [];
 
-    public List<object> Instrumentation { get; } = new();
+    public List<object> Instrumentation { get; } = [];
 
     public MeterProvider? Provider { get; private set; }
 

test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/OpenTelemetry.Api.ProviderBuilderExtensions.Tests.csproj

@@ -1,7 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Unit test project for OpenTelemetry .NET dependency injection extensions</Description>
     <TargetFrameworks>$(TargetFrameworksForTests)</TargetFrameworks>
+    <AnalysisLevel>latest-all</AnalysisLevel>
   </PropertyGroup>
 
   <ItemGroup>

test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/ServiceCollectionExtensionsTests.cs

@@ -30,7 +30,7 @@ public void ConfigureOpenTelemetryTracerProvider(int numberOfCalls)
 
         using var serviceProvider = services.BuildServiceProvider();
 
-        var registrations = serviceProvider.GetServices<IConfigureTracerProviderBuilder>();
+        var registrations = serviceProvider.GetServices<IConfigureTracerProviderBuilder>().ToArray();
 
         Assert.Equal(numberOfCalls, beforeServiceProviderInvocations);
         Assert.Equal(0, afterServiceProviderInvocations);
@@ -43,7 +43,7 @@ public void ConfigureOpenTelemetryTracerProvider(int numberOfCalls)
         Assert.Equal(numberOfCalls, beforeServiceProviderInvocations);
         Assert.Equal(numberOfCalls, afterServiceProviderInvocations);
 
-        Assert.Equal(numberOfCalls * 2, registrations.Count());
+        Assert.Equal(numberOfCalls * 2, registrations.Length);
     }
 
     [Theory]
@@ -65,7 +65,7 @@ public void ConfigureOpenTelemetryMeterProvider(int numberOfCalls)
 
         using var serviceProvider = services.BuildServiceProvider();
 
-        var registrations = serviceProvider.GetServices<IConfigureMeterProviderBuilder>();
+        var registrations = serviceProvider.GetServices<IConfigureMeterProviderBuilder>().ToArray();
 
         Assert.Equal(numberOfCalls, beforeServiceProviderInvocations);
         Assert.Equal(0, afterServiceProviderInvocations);
@@ -78,7 +78,7 @@ public void ConfigureOpenTelemetryMeterProvider(int numberOfCalls)
         Assert.Equal(numberOfCalls, beforeServiceProviderInvocations);
         Assert.Equal(numberOfCalls, afterServiceProviderInvocations);
 
-        Assert.Equal(numberOfCalls * 2, registrations.Count());
+        Assert.Equal(numberOfCalls * 2, registrations.Length);
     }
 
     [Theory]
@@ -100,7 +100,7 @@ public void ConfigureOpenTelemetryLoggerProvider(int numberOfCalls)
 
         using var serviceProvider = services.BuildServiceProvider();
 
-        var registrations = serviceProvider.GetServices<IConfigureLoggerProviderBuilder>();
+        var registrations = serviceProvider.GetServices<IConfigureLoggerProviderBuilder>().ToArray();
 
         Assert.Equal(numberOfCalls, beforeServiceProviderInvocations);
         Assert.Equal(0, afterServiceProviderInvocations);
@@ -113,6 +113,6 @@ public void ConfigureOpenTelemetryLoggerProvider(int numberOfCalls)
         Assert.Equal(numberOfCalls, beforeServiceProviderInvocations);
         Assert.Equal(numberOfCalls, afterServiceProviderInvocations);
 
-        Assert.Equal(numberOfCalls * 2, registrations.Count());
+        Assert.Equal(numberOfCalls * 2, registrations.Length);
     }
 }

test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/Trace/TestTracerProviderBuilder.cs

@@ -6,7 +6,7 @@
 
 namespace OpenTelemetry.Api.ProviderBuilderExtensions.Tests;
 
-public sealed class TestTracerProviderBuilder : TracerProviderBuilder, ITracerProviderBuilder, IDisposable
+internal sealed class TestTracerProviderBuilder : TracerProviderBuilder, ITracerProviderBuilder, IDisposable
 {
     public TestTracerProviderBuilder()
     {
@@ -17,11 +17,11 @@ public TestTracerProviderBuilder()
 
     public ServiceProvider? ServiceProvider { get; private set; }
 
-    public List<string> Sources { get; } = new();
+    public List<string> Sources { get; } = [];
 
-    public List<string> LegacySources { get; } = new();
+    public List<string> LegacySources { get; } = [];
 
-    public List<object> Instrumentation { get; } = new();
+    public List<object> Instrumentation { get; } = [];
 
     public TracerProvider? Provider { get; private set; }