Merge branch 'main' into log_flush_docs

.github/dependabot.yml

@@ -6,3 +6,15 @@ updates:
       interval: "daily"
     labels:
       - "infra"
+  - package-ecosystem: "dotnet-sdk"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "wednesday"
+    labels:
+      - "infra"
+    ignore:
+      - dependency-name: "*"
+        update-types:
+          - "version-update:semver-major"
+          - "version-update:semver-minor"

.github/workflows/Component.BuildTest.yml

@@ -72,7 +72,7 @@ jobs:
       run: dotnet-coverage merge -f cobertura -o ./TestResults/Cobertura.xml ./TestResults/**/*.coverage
 
     - name: Upload code coverage ${{ inputs.code-cov-prefix }}-${{ inputs.code-cov-name }}
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v5
       continue-on-error: true # Note: Don't fail for upload failures
       env:
         OS: ${{ matrix.os }}

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
     "rollForward": "latestFeature",
-    "version": "9.0.100"
+    "version": "9.0.101"
   }
 }

src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md

@@ -7,6 +7,10 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+## 1.11.0-rc.1
+
+Released 2024-Dec-11
+
 ## 1.10.0
 
 Released 2024-Nov-12

src/OpenTelemetry.Api/CHANGELOG.md

@@ -6,6 +6,10 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+## 1.11.0-rc.1
+
+Released 2024-Dec-11
+
 ## 1.10.0
 
 Released 2024-Nov-12

src/OpenTelemetry.Exporter.Console/CHANGELOG.md

@@ -6,6 +6,10 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+## 1.11.0-rc.1
+
+Released 2024-Dec-11
+
 ## 1.10.0
 
 Released 2024-Nov-12

src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md

@@ -6,6 +6,10 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+## 1.11.0-rc.1
+
+Released 2024-Dec-11
+
 ## 1.10.0
 
 Released 2024-Nov-12

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md

@@ -7,6 +7,36 @@ Notes](../../RELEASENOTES.md).
 
 ## Unreleased
 
+## 1.11.0-rc.1
+
+Released 2024-Dec-11
+
+* Removed the following package references:
+
+  * `Google.Protobuf`
+  * `Grpc`
+  * `Grpc.Net.Client`
+
+  These changes were made to streamline dependencies and reduce the footprint of
+  the exporter.
+  ([#6005](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6005))
+
+* Switched from using the `Google.Protobuf` library for serialization to a
+  custom manual implementation of protobuf serialization.
+  ([#6005](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6005))
+
+* Fixed an issue where a `service.name` was added to the resource if it was
+  missing. The exporter now respects the resource data provided by the SDK
+  without modifications.
+  ([#6015](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6015))
+
+* Removed the peer service resolver, which was based on earlier experimental
+  semantic conventions that are not part of the stable specification. This
+  change ensures that the exporter no longer modifies or assumes the value of
+  peer service attributes, aligning it more closely with OpenTelemetry protocol
+  specifications.
+  ([#6005](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6005))
+
 ## 1.10.0
 
 Released 2024-Nov-12

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/OpenTelemetryProtocolExporterEventSource.cs

@@ -220,6 +220,12 @@ public void GrpcRetryDelayParsingFailed(string grpcStatusDetailsHeader, string e
         this.WriteEvent(24, grpcStatusDetailsHeader, exception);
     }
 
+    [Event(25, Message = "The array tag buffer exceeded the maximum allowed size. The array tag value was replaced with 'TRUNCATED'", Level = EventLevel.Warning)]
+    public void ArrayBufferExceededMaxSize()
+    {
+        this.WriteEvent(25);
+    }
+
     void IConfigurationExtensionsLogger.LogInvalidConfigurationValue(string key, string value)
     {
         this.InvalidConfigurationValue(key, value);

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

@@ -14,25 +14,26 @@ internal static class ProtobufOtlpLogSerializer
     private const int TraceIdSize = 16;
     private const int SpanIdSize = 8;
 
-    private static readonly Stack<List<LogRecord>> LogsListPool = [];
-    private static readonly Dictionary<string, List<LogRecord>> ScopeLogsList = [];
+    [ThreadStatic]
+    private static Stack<List<LogRecord>>? logsListPool;
+    [ThreadStatic]
+    private static Dictionary<string, List<LogRecord>>? scopeLogsList;
 
     [ThreadStatic]
     private static SerializationState? threadSerializationState;
 
-    internal static int WriteLogsData(byte[] buffer, int writePosition, SdkLimitOptions sdkLimitOptions, ExperimentalOptions experimentalOptions, Resources.Resource? resource, in Batch<LogRecord> logRecordBatch)
+    internal static int WriteLogsData(ref byte[] buffer, int writePosition, SdkLimitOptions sdkLimitOptions, ExperimentalOptions experimentalOptions, Resources.Resource? resource, in Batch<LogRecord> logRecordBatch)
     {
-        writePosition = ProtobufSerializer.WriteTag(buffer, writePosition, ProtobufOtlpLogFieldNumberConstants.LogsData_Resource_Logs, ProtobufWireType.LEN);
-        int logsDataLengthPosition = writePosition;
-        writePosition += ReserveSizeForLength;
+        logsListPool ??= [];
+        scopeLogsList ??= [];
 
         foreach (var logRecord in logRecordBatch)
         {
             var scopeName = logRecord.Logger.Name;
-            if (!ScopeLogsList.TryGetValue(scopeName, out var logRecords))
+            if (!scopeLogsList.TryGetValue(scopeName, out var logRecords))
             {
-                logRecords = LogsListPool.Count > 0 ? LogsListPool.Pop() : [];
-                ScopeLogsList[scopeName] = logRecords;
+                logRecords = logsListPool.Count > 0 ? logsListPool.Pop() : [];
+                scopeLogsList[scopeName] = logRecords;
             }
 
             if (logRecord.Source == LogRecord.LogRecordSource.FromSharedPool)
@@ -47,37 +48,45 @@ internal static int WriteLogsData(byte[] buffer, int writePosition, SdkLimitOpti
             logRecords.Add(logRecord);
         }
 
-        writePosition = TryWriteResourceLogs(buffer, writePosition, sdkLimitOptions, experimentalOptions, resource, ScopeLogsList);
-        ProtobufSerializer.WriteReservedLength(buffer, logsDataLengthPosition, writePosition - (logsDataLengthPosition + ReserveSizeForLength));
+        writePosition = TryWriteResourceLogs(ref buffer, writePosition, sdkLimitOptions, experimentalOptions, resource, scopeLogsList);
         ReturnLogRecordListToPool();
 
         return writePosition;
     }
 
-    internal static int TryWriteResourceLogs(byte[] buffer, int writePosition, SdkLimitOptions sdkLimitOptions, ExperimentalOptions experimentalOptions, Resources.Resource? resource, Dictionary<string, List<LogRecord>> scopeLogs)
+    internal static int TryWriteResourceLogs(ref byte[] buffer, int writePosition, SdkLimitOptions sdkLimitOptions, ExperimentalOptions experimentalOptions, Resources.Resource? resource, Dictionary<string, List<LogRecord>> scopeLogs)
     {
+        int entryWritePosition = writePosition;
+
         try
         {
+            writePosition = ProtobufSerializer.WriteTag(buffer, writePosition, ProtobufOtlpLogFieldNumberConstants.LogsData_Resource_Logs, ProtobufWireType.LEN);
+            int logsDataLengthPosition = writePosition;
+            writePosition += ReserveSizeForLength;
+
             writePosition = WriteResourceLogs(buffer, writePosition, sdkLimitOptions, experimentalOptions, resource, scopeLogs);
+
+            ProtobufSerializer.WriteReservedLength(buffer, logsDataLengthPosition, writePosition - (logsDataLengthPosition + ReserveSizeForLength));
         }
-        catch (IndexOutOfRangeException)
+        catch (Exception ex) when (ex is IndexOutOfRangeException || ex is ArgumentException)
         {
+            writePosition = entryWritePosition;
             if (!ProtobufSerializer.IncreaseBufferSize(ref buffer, OtlpSignalType.Logs))
             {
                 throw;
             }
 
-            return TryWriteResourceLogs(buffer, writePosition, sdkLimitOptions, experimentalOptions, resource, scopeLogs);
+            return TryWriteResourceLogs(ref buffer, writePosition, sdkLimitOptions, experimentalOptions, resource, scopeLogs);
         }
 
         return writePosition;
     }
 
     internal static void ReturnLogRecordListToPool()
     {
-        if (ScopeLogsList.Count != 0)
+        if (scopeLogsList?.Count != 0)
         {
-            foreach (var entry in ScopeLogsList)
+            foreach (var entry in scopeLogsList!)
             {
                 foreach (var logRecord in entry.Value)
                 {
@@ -92,10 +101,10 @@ internal static void ReturnLogRecordListToPool()
                 }
 
                 entry.Value.Clear();
-                LogsListPool.Push(entry.Value);
+                logsListPool?.Push(entry.Value);
             }
 
-            ScopeLogsList.Clear();
+            scopeLogsList.Clear();
         }
     }
 

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

@@ -12,66 +12,75 @@ internal static class ProtobufOtlpMetricSerializer
     private const int TraceIdSize = 16;
     private const int SpanIdSize = 8;
 
-    private static readonly Stack<List<Metric>> MetricListPool = [];
-    private static readonly Dictionary<string, List<Metric>> ScopeMetricsList = [];
+    [ThreadStatic]
+    private static Stack<List<Metric>>? metricListPool;
+    [ThreadStatic]
+    private static Dictionary<string, List<Metric>>? scopeMetricsList;
 
     private delegate int WriteExemplarFunc(byte[] buffer, int writePosition, in Exemplar exemplar);
 
-    internal static int WriteMetricsData(byte[] buffer, int writePosition, Resources.Resource? resource, in Batch<Metric> batch)
+    internal static int WriteMetricsData(ref byte[] buffer, int writePosition, Resources.Resource? resource, in Batch<Metric> batch)
     {
-        writePosition = ProtobufSerializer.WriteTag(buffer, writePosition, ProtobufOtlpMetricFieldNumberConstants.MetricsData_Resource_Metrics, ProtobufWireType.LEN);
-        int mericsDataLengthPosition = writePosition;
-        writePosition += ReserveSizeForLength;
+        metricListPool ??= [];
+        scopeMetricsList ??= [];
 
         foreach (var metric in batch)
         {
             var metricName = metric.MeterName;
-            if (!ScopeMetricsList.TryGetValue(metricName, out var metrics))
+            if (!scopeMetricsList.TryGetValue(metricName, out var metrics))
             {
-                metrics = MetricListPool.Count > 0 ? MetricListPool.Pop() : new List<Metric>();
-                ScopeMetricsList[metricName] = metrics;
+                metrics = metricListPool.Count > 0 ? metricListPool.Pop() : new List<Metric>();
+                scopeMetricsList[metricName] = metrics;
             }
 
             metrics.Add(metric);
         }
 
-        writePosition = TryWriteResourceMetrics(buffer, writePosition, resource, ScopeMetricsList);
-        ProtobufSerializer.WriteReservedLength(buffer, mericsDataLengthPosition, writePosition - (mericsDataLengthPosition + ReserveSizeForLength));
+        writePosition = TryWriteResourceMetrics(ref buffer, writePosition, resource, scopeMetricsList);
         ReturnMetricListToPool();
 
         return writePosition;
     }
 
-    internal static int TryWriteResourceMetrics(byte[] buffer, int writePosition, Resources.Resource? resource, Dictionary<string, List<Metric>> scopeMetrics)
+    internal static int TryWriteResourceMetrics(ref byte[] buffer, int writePosition, Resources.Resource? resource, Dictionary<string, List<Metric>> scopeMetrics)
     {
+        int entryWritePosition = writePosition;
+
         try
         {
+            writePosition = ProtobufSerializer.WriteTag(buffer, writePosition, ProtobufOtlpMetricFieldNumberConstants.MetricsData_Resource_Metrics, ProtobufWireType.LEN);
+            int mericsDataLengthPosition = writePosition;
+            writePosition += ReserveSizeForLength;
+
             writePosition = WriteResourceMetrics(buffer, writePosition, resource, scopeMetrics);
+
+            ProtobufSerializer.WriteReservedLength(buffer, mericsDataLengthPosition, writePosition - (mericsDataLengthPosition + ReserveSizeForLength));
         }
-        catch (IndexOutOfRangeException)
+        catch (Exception ex) when (ex is IndexOutOfRangeException || ex is ArgumentException)
         {
+            writePosition = entryWritePosition;
             if (!ProtobufSerializer.IncreaseBufferSize(ref buffer, OtlpSignalType.Metrics))
             {
                 throw;
             }
 
-            return TryWriteResourceMetrics(buffer, writePosition, resource, scopeMetrics);
+            return TryWriteResourceMetrics(ref buffer, writePosition, resource, scopeMetrics);
         }
 
         return writePosition;
     }
 
     private static void ReturnMetricListToPool()
     {
-        if (ScopeMetricsList.Count != 0)
+        if (scopeMetricsList?.Count != 0)
         {
-            foreach (var entry in ScopeMetricsList)
+            foreach (var entry in scopeMetricsList!)
             {
                 entry.Value.Clear();
-                MetricListPool.Push(entry.Value);
+                metricListPool?.Push(entry.Value);
             }
 
-            ScopeMetricsList.Clear();
+            scopeMetricsList.Clear();
         }
     }
 

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

@@ -9,9 +9,6 @@ internal static class ProtobufOtlpResourceSerializer
 {
     private const int ReserveSizeForLength = 4;
 
-    private static readonly string DefaultServiceName = ResourceBuilder.CreateDefault().Build().Attributes.FirstOrDefault(
-        kvp => kvp.Key == ResourceSemanticConventions.AttributeServiceName).Value as string ?? "unknown_service";
-
     internal static int WriteResource(byte[] buffer, int writePosition, Resource? resource)
     {
         ProtobufOtlpTagWriter.OtlpTagWriterState otlpTagWriterState = new ProtobufOtlpTagWriter.OtlpTagWriterState
@@ -24,41 +21,24 @@ internal static int WriteResource(byte[] buffer, int writePosition, Resource? re
         int resourceLengthPosition = otlpTagWriterState.WritePosition;
         otlpTagWriterState.WritePosition += ReserveSizeForLength;
 
-        bool isServiceNamePresent = false;
         if (resource != null && resource != Resource.Empty)
         {
             if (resource.Attributes is IReadOnlyList<KeyValuePair<string, object>> resourceAttributesList)
             {
                 for (int i = 0; i < resourceAttributesList.Count; i++)
                 {
-                    var attribute = resourceAttributesList[i];
-                    if (attribute.Key == ResourceSemanticConventions.AttributeServiceName)
-                    {
-                        isServiceNamePresent = true;
-                    }
-
-                    ProcessResourceAttribute(ref otlpTagWriterState, attribute);
+                    ProcessResourceAttribute(ref otlpTagWriterState, resourceAttributesList[i]);
                 }
             }
             else
             {
                 foreach (var attribute in resource.Attributes)
                 {
-                    if (attribute.Key == ResourceSemanticConventions.AttributeServiceName)
-                    {
-                        isServiceNamePresent = true;
-                    }
-
                     ProcessResourceAttribute(ref otlpTagWriterState, attribute);
                 }
             }
         }
 
-        if (!isServiceNamePresent)
-        {
-            ProcessResourceAttribute(ref otlpTagWriterState, new KeyValuePair<string, object>(ResourceSemanticConventions.AttributeServiceName, DefaultServiceName));
-        }
-
         var resourceLength = otlpTagWriterState.WritePosition - (resourceLengthPosition + ReserveSizeForLength);
         ProtobufSerializer.WriteReservedLength(otlpTagWriterState.Buffer, resourceLengthPosition, resourceLength);