[otlp] Avoid filling new buffer on expansion (open-telemetry#6019)

rajkumar-rangaraj · web-flow · commit 1f39623af5aa · 2024-12-10T22:19:03.000-08:00
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/Serializer/ProtobufOtlpLogSerializer.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/Serializer/ProtobufOtlpLogSerializer.cs
@@ -22,10 +22,6 @@ internal static class ProtobufOtlpLogSerializer
 
     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;
-
         foreach (var logRecord in logRecordBatch)
         {
             var scopeName = logRecord.Logger.Name;
@@ -48,20 +44,28 @@ internal static int WriteLogsData(ref byte[] buffer, int writePosition, SdkLimit
         }
 
         writePosition = TryWriteResourceLogs(ref buffer, writePosition, sdkLimitOptions, experimentalOptions, resource, ScopeLogsList);
-        ProtobufSerializer.WriteReservedLength(buffer, logsDataLengthPosition, writePosition - (logsDataLengthPosition + ReserveSizeForLength));
         ReturnLogRecordListToPool();
 
         return writePosition;
     }
 
     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 (Exception ex) when (ex is IndexOutOfRangeException || ex is ArgumentException)
         {
+            writePosition = entryWritePosition;
             if (!ProtobufSerializer.IncreaseBufferSize(ref buffer, OtlpSignalType.Logs))
             {
                 throw;
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/Serializer/ProtobufOtlpMetricSerializer.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/Serializer/ProtobufOtlpMetricSerializer.cs
@@ -19,10 +19,6 @@ internal static class ProtobufOtlpMetricSerializer
 
     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;
-
         foreach (var metric in batch)
         {
             var metricName = metric.MeterName;
@@ -36,20 +32,28 @@ internal static int WriteMetricsData(ref byte[] buffer, int writePosition, Resou
         }
 
         writePosition = TryWriteResourceMetrics(ref buffer, writePosition, resource, ScopeMetricsList);
-        ProtobufSerializer.WriteReservedLength(buffer, mericsDataLengthPosition, writePosition - (mericsDataLengthPosition + ReserveSizeForLength));
         ReturnMetricListToPool();
 
         return writePosition;
     }
 
     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 (Exception ex) when (ex is IndexOutOfRangeException || ex is ArgumentException)
         {
+            writePosition = entryWritePosition;
             if (!ProtobufSerializer.IncreaseBufferSize(ref buffer, OtlpSignalType.Metrics))
             {
                 throw;
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/Serializer/ProtobufOtlpTraceSerializer.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/Serializer/ProtobufOtlpTraceSerializer.cs
@@ -20,10 +20,6 @@ internal static class ProtobufOtlpTraceSerializer
 
     internal static int WriteTraceData(ref byte[] buffer, int writePosition, SdkLimitOptions sdkLimitOptions, Resources.Resource? resource, in Batch<Activity> batch)
     {
-        writePosition = ProtobufSerializer.WriteTag(buffer, writePosition, ProtobufOtlpTraceFieldNumberConstants.TracesData_Resource_Spans, ProtobufWireType.LEN);
-        int resourceSpansScopeSpansLengthPosition = writePosition;
-        writePosition += ReserveSizeForLength;
-
         foreach (var activity in batch)
         {
             var sourceName = activity.Source.Name;
@@ -38,19 +34,28 @@ internal static int WriteTraceData(ref byte[] buffer, int writePosition, SdkLimi
 
         writePosition = TryWriteResourceSpans(ref buffer, writePosition, sdkLimitOptions, resource);
         ReturnActivityListToPool();
-        ProtobufSerializer.WriteReservedLength(buffer, resourceSpansScopeSpansLengthPosition, writePosition - (resourceSpansScopeSpansLengthPosition + ReserveSizeForLength));
 
         return writePosition;
     }
 
     internal static int TryWriteResourceSpans(ref byte[] buffer, int writePosition, SdkLimitOptions sdkLimitOptions, Resources.Resource? resource)
     {
+        int entryWritePosition = writePosition;
+
         try
         {
+            writePosition = ProtobufSerializer.WriteTag(buffer, writePosition, ProtobufOtlpTraceFieldNumberConstants.TracesData_Resource_Spans, ProtobufWireType.LEN);
+            int resourceSpansScopeSpansLengthPosition = writePosition;
+            writePosition += ReserveSizeForLength;
+
             writePosition = WriteResourceSpans(buffer, writePosition, sdkLimitOptions, resource);
+
+            ProtobufSerializer.WriteReservedLength(buffer, resourceSpansScopeSpansLengthPosition, writePosition - (resourceSpansScopeSpansLengthPosition + ReserveSizeForLength));
         }
         catch (Exception ex) when (ex is IndexOutOfRangeException || ex is ArgumentException)
         {
+            writePosition = entryWritePosition;
+
             // Attempt to increase the buffer size
             if (!ProtobufSerializer.IncreaseBufferSize(ref buffer, OtlpSignalType.Traces))
             {
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/Serializer/ProtobufSerializer.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/Serializer/ProtobufSerializer.cs
@@ -359,9 +359,7 @@ internal static bool IncreaseBufferSize(ref byte[] buffer, OtlpSignalType otlpSi
         try
         {
             var newBufferSize = buffer.Length * 2;
-            var newBuffer = new byte[newBufferSize];
-            buffer.CopyTo(newBuffer, 0);
-            buffer = newBuffer;
+            buffer = new byte[newBufferSize];
             return true;
         }
         catch (OutOfMemoryException)

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,6 @@ internal static class ProtobufOtlpLogSerializer`
`22`	`22`
`23`	`23`	`internal static int WriteLogsData(ref byte[] buffer, int writePosition, SdkLimitOptions sdkLimitOptions, ExperimentalOptions experimentalOptions, Resources.Resource? resource, in Batch<LogRecord> logRecordBatch)`
`24`	`24`	`{`
`25`		`- writePosition = ProtobufSerializer.WriteTag(buffer, writePosition, ProtobufOtlpLogFieldNumberConstants.LogsData_Resource_Logs, ProtobufWireType.LEN);`
`26`		`- int logsDataLengthPosition = writePosition;`
`27`		`- writePosition += ReserveSizeForLength;`
`28`		`-`
`29`	`25`	`foreach (var logRecord in logRecordBatch)`
`30`	`26`	`{`
`31`	`27`	`var scopeName = logRecord.Logger.Name;`
`@@ -48,20 +44,28 @@ internal static int WriteLogsData(ref byte[] buffer, int writePosition, SdkLimit`
`48`	`44`	`}`
`49`	`45`
`50`	`46`	`writePosition = TryWriteResourceLogs(ref buffer, writePosition, sdkLimitOptions, experimentalOptions, resource, ScopeLogsList);`
`51`		`- ProtobufSerializer.WriteReservedLength(buffer, logsDataLengthPosition, writePosition - (logsDataLengthPosition + ReserveSizeForLength));`
`52`	`47`	`ReturnLogRecordListToPool();`
`53`	`48`
`54`	`49`	`return writePosition;`
`55`	`50`	`}`
`56`	`51`
`57`	`52`	`internal static int TryWriteResourceLogs(ref byte[] buffer, int writePosition, SdkLimitOptions sdkLimitOptions, ExperimentalOptions experimentalOptions, Resources.Resource? resource, Dictionary<string, List<LogRecord>> scopeLogs)`
`58`	`53`	`{`
	`54`	`+ int entryWritePosition = writePosition;`
	`55`	`+`
`59`	`56`	`try`
`60`	`57`	`{`
	`58`	`+ writePosition = ProtobufSerializer.WriteTag(buffer, writePosition, ProtobufOtlpLogFieldNumberConstants.LogsData_Resource_Logs, ProtobufWireType.LEN);`
	`59`	`+ int logsDataLengthPosition = writePosition;`
	`60`	`+ writePosition += ReserveSizeForLength;`
	`61`	`+`
`61`	`62`	`writePosition = WriteResourceLogs(buffer, writePosition, sdkLimitOptions, experimentalOptions, resource, scopeLogs);`
	`63`	`+`
	`64`	`+ ProtobufSerializer.WriteReservedLength(buffer, logsDataLengthPosition, writePosition - (logsDataLengthPosition + ReserveSizeForLength));`
`62`	`65`	`}`
`63`	`66`	`catch (Exception ex) when (ex is IndexOutOfRangeException \|\| ex is ArgumentException)`
`64`	`67`	`{`
	`68`	`+ writePosition = entryWritePosition;`
`65`	`69`	`if (!ProtobufSerializer.IncreaseBufferSize(ref buffer, OtlpSignalType.Logs))`
`66`	`70`	`{`
`67`	`71`	`throw;`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,6 @@ internal static class ProtobufOtlpMetricSerializer`
`19`	`19`
`20`	`20`	`internal static int WriteMetricsData(ref byte[] buffer, int writePosition, Resources.Resource? resource, in Batch<Metric> batch)`
`21`	`21`	`{`
`22`		`- writePosition = ProtobufSerializer.WriteTag(buffer, writePosition, ProtobufOtlpMetricFieldNumberConstants.MetricsData_Resource_Metrics, ProtobufWireType.LEN);`
`23`		`- int mericsDataLengthPosition = writePosition;`
`24`		`- writePosition += ReserveSizeForLength;`
`25`		`-`
`26`	`22`	`foreach (var metric in batch)`
`27`	`23`	`{`
`28`	`24`	`var metricName = metric.MeterName;`
`@@ -36,20 +32,28 @@ internal static int WriteMetricsData(ref byte[] buffer, int writePosition, Resou`
`36`	`32`	`}`
`37`	`33`
`38`	`34`	`writePosition = TryWriteResourceMetrics(ref buffer, writePosition, resource, ScopeMetricsList);`
`39`		`- ProtobufSerializer.WriteReservedLength(buffer, mericsDataLengthPosition, writePosition - (mericsDataLengthPosition + ReserveSizeForLength));`
`40`	`35`	`ReturnMetricListToPool();`
`41`	`36`
`42`	`37`	`return writePosition;`
`43`	`38`	`}`
`44`	`39`
`45`	`40`	`internal static int TryWriteResourceMetrics(ref byte[] buffer, int writePosition, Resources.Resource? resource, Dictionary<string, List<Metric>> scopeMetrics)`
`46`	`41`	`{`
	`42`	`+ int entryWritePosition = writePosition;`
	`43`	`+`
`47`	`44`	`try`
`48`	`45`	`{`
	`46`	`+ writePosition = ProtobufSerializer.WriteTag(buffer, writePosition, ProtobufOtlpMetricFieldNumberConstants.MetricsData_Resource_Metrics, ProtobufWireType.LEN);`
	`47`	`+ int mericsDataLengthPosition = writePosition;`
	`48`	`+ writePosition += ReserveSizeForLength;`
	`49`	`+`
`49`	`50`	`writePosition = WriteResourceMetrics(buffer, writePosition, resource, scopeMetrics);`
	`51`	`+`
	`52`	`+ ProtobufSerializer.WriteReservedLength(buffer, mericsDataLengthPosition, writePosition - (mericsDataLengthPosition + ReserveSizeForLength));`
`50`	`53`	`}`
`51`	`54`	`catch (Exception ex) when (ex is IndexOutOfRangeException \|\| ex is ArgumentException)`
`52`	`55`	`{`
	`56`	`+ writePosition = entryWritePosition;`
`53`	`57`	`if (!ProtobufSerializer.IncreaseBufferSize(ref buffer, OtlpSignalType.Metrics))`
`54`	`58`	`{`
`55`	`59`	`throw;`
Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,6 @@ internal static class ProtobufOtlpTraceSerializer`
`20`	`20`
`21`	`21`	`internal static int WriteTraceData(ref byte[] buffer, int writePosition, SdkLimitOptions sdkLimitOptions, Resources.Resource? resource, in Batch<Activity> batch)`
`22`	`22`	`{`
`23`		`- writePosition = ProtobufSerializer.WriteTag(buffer, writePosition, ProtobufOtlpTraceFieldNumberConstants.TracesData_Resource_Spans, ProtobufWireType.LEN);`
`24`		`- int resourceSpansScopeSpansLengthPosition = writePosition;`
`25`		`- writePosition += ReserveSizeForLength;`
`26`		`-`
`27`	`23`	`foreach (var activity in batch)`
`28`	`24`	`{`
`29`	`25`	`var sourceName = activity.Source.Name;`
`@@ -38,19 +34,28 @@ internal static int WriteTraceData(ref byte[] buffer, int writePosition, SdkLimi`
`38`	`34`
`39`	`35`	`writePosition = TryWriteResourceSpans(ref buffer, writePosition, sdkLimitOptions, resource);`
`40`	`36`	`ReturnActivityListToPool();`
`41`		`- ProtobufSerializer.WriteReservedLength(buffer, resourceSpansScopeSpansLengthPosition, writePosition - (resourceSpansScopeSpansLengthPosition + ReserveSizeForLength));`
`42`	`37`
`43`	`38`	`return writePosition;`
`44`	`39`	`}`
`45`	`40`
`46`	`41`	`internal static int TryWriteResourceSpans(ref byte[] buffer, int writePosition, SdkLimitOptions sdkLimitOptions, Resources.Resource? resource)`
`47`	`42`	`{`
	`43`	`+ int entryWritePosition = writePosition;`
	`44`	`+`
`48`	`45`	`try`
`49`	`46`	`{`
	`47`	`+ writePosition = ProtobufSerializer.WriteTag(buffer, writePosition, ProtobufOtlpTraceFieldNumberConstants.TracesData_Resource_Spans, ProtobufWireType.LEN);`
	`48`	`+ int resourceSpansScopeSpansLengthPosition = writePosition;`
	`49`	`+ writePosition += ReserveSizeForLength;`
	`50`	`+`
`50`	`51`	`writePosition = WriteResourceSpans(buffer, writePosition, sdkLimitOptions, resource);`
	`52`	`+`
	`53`	`+ ProtobufSerializer.WriteReservedLength(buffer, resourceSpansScopeSpansLengthPosition, writePosition - (resourceSpansScopeSpansLengthPosition + ReserveSizeForLength));`
`51`	`54`	`}`
`52`	`55`	`catch (Exception ex) when (ex is IndexOutOfRangeException \|\| ex is ArgumentException)`
`53`	`56`	`{`
	`57`	`+ writePosition = entryWritePosition;`
	`58`	`+`
`54`	`59`	`// Attempt to increase the buffer size`
`55`	`60`	`if (!ProtobufSerializer.IncreaseBufferSize(ref buffer, OtlpSignalType.Traces))`
`56`	`61`	`{`
Original file line number	Diff line number	Diff line change
`@@ -359,9 +359,7 @@ internal static bool IncreaseBufferSize(ref byte[] buffer, OtlpSignalType otlpSi`
`359`	`359`	`try`
`360`	`360`	`{`
`361`	`361`	`var newBufferSize = buffer.Length * 2;`
`362`		`- var newBuffer = new byte[newBufferSize];`
`363`		`- buffer.CopyTo(newBuffer, 0);`
`364`		`- buffer = newBuffer;`
	`362`	`+ buffer = new byte[newBufferSize];`
`365`	`363`	`return true;`
`366`	`364`	`}`
`367`	`365`	`catch (OutOfMemoryException)`