Merge branch 'main' into cijothomas/sdk-self-obs-processor-log-processed

Author: cijothomas

.github/workflows/package-validation.yml

@@ -22,11 +22,19 @@ jobs:
         persist-credentials: false
         show-progress: false
 
+    - name: Get Git commit timestamp
+      id: get-commit-timestamp
+      shell: pwsh
+      run: |
+        "epoch=$(git log -1 --pretty=%ct)" >> ${env:GITHUB_OUTPUT}
+
     - name: Setup .NET
       uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0
 
     - name: dotnet pack
       run: dotnet pack ./build/OpenTelemetry.proj --configuration Release /p:EnablePackageValidation=true /p:ExposeExperimentalFeatures=false /p:RunningDotNetPack=true
+      env:
+        SOURCE_DATE_EPOCH: ${{ steps.get-commit-timestamp.outputs.epoch }}
 
     - name: Publish stable NuGet packages to Artifacts
       uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
@@ -50,11 +58,19 @@ jobs:
         persist-credentials: false
         show-progress: false
 
+    - name: Get Git commit timestamp
+      id: get-commit-timestamp
+      shell: pwsh
+      run: |
+        "epoch=$(git log -1 --pretty=%ct)" >> ${env:GITHUB_OUTPUT}
+
     - name: Setup .NET
       uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0
 
     - name: dotnet pack
       run: dotnet pack ./build/OpenTelemetry.proj --configuration Release /p:EnablePackageValidation=true /p:ExposeExperimentalFeatures=true /p:RunningDotNetPack=true
+      env:
+        SOURCE_DATE_EPOCH: ${{ steps.get-commit-timestamp.outputs.epoch }}
 
     - name: Publish experimental NuGet packages to Artifacts
       uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1

.github/workflows/publish-packages-1.0.yml

@@ -58,6 +58,12 @@ jobs:
         persist-credentials: false
         show-progress: false
 
+    - name: Get Git commit timestamp
+      id: get-commit-timestamp
+      shell: pwsh
+      run: |
+        "epoch=$(git log -1 --pretty=%ct)" >> ${env:GITHUB_OUTPUT}
+
     - name: Setup .NET
       uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0
 
@@ -97,6 +103,7 @@ jobs:
       shell: pwsh
       env:
         PACK_TAG: ${{ github.ref_type == 'tag' && github.ref_name || '' }}
+        SOURCE_DATE_EPOCH: ${{ steps.get-commit-timestamp.outputs.epoch }}
       run: dotnet pack ./build/OpenTelemetry.proj --configuration Release --no-restore --no-build -p:"PackTag=${env:PACK_TAG}"
 
     - name: Install NuGet package validation tools

README.md

@@ -204,7 +204,7 @@ To verify the integrity of a DLL inside a NuGet package use the
 These versions are using bundle format known from cosign 3.0+.
 
 ```bash
-$TAG="core-1.14.0"
+TAG="core-1.16.0"
 cosign verify-blob \
     --bundle OpenTelemetry.dll.sigstore.json \
     --certificate-identity "https://github.com/open-telemetry/opentelemetry-dotnet/.github/workflows/publish-packages-1.0.yml@refs/tags/$TAG" \
@@ -213,13 +213,16 @@ cosign verify-blob \
     OpenTelemetry.dll
 ```
 
+> [!NOTE]
+> A successful verification outputs `Verified OK`.
+
 #### Versions 1.10.0 - 1.14.0-rc.1
 
 These versions are using separate signature and certificate files format known
 from cosign 2.x.
 
 ```bash
-$TAG="core-1.12.0"
+TAG="core-1.12.0"
 cosign verify-blob \
     --signature OpenTelemetry.dll-keyless.sig \
     --certificate OpenTelemetry.dll-keyless.pem \

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

@@ -219,11 +219,15 @@ private static bool ValidateKey(ReadOnlySpan<char> key)
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         static bool IsValidFirstCharacter(char c)
-            => char.IsAsciiLetterLower(c) || char.IsAsciiDigit(c);
+        {
+            return char.IsAsciiLetterLower(c) || char.IsAsciiDigit(c);
+        }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         static bool IsValidCharacter(char c)
-            => IsValidFirstCharacter(c) || c is '_' or '-' or '*' or '/' or '@';
+        {
+            return IsValidFirstCharacter(c) || c is '_' or '-' or '*' or '/' or '@';
+        }
     }
 
     private static bool ValidateValue(ReadOnlySpan<char> value)

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/Serializer/ProtobufOtlpMetricSerializer.cs

@@ -12,7 +12,12 @@ internal static class ProtobufOtlpMetricSerializer
     private const int ReserveSizeForLength = 4;
     private const int TraceIdSize = 16;
     private const int SpanIdSize = 8;
+
+#if NETFRAMEWORK || NETSTANDARD2_0
     private static readonly ConditionalWeakTable<Metric, byte[]> CachedMetricMetadata = new();
+#else
+    private static readonly ConditionalWeakTable<Metric, byte[]> CachedMetricMetadata = [];
+#endif
 
     [ThreadStatic]
     private static Stack<List<Metric>>? metricListPool;

src/OpenTelemetry.Exporter.Prometheus.HttpListener/Internal/Shared/PrometheusMetric.cs

@@ -239,7 +239,7 @@ UpDownCounter becomes gauge
         EscapingScheme.AllowUtf8 => this.allowUtf8Names ??= BuildAllowUtf8Names(this.rawName, this.Unit, this.Type, this.disableTotalNameSuffixForCounters),
         EscapingScheme.Dots => this.dotsNames ??= BuildEscapedNames(this.rawName, this.Unit, this.Type, this.disableTotalNameSuffixForCounters, EscapingScheme.Dots),
         EscapingScheme.Values => this.valuesNames ??= BuildEscapedNames(this.rawName, this.Unit, this.Type, this.disableTotalNameSuffixForCounters, EscapingScheme.Values),
-        _ => this.underscoreNames,
+        EscapingScheme.Underscores or _ => this.underscoreNames,
     };
 
     private static byte[] ConvertToBytes(string value)

src/OpenTelemetry.Exporter.Prometheus.HttpListener/Internal/Shared/Serialization/TextFormatSerializer.cs

@@ -60,6 +60,19 @@ internal abstract class TextFormatSerializer
     private static readonly long UnixEpochTicks = new DateTimeOffset(1970, 1, 1, 0, 0, 0, TimeSpan.Zero).Ticks;
 #endif
 
+    // Scope labels (otel_scope_*) depend only on the Metric's invariant
+    // scope (meter name/version/schema-url/tags) and are not affected by
+    // the negotiated escaping scheme, so the built label collections can
+    // be computed once per Metric and reused across every serialization
+    // call instead of being rebuilt for each call to WriteMetric.
+#if NET
+    private static readonly ConditionalWeakTable<Metric, List<KeyValuePair<string, string>>> ScopeLabelsCache = [];
+    private static readonly ConditionalWeakTable<Metric, List<LabelData>> ScopeLabelDataCache = [];
+#else
+    private static readonly ConditionalWeakTable<Metric, List<KeyValuePair<string, string>>> ScopeLabelsCache = new();
+    private static readonly ConditionalWeakTable<Metric, List<LabelData>> ScopeLabelDataCache = new();
+#endif
+
     private static readonly string[] ReservedExemplarLabelNames = ["trace_id", "span_id"];
     private static readonly double[] ExactPowersOfTen =
     [
@@ -341,7 +354,7 @@ internal static int GetNextSerializedTagsBufferSize(int currentBufferSize)
         // the scrape immediately rather than repeatedly re-entering this allocation.
         var newBufferSize = currentBufferSize * 2;
 
-        return newBufferSize <= 0 || newBufferSize > MaxSerializedTagsBufferSize
+        return newBufferSize is <= 0 or > MaxSerializedTagsBufferSize
             ? throw new InvalidOperationException("The serialized Prometheus tag set exceeded the maximum supported size.")
             : newBufferSize;
     }
@@ -813,7 +826,7 @@ internal int WriteTags(
 
         if (!options.SuppressScopeInfo)
         {
-            foreach (var scopeLabel in CreateScopeLabelData(metric))
+            foreach (var scopeLabel in GetScopeLabelData(metric))
             {
                 // Scope labels (otel_scope_*) are already in their target Prometheus form, so they
                 // are written verbatim and not re-escaped by the negotiated scheme, exactly as the
@@ -837,7 +850,7 @@ void WriteScopeLabels()
             // tags they can never collide with an already-written label. They only need to be
             // written (which also records their output keys so point tags can detect a collision
             // with a scope label).
-            foreach (var scopeLabel in CreateScopeLabels(metric))
+            foreach (var scopeLabel in GetScopeLabels(metric))
             {
                 _ = TryWriteLabel(scopeLabel.Key, scopeLabel.Value, isScopeLabel: true);
             }
@@ -1290,12 +1303,15 @@ private static string NormalizeLabelKey(string value)
         return builder.ToString();
     }
 
+    private static List<KeyValuePair<string, string>> GetScopeLabels(Metric metric)
+        => ScopeLabelsCache.GetValue(metric, CreateScopeLabels);
+
     private static List<KeyValuePair<string, string>> CreateScopeLabels(Metric metric)
     {
         var orderedKeys = new List<string>();
         var labelsByOutputKey = new Dictionary<string, List<LabelData>>(StringComparer.Ordinal);
 
-        foreach (var label in CreateScopeLabelData(metric))
+        foreach (var label in GetScopeLabelData(metric))
         {
             if (!labelsByOutputKey.TryGetValue(label.OutputKey, out var bucket))
             {
@@ -1317,6 +1333,9 @@ private static List<KeyValuePair<string, string>> CreateScopeLabels(Metric metri
         return scopeLabels;
     }
 
+    private static List<LabelData> GetScopeLabelData(Metric metric)
+        => ScopeLabelDataCache.GetValue(metric, CreateScopeLabelData);
+
     private static List<LabelData> CreateScopeLabelData(Metric metric)
     {
         var scopeLabels = new List<LabelData>(3)
@@ -2105,7 +2124,7 @@ private int WriteOutputLabelKey(byte[] buffer, int cursor, string key)
             EscapingScheme.AllowUtf8 => WriteLabelName(buffer, cursor, key),
 
             // The dots and values schemes escape the name and quote it only if a colon survives.
-            _ => WriteEscapedLabelKey(buffer, cursor, key, this.Escaping),
+            EscapingScheme.Dots or EscapingScheme.Values or _ => WriteEscapedLabelKey(buffer, cursor, key, this.Escaping),
         };
     }
 

src/OpenTelemetry.Shims.OpenTracing/ScopeManagerShim.cs

@@ -10,9 +10,11 @@ namespace OpenTelemetry.Shims.OpenTracing;
 
 internal sealed class ScopeManagerShim : IScopeManager
 {
-#pragma warning disable IDE0028 // Simplify collection initialization
+#if NETFRAMEWORK || NETSTANDARD2_0
     private static readonly ConditionalWeakTable<TelemetrySpan, IScope> SpanScopeTable = new();
-#pragma warning restore IDE0028 // Simplify collection initialization
+#else
+    private static readonly ConditionalWeakTable<TelemetrySpan, IScope> SpanScopeTable = [];
+#endif
 
 #if DEBUG
     private int spanScopeTableCount;

src/OpenTelemetry/Metrics/MetricPoint/MetricPoint.cs

@@ -902,7 +902,9 @@ internal void TakeSnapshotWithExemplar(bool outputDelta)
     /// <returns><see langword="true"/> if there is unexported data; otherwise, <see langword="false"/>.</returns>
     internal bool HasUnexportedData()
     {
+#pragma warning disable IDE0066 // Convert switch statement to expression
         switch (this.aggType)
+#pragma warning restore IDE0066 // Convert switch statement to expression
         {
             case AggregationType.LongSumIncomingDelta:
             case AggregationType.LongSumIncomingCumulative:
@@ -918,6 +920,13 @@ internal bool HasUnexportedData()
             case AggregationType.DoubleGauge:
                 return InterlockedHelper.Read(ref this.runningValue.AsDouble) != this.snapshotValue.AsDouble;
 
+            case AggregationType.Base2ExponentialHistogram:
+            case AggregationType.Base2ExponentialHistogramWithMinMax:
+            case AggregationType.Histogram:
+            case AggregationType.HistogramWithBuckets:
+            case AggregationType.HistogramWithMinMax:
+            case AggregationType.HistogramWithMinMaxBuckets:
+            case AggregationType.Invalid:
             default:
                 // Histogram aggregations reset the running count to zero on each delta snapshot, so
                 // a non-zero running count means measurements have been recorded since the last

test/Benchmarks/Exporter/ProtobufOtlpMetricSerializerBenchmarks.cs

@@ -53,7 +53,7 @@ public void Setup()
 
         this.meterProvider.ForceFlush();
 
-        this.capturedMetrics = collected.ToArray();
+        this.capturedMetrics = [.. collected];
         this.batch = new Batch<Metric>(this.capturedMetrics, this.capturedMetrics.Length);
     }