Merge branch 'main' into interlocked-volatile

pentp · web-flow · commit 177c38171d90 · 2025-03-08T06:09:16.000+02:00
diff --git a/.editorconfig b/.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
 
diff --git a/Directory.Packages.props b/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
diff --git a/src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md b/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
diff --git a/src/OpenTelemetry.Api/CHANGELOG.md b/src/OpenTelemetry.Api/CHANGELOG.md
@@ -6,6 +6,14 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+## 1.11.2
+
+Released 2025-Mar-04
+
+* Revert optimize performance of `TraceContextPropagator.Extract` introduced
+  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
 
 Released 2025-Jan-22
diff --git a/src/OpenTelemetry.Api/Context/Propagation/TraceContextPropagator.cs b/src/OpenTelemetry.Api/Context/Propagation/TraceContextPropagator.cs
@@ -1,9 +1,9 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using System.Buffers;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
+using System.Text;
 using OpenTelemetry.Internal;
 
 namespace OpenTelemetry.Context.Propagation;
@@ -76,7 +76,7 @@ public override PropagationContext Extract<T>(PropagationContext context, T carr
             var tracestateCollection = getter(carrier, TraceState);
             if (tracestateCollection?.Any() ?? false)
             {
-                TryExtractTracestate(tracestateCollection, out tracestate);
+                TryExtractTracestate(tracestateCollection.ToArray(), out tracestate);
             }
 
             return new PropagationContext(
@@ -220,37 +220,31 @@ internal static bool TryExtractTraceparent(string traceparent, out ActivityTrace
         return true;
     }
 
-    internal static bool TryExtractTracestate(IEnumerable<string> tracestateCollection, out string tracestateResult)
+    internal static bool TryExtractTracestate(string[] tracestateCollection, out string tracestateResult)
     {
         tracestateResult = string.Empty;
 
-        char[]? rentedArray = null;
-        Span<char> traceStateBuffer = stackalloc char[128]; // 256B
-        Span<char> keyLookupBuffer = stackalloc char[96]; // 192B (3x32 keys)
-        int keys = 0;
-        int charsWritten = 0;
-
-        try
+        if (tracestateCollection != null)
         {
-            foreach (var tracestateItem in tracestateCollection)
+            var keySet = new HashSet<string>();
+            var result = new StringBuilder();
+            for (int i = 0; i < tracestateCollection.Length; ++i)
             {
-                var tracestate = tracestateItem.AsSpan();
-                int position = 0;
-
-                while (position < tracestate.Length)
+                var tracestate = tracestateCollection[i].AsSpan();
+                int begin = 0;
+                while (begin < tracestate.Length)
                 {
-                    int length = tracestate.Slice(position).IndexOf(',');
+                    int length = tracestate.Slice(begin).IndexOf(',');
                     ReadOnlySpan<char> listMember;
-
                     if (length != -1)
                     {
-                        listMember = tracestate.Slice(position, length).Trim();
-                        position += length + 1;
+                        listMember = tracestate.Slice(begin, length).Trim();
+                        begin += length + 1;
                     }
                     else
                     {
-                        listMember = tracestate.Slice(position).Trim();
-                        position = tracestate.Length;
+                        listMember = tracestate.Slice(begin).Trim();
+                        begin = tracestate.Length;
                     }
 
                     // https://github.com/w3c/trace-context/blob/master/spec/20-http_request_header_format.md#tracestate-header-field-values
@@ -261,7 +255,7 @@ internal static bool TryExtractTracestate(IEnumerable<string> tracestateCollecti
                         continue;
                     }
 
-                    if (keys >= 32)
+                    if (keySet.Count >= 32)
                     {
                         // https://github.com/w3c/trace-context/blob/master/spec/20-http_request_header_format.md#list
                         // test_tracestate_member_count_limit
@@ -292,107 +286,25 @@ internal static bool TryExtractTracestate(IEnumerable<string> tracestateCollecti
                     }
 
                     // ValidateKey() call above has ensured the key does not contain upper case letters.
-
-                    var duplicationCheckLength = Math.Min(key.Length, 3);
-
-                    if (keys > 0)
-                    {
-                        // Fast path check of first three chars for potential duplicated keys
-                        var potentialMatchingKeyPosition = 1;
-                        var found = false;
-                        for (int i = 0; i < keys * 3; i += 3)
-                        {
-                            if (keyLookupBuffer.Slice(i, duplicationCheckLength).SequenceEqual(key.Slice(0, duplicationCheckLength)))
-                            {
-                                found = true;
-                                break;
-                            }
-
-                            potentialMatchingKeyPosition++;
-                        }
-
-                        // If the fast check has found a possible duplicate, we need to do a full check
-                        if (found)
-                        {
-                            var bufferToCompare = traceStateBuffer.Slice(0, charsWritten);
-
-                            // We know which key is the first possible duplicate, so skip to that key
-                            // by slicing to the position after the appropriate comma.
-                            for (int i = 1; i < potentialMatchingKeyPosition; i++)
-                            {
-                                var commaIndex = bufferToCompare.IndexOf(',');
-
-                                if (commaIndex > -1)
-                                {
-                                    bufferToCompare.Slice(commaIndex);
-                                }
-                            }
-
-                            int existingIndex = -1;
-                            while ((existingIndex = bufferToCompare.IndexOf(key)) > -1)
-                            {
-                                if ((existingIndex > 0 && bufferToCompare[existingIndex - 1] != ',') || bufferToCompare[existingIndex + key.Length] != '=')
-                                {
-                                    continue; // this is not a key
-                                }
-
-                                return false; // test_tracestate_duplicated_keys
-                            }
-                        }
-                    }
-
-                    // Store up to the first three characters of the key for use in the duplicate lookup fast path
-                    var startKeyLookupIndex = keys > 0 ? keys * 3 : 0;
-                    key.Slice(0, duplicationCheckLength).CopyTo(keyLookupBuffer.Slice(startKeyLookupIndex));
-
-                    // Check we have capacity to write the key and value
-                    var requiredCapacity = charsWritten > 0 ? listMember.Length + 1 : listMember.Length;
-
-                    while (charsWritten + requiredCapacity > traceStateBuffer.Length)
+                    if (!keySet.Add(key.ToString()))
                     {
-                        GrowBuffer(ref rentedArray, ref traceStateBuffer);
+                        // test_tracestate_duplicated_keys
+                        return false;
                     }
 
-                    if (charsWritten > 0)
+                    if (result.Length > 0)
                     {
-                        traceStateBuffer[charsWritten++] = ',';
+                        result.Append(',');
                     }
 
-                    listMember.CopyTo(traceStateBuffer.Slice(charsWritten));
-                    charsWritten += listMember.Length;
-
-                    keys++;
+                    result.Append(listMember.ToString());
                 }
             }
 
-            tracestateResult = traceStateBuffer.Slice(0, charsWritten).ToString();
-
-            return true;
+            tracestateResult = result.ToString();
         }
-        finally
-        {
-            if (rentedArray is not null)
-            {
-                ArrayPool<char>.Shared.Return(rentedArray);
-                rentedArray = null;
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        static void GrowBuffer(ref char[]? array, ref Span<char> buffer)
-        {
-            var newBuffer = ArrayPool<char>.Shared.Rent(buffer.Length * 2);
 
-            buffer.CopyTo(newBuffer.AsSpan());
-
-            if (array is not null)
-            {
-                ArrayPool<char>.Shared.Return(array);
-            }
-
-            array = newBuffer;
-            buffer = array.AsSpan();
-        }
+        return true;
     }
 
     private static byte HexCharToByte(char c)
diff --git a/src/OpenTelemetry.Exporter.Console/CHANGELOG.md b/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
diff --git a/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md b/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
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md b/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.
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/ExportClient/OtlpGrpcExportClient.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/ExportClient/OtlpGrpcExportClient.cs
@@ -93,7 +93,7 @@ public override ExportClientResponse SendExportRequest(byte[] buffer, int conten
                 grpcStatusDetailsHeader = GrpcProtocolHelpers.GetHeaderValue(trailingHeaders, GrpcStatusDetailsHeader);
             }
 
-            OpenTelemetryProtocolExporterEventSource.Log.ExportFailure(this.Endpoint.ToString(), "Export failed due to unexpected status code.");
+            OpenTelemetryProtocolExporterEventSource.Log.ExportFailure(this.Endpoint, "Export failed due to unexpected status code.", status);
 
             return new ExportClientGrpcResponse(
                 success: false,
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/OpenTelemetryProtocolExporterEventSource.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/OpenTelemetryProtocolExporterEventSource.cs
@@ -3,6 +3,7 @@
 
 using System.Diagnostics.Tracing;
 using Microsoft.Extensions.Configuration;
+using OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation.ExportClient.Grpc;
 using OpenTelemetry.Internal;
 
 namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation;
@@ -94,6 +95,15 @@ public void GrpcRetryDelayParsingFailed(string? grpcStatusDetailsHeader, Excepti
         }
     }
 
+    [NonEvent]
+    public void ExportFailure(Uri endpoint, string message, Status status)
+    {
+        if (Log.IsEnabled(EventLevel.Error, EventKeywords.All))
+        {
+            this.ExportFailure(endpoint.ToString(), message, status.ToString());
+        }
+    }
+
     [Event(2, Message = "Exporter failed send data to collector to {0} endpoint. Data will not be sent. Exception: {1}", Level = EventLevel.Error)]
     public void FailedToReachCollector(string rawCollectorUri, string ex)
     {
@@ -208,10 +218,10 @@ public void GrpcStatusWarning(string endpoint, string statusCode)
         this.WriteEvent(22, endpoint, statusCode);
     }
 
-    [Event(23, Message = "Export failed for {0}. Message: {1}", Level = EventLevel.Error)]
-    public void ExportFailure(string endpoint, string message)
+    [Event(23, Message = "Export failed for {0}. Message: {1}. {2}.", Level = EventLevel.Error)]
+    public void ExportFailure(string endpoint, string message, string statusString)
     {
-        this.WriteEvent(23, endpoint, message);
+        this.WriteEvent(23, endpoint, message, statusString);
     }
 
     [Event(24, Message = "Failed to parse gRPC retry delay from header grpcStatusDetailsHeader: '{0}'. Exception: {1}", Level = EventLevel.Warning)]
diff --git a/src/OpenTelemetry.Exporter.Prometheus.AspNetCore/CHANGELOG.md b/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
 
diff --git a/src/OpenTelemetry.Exporter.Prometheus.HttpListener/CHANGELOG.md b/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
 
diff --git a/src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md b/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
diff --git a/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md b/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
diff --git a/src/OpenTelemetry.Extensions.Propagators/CHANGELOG.md b/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
diff --git a/src/OpenTelemetry.Shims.OpenTracing/CHANGELOG.md b/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
 
diff --git a/src/OpenTelemetry/BatchExportProcessorOptions.cs b/src/OpenTelemetry/BatchExportProcessorOptions.cs
diff --git a/src/OpenTelemetry/CHANGELOG.md b/src/OpenTelemetry/CHANGELOG.md
diff --git a/test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/Metrics/TestMeterProviderBuilder.cs b/test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/Metrics/TestMeterProviderBuilder.cs
diff --git a/test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/OpenTelemetry.Api.ProviderBuilderExtensions.Tests.csproj b/test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/OpenTelemetry.Api.ProviderBuilderExtensions.Tests.csproj
diff --git a/test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/ServiceCollectionExtensionsTests.cs b/test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/ServiceCollectionExtensionsTests.cs
diff --git a/test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/Trace/TestTracerProviderBuilder.cs b/test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/Trace/TestTracerProviderBuilder.cs

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public override ExportClientResponse SendExportRequest(byte[] buffer, int conten`
`93`	`93`	`grpcStatusDetailsHeader = GrpcProtocolHelpers.GetHeaderValue(trailingHeaders, GrpcStatusDetailsHeader);`
`94`	`94`	`}`
`95`	`95`
`96`		`- OpenTelemetryProtocolExporterEventSource.Log.ExportFailure(this.Endpoint.ToString(), "Export failed due to unexpected status code.");`
	`96`	`+ OpenTelemetryProtocolExporterEventSource.Log.ExportFailure(this.Endpoint, "Export failed due to unexpected status code.", status);`
`97`	`97`
`98`	`98`	`return new ExportClientGrpcResponse(`
`99`	`99`	`success: false,`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`using System.Diagnostics.Tracing;`
`5`	`5`	`using Microsoft.Extensions.Configuration;`
	`6`	`+using OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation.ExportClient.Grpc;`
`6`	`7`	`using OpenTelemetry.Internal;`
`7`	`8`
`8`	`9`	`namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation;`
`@@ -94,6 +95,15 @@ public void GrpcRetryDelayParsingFailed(string? grpcStatusDetailsHeader, Excepti`
`94`	`95`	`}`
`95`	`96`	`}`
`96`	`97`
	`98`	`+ [NonEvent]`
	`99`	`+ public void ExportFailure(Uri endpoint, string message, Status status)`
	`100`	`+ {`
	`101`	`+ if (Log.IsEnabled(EventLevel.Error, EventKeywords.All))`
	`102`	`+ {`
	`103`	`+ this.ExportFailure(endpoint.ToString(), message, status.ToString());`
	`104`	`+ }`
	`105`	`+ }`
	`106`	`+`
`97`	`107`	`[Event(2, Message = "Exporter failed send data to collector to {0} endpoint. Data will not be sent. Exception: {1}", Level = EventLevel.Error)]`
`98`	`108`	`public void FailedToReachCollector(string rawCollectorUri, string ex)`
`99`	`109`	`{`
`@@ -208,10 +218,10 @@ public void GrpcStatusWarning(string endpoint, string statusCode)`
`208`	`218`	`this.WriteEvent(22, endpoint, statusCode);`
`209`	`219`	`}`
`210`	`220`
`211`		`- [Event(23, Message = "Export failed for {0}. Message: {1}", Level = EventLevel.Error)]`
`212`		`- public void ExportFailure(string endpoint, string message)`
	`221`	`+ [Event(23, Message = "Export failed for {0}. Message: {1}. {2}.", Level = EventLevel.Error)]`
	`222`	`+ public void ExportFailure(string endpoint, string message, string statusString)`
`213`	`223`	`{`
`214`		`- this.WriteEvent(23, endpoint, message);`
	`224`	`+ this.WriteEvent(23, endpoint, message, statusString);`
`215`	`225`	`}`
`216`	`226`
`217`	`227`	`[Event(24, Message = "Failed to parse gRPC retry delay from header grpcStatusDetailsHeader: '{0}'. Exception: {1}", Level = EventLevel.Warning)]`