Merge branch 'main' into main

Author: sandy2008

Directory.Packages.props

@@ -109,7 +109,7 @@
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(LatestRuntimeOutOfBandVer)" />
     <PackageVersion Include="Microsoft.Extensions.Telemetry.Abstractions" Version="[9.0.0,)" />
     <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="[1.0.3,2.0)" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="[17.11.0,18.0.0)" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="[17.13.0,18.0.0)" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="[8.0.0,9.0)" />
     <PackageVersion Include="MinVer" Version="[5.0.0,6.0)" />
     <PackageVersion Include="NuGet.Versioning" Version="6.11.0" />
@@ -121,7 +121,7 @@
     <PackageVersion Include="StyleCop.Analyzers" Version="[1.2.0-beta.556,2.0)" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="[6.7.3,)" />
     <PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageVersion Include="xunit" Version="[2.9.0,3.0)" />
+    <PackageVersion Include="xunit" Version="[2.9.3,3.0)" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="[2.8.2,3.0)" />
   </ItemGroup>
 

docs/metrics/customizing-the-sdk/Program.cs

@@ -29,19 +29,19 @@ public static void Main()
             .AddView(instrumentName: "MyCounter", name: "MyCounterRenamed")
 
             // Change Histogram boundaries using the Explicit Bucket Histogram aggregation.
-            .AddView(instrumentName: "MyHistogram", new ExplicitBucketHistogramConfiguration() { Boundaries = new double[] { 10, 20 } })
+            .AddView(instrumentName: "MyHistogram", new ExplicitBucketHistogramConfiguration() { Boundaries = [10.0, 20.0] })
 
             // Change Histogram to use the Base2 Exponential Bucket Histogram aggregation.
             .AddView(instrumentName: "MyExponentialBucketHistogram", new Base2ExponentialBucketHistogramConfiguration())
 
             // For the instrument "MyCounterCustomTags", aggregate with only the keys "tag1", "tag2".
-            .AddView(instrumentName: "MyCounterCustomTags", new MetricStreamConfiguration() { TagKeys = new string[] { "tag1", "tag2" } })
+            .AddView(instrumentName: "MyCounterCustomTags", new MetricStreamConfiguration() { TagKeys = ["tag1", "tag2"] })
 
             // Drop the instrument "MyCounterDrop".
             .AddView(instrumentName: "MyCounterDrop", MetricStreamConfiguration.Drop)
 
             // Configure the Explicit Bucket Histogram aggregation with custom boundaries and new name.
-            .AddView(instrumentName: "histogramWithMultipleAggregations", new ExplicitBucketHistogramConfiguration() { Boundaries = new double[] { 10, 20 }, Name = "MyHistogramWithExplicitHistogram" })
+            .AddView(instrumentName: "histogramWithMultipleAggregations", new ExplicitBucketHistogramConfiguration() { Boundaries = [10.0, 20.0], Name = "MyHistogramWithExplicitHistogram" })
 
             // Use Base2 Exponential Bucket Histogram aggregation and new name.
             .AddView(instrumentName: "histogramWithMultipleAggregations", new Base2ExponentialBucketHistogramConfiguration() { Name = "MyHistogramWithBase2ExponentialBucketHistogram" })

examples/AspNetCore/Controllers/WeatherForecastController.cs

@@ -12,10 +12,10 @@ namespace Examples.AspNetCore.Controllers;
 [Route("[controller]")]
 public class WeatherForecastController : ControllerBase
 {
-    private static readonly string[] Summaries = new[]
-    {
-        "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching",
-    };
+    private static readonly string[] Summaries =
+    [
+        "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
+    ];
 
     private static readonly HttpClient HttpClient = new();
 

examples/Console/TestPrometheusExporter.cs

@@ -35,7 +35,7 @@ internal static int Run(PrometheusOptions options)
             .AddMeter(MyMeter.Name)
             .AddMeter(MyMeter2.Name)
             .AddPrometheusHttpListener(
-                o => o.UriPrefixes = new string[] { $"http://localhost:{options.Port}/" })
+                o => o.UriPrefixes = [$"http://localhost:{options.Port}/"])
             .Build();
 
         var process = Process.GetCurrentProcess();

src/OpenTelemetry.Api/CHANGELOG.md

@@ -6,6 +6,10 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+* Revert optimize performance of `TraceContextPropagator.Extract` introduced
+  in #5749 to resolve #6158.
+  ([#6161](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6161))
+
 ## 1.11.1
 
 Released 2025-Jan-22

src/OpenTelemetry.Api/Context/Propagation/B3Propagator.cs

@@ -35,7 +35,7 @@ public sealed class B3Propagator : TextMapPropagator
     // "Debug" sampled value.
     internal const string FlagsValue = "1";
 
-    private static readonly HashSet<string> AllFields = new() { XB3TraceId, XB3SpanId, XB3ParentSpanId, XB3Sampled, XB3Flags };
+    private static readonly HashSet<string> AllFields = [XB3TraceId, XB3SpanId, XB3ParentSpanId, XB3Sampled, XB3Flags];
 
     private static readonly HashSet<string> SampledValues = new(StringComparer.Ordinal) { SampledValue, LegacySampledValue };
 

src/OpenTelemetry.Api/Context/Propagation/BaggagePropagator.cs

@@ -20,8 +20,8 @@ public class BaggagePropagator : TextMapPropagator
     private const int MaxBaggageLength = 8192;
     private const int MaxBaggageItems = 180;
 
-    private static readonly char[] EqualSignSeparator = new[] { '=' };
-    private static readonly char[] CommaSignSeparator = new[] { ',' };
+    private static readonly char[] EqualSignSeparator = ['='];
+    private static readonly char[] CommaSignSeparator = [','];
 
     /// <inheritdoc/>
     public override ISet<string> Fields => new HashSet<string> { BaggageHeaderName };

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)

src/OpenTelemetry.Api/Logs/LogRecordSeverityExtensions.cs

@@ -57,8 +57,8 @@ static class LogRecordSeverityExtensions
     internal const string Fatal3ShortName = FatalShortName + "3";
     internal const string Fatal4ShortName = FatalShortName + "4";
 
-    private static readonly string[] LogRecordSeverityShortNames = new string[]
-    {
+    private static readonly string[] LogRecordSeverityShortNames =
+    [
         UnspecifiedShortName,
 
         TraceShortName,
@@ -89,8 +89,8 @@ static class LogRecordSeverityExtensions
         FatalShortName,
         Fatal2ShortName,
         Fatal3ShortName,
-        Fatal4ShortName,
-    };
+        Fatal4ShortName
+    ];
 
     /// <summary>
     /// Returns the OpenTelemetry Specification short name for the <see

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md

@@ -18,7 +18,6 @@ Notes](../../RELEASENOTES.md).
 
 * Fixed incorrect log serialization of attributes with null values, causing
   some backends to reject logs.
-  some backends to reject logs when using OTLP exporter to output protobuf.
   ([#6149](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6149))
 
 ## 1.11.1

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,

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)]

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporterOptionsExtensions.cs

@@ -88,7 +88,7 @@ public static THeaders GetHeaders<THeaders>(this OtlpExporterOptions options, Ac
                 {
                     // Specify the maximum number of substrings to return to 2
                     // This treats everything that follows the first `=` in the string as the value to be added for the metadata key
-                    var keyValueData = pair.Split(new char[] { '=' }, 2);
+                    var keyValueData = pair.Split(['='], 2);
                     if (keyValueData.Length != 2)
                     {
                         throw new ArgumentException("Headers provided in an invalid format.");
@@ -197,11 +197,11 @@ public static void TryEnableIHttpClientFactoryIntegration(this OtlpExporterOptio
                             "CreateClient",
                             BindingFlags.Public | BindingFlags.Instance,
                             binder: null,
-                            new Type[] { typeof(string) },
+                            [typeof(string)],
                             modifiers: null);
                         if (createClientMethod != null)
                         {
-                            HttpClient? client = (HttpClient?)createClientMethod.Invoke(httpClientFactory, new object[] { httpClientName });
+                            HttpClient? client = (HttpClient?)createClientMethod.Invoke(httpClientFactory, [httpClientName]);
 
                             if (client != null)
                             {