[otlp] Update TraceSerializer to use attributes / dropped from state. (open-telemetry#5946)

rajkumar-rangaraj · CodeBlanch · web-flow · commit ed1b27f5926d · 2024-10-31T17:19:25.000-07:00
Co-authored-by: Mikel Blanchard &lt;mblanchard@macrosssoftware.com&gt;
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/Serializer/ProtobufOtlpTraceSerializer.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/Serializer/ProtobufOtlpTraceSerializer.cs
@@ -54,8 +54,6 @@ internal static void ReturnActivityListToPool()
 
     internal static int WriteResourceSpans(byte[] buffer, int writePosition, SdkLimitOptions sdkLimitOptions, Resources.Resource? resource, Dictionary<string, List<Activity>> scopeTraces)
     {
-        int maxAttributeValueLength = sdkLimitOptions.AttributeValueLengthLimit ?? int.MaxValue;
-
         writePosition = ProtobufOtlpResourceSerializer.WriteResource(buffer, writePosition, resource);
         writePosition = WriteScopeSpans(buffer, writePosition, sdkLimitOptions, scopeTraces);
 
@@ -96,20 +94,19 @@ internal static int WriteScopeSpan(byte[] buffer, int writePosition, SdkLimitOpt
         {
             var maxAttributeCount = sdkLimitOptions.SpanAttributeCountLimit ?? int.MaxValue;
             var maxAttributeValueLength = sdkLimitOptions.AttributeValueLengthLimit ?? int.MaxValue;
-            var attributeCount = 0;
-            var droppedAttributeCount = 0;
-
             ProtobufOtlpTagWriter.OtlpTagWriterState otlpTagWriterState = new ProtobufOtlpTagWriter.OtlpTagWriterState
             {
                 Buffer = buffer,
                 WritePosition = writePosition,
+                TagCount = 0,
+                DroppedTagCount = 0,
             };
 
             if (activitySource.Tags is IReadOnlyList<KeyValuePair<string, object?>> activitySourceTagsList)
             {
                 for (int i = 0; i < activitySourceTagsList.Count; i++)
                 {
-                    if (attributeCount < maxAttributeCount)
+                    if (otlpTagWriterState.TagCount < maxAttributeCount)
                     {
                         otlpTagWriterState.WritePosition = ProtobufSerializer.WriteTag(otlpTagWriterState.Buffer, otlpTagWriterState.WritePosition, ProtobufOtlpTraceFieldNumberConstants.InstrumentationScope_Attributes, ProtobufWireType.LEN);
                         int instrumentationScopeAttributesLengthPosition = otlpTagWriterState.WritePosition;
@@ -119,19 +116,19 @@ internal static int WriteScopeSpan(byte[] buffer, int writePosition, SdkLimitOpt
 
                         var instrumentationScopeAttributesLength = otlpTagWriterState.WritePosition - (instrumentationScopeAttributesLengthPosition + ReserveSizeForLength);
                         ProtobufSerializer.WriteReservedLength(otlpTagWriterState.Buffer, instrumentationScopeAttributesLengthPosition, instrumentationScopeAttributesLength);
-                        attributeCount++;
+                        otlpTagWriterState.TagCount++;
                     }
                     else
                     {
-                        droppedAttributeCount++;
+                        otlpTagWriterState.DroppedTagCount++;
                     }
                 }
             }
             else
             {
                 foreach (var tag in activitySource.Tags)
                 {
-                    if (attributeCount < maxAttributeCount)
+                    if (otlpTagWriterState.TagCount < maxAttributeCount)
                     {
                         otlpTagWriterState.WritePosition = ProtobufSerializer.WriteTag(otlpTagWriterState.Buffer, otlpTagWriterState.WritePosition, ProtobufOtlpTraceFieldNumberConstants.InstrumentationScope_Attributes, ProtobufWireType.LEN);
                         int instrumentationScopeAttributesLengthPosition = otlpTagWriterState.WritePosition;
@@ -141,19 +138,19 @@ internal static int WriteScopeSpan(byte[] buffer, int writePosition, SdkLimitOpt
 
                         var instrumentationScopeAttributesLength = otlpTagWriterState.WritePosition - (instrumentationScopeAttributesLengthPosition + ReserveSizeForLength);
                         ProtobufSerializer.WriteReservedLength(otlpTagWriterState.Buffer, instrumentationScopeAttributesLengthPosition, instrumentationScopeAttributesLength);
-                        attributeCount++;
+                        otlpTagWriterState.TagCount++;
                     }
                     else
                     {
-                        droppedAttributeCount++;
+                        otlpTagWriterState.DroppedTagCount++;
                     }
                 }
             }
 
-            if (droppedAttributeCount > 0)
+            if (otlpTagWriterState.DroppedTagCount > 0)
             {
                 otlpTagWriterState.WritePosition = ProtobufSerializer.WriteTag(buffer, otlpTagWriterState.WritePosition, ProtobufOtlpTraceFieldNumberConstants.InstrumentationScope_Dropped_Attributes_Count, ProtobufWireType.VARINT);
-                otlpTagWriterState.WritePosition = ProtobufSerializer.WriteVarInt32(buffer, otlpTagWriterState.WritePosition, (uint)droppedAttributeCount);
+                otlpTagWriterState.WritePosition = ProtobufSerializer.WriteVarInt32(buffer, otlpTagWriterState.WritePosition, (uint)otlpTagWriterState.DroppedTagCount);
             }
 
             writePosition = otlpTagWriterState.WritePosition;
@@ -242,13 +239,12 @@ internal static (int Position, StatusCode? StatusCode, string? StatusMessage) Wr
         string? statusMessage = null;
         int maxAttributeCount = sdkLimitOptions.SpanAttributeCountLimit ?? int.MaxValue;
         int maxAttributeValueLength = sdkLimitOptions.AttributeValueLengthLimit ?? int.MaxValue;
-        int attributeCount = 0;
-        int droppedAttributeCount = 0;
-
         ProtobufOtlpTagWriter.OtlpTagWriterState otlpTagWriterState = new ProtobufOtlpTagWriter.OtlpTagWriterState
         {
             Buffer = buffer,
             WritePosition = writePosition,
+            TagCount = 0,
+            DroppedTagCount = 0,
         };
 
         foreach (ref readonly var tag in activity.EnumerateTagObjects())
@@ -275,7 +271,7 @@ not null when OkStatusCodeTagValue.Equals(tag.Value as string, StringComparison.
                     continue;
             }
 
-            if (attributeCount < maxAttributeCount)
+            if (otlpTagWriterState.TagCount < maxAttributeCount)
             {
                 otlpTagWriterState.WritePosition = ProtobufSerializer.WriteTag(otlpTagWriterState.Buffer, otlpTagWriterState.WritePosition, ProtobufOtlpTraceFieldNumberConstants.Span_Attributes, ProtobufWireType.LEN);
                 int spanAttributesLengthPosition = otlpTagWriterState.WritePosition;
@@ -284,18 +280,18 @@ not null when OkStatusCodeTagValue.Equals(tag.Value as string, StringComparison.
                 ProtobufOtlpTagWriter.Instance.TryWriteTag(ref otlpTagWriterState, tag.Key, tag.Value, maxAttributeValueLength);
 
                 ProtobufSerializer.WriteReservedLength(buffer, spanAttributesLengthPosition, otlpTagWriterState.WritePosition - (spanAttributesLengthPosition + 4));
-                attributeCount++;
+                otlpTagWriterState.TagCount++;
             }
             else
             {
-                droppedAttributeCount++;
+                otlpTagWriterState.DroppedTagCount++;
             }
         }
 
-        if (droppedAttributeCount > 0)
+        if (otlpTagWriterState.DroppedTagCount > 0)
         {
             otlpTagWriterState.WritePosition = ProtobufSerializer.WriteTag(buffer, otlpTagWriterState.WritePosition, ProtobufOtlpTraceFieldNumberConstants.Span_Dropped_Attributes_Count, ProtobufWireType.VARINT);
-            otlpTagWriterState.WritePosition = ProtobufSerializer.WriteVarInt32(buffer, otlpTagWriterState.WritePosition, (uint)droppedAttributeCount);
+            otlpTagWriterState.WritePosition = ProtobufSerializer.WriteVarInt32(buffer, otlpTagWriterState.WritePosition, (uint)otlpTagWriterState.DroppedTagCount);
         }
 
         return (otlpTagWriterState.WritePosition, statusCode, statusMessage);
@@ -340,36 +336,36 @@ internal static int WriteEventAttributes(ref byte[] buffer, int writePosition, S
     {
         int maxAttributeCount = sdkLimitOptions.SpanEventAttributeCountLimit ?? int.MaxValue;
         int maxAttributeValueLength = sdkLimitOptions.AttributeValueLengthLimit ?? int.MaxValue;
-        int attributeCount = 0;
-        int droppedAttributeCount = 0;
 
         ProtobufOtlpTagWriter.OtlpTagWriterState otlpTagWriterState = new ProtobufOtlpTagWriter.OtlpTagWriterState
         {
             Buffer = buffer,
             WritePosition = writePosition,
+            TagCount = 0,
+            DroppedTagCount = 0,
         };
 
         foreach (ref readonly var tag in evnt.EnumerateTagObjects())
         {
-            if (attributeCount < maxAttributeCount)
+            if (otlpTagWriterState.TagCount < maxAttributeCount)
             {
                 otlpTagWriterState.WritePosition = ProtobufSerializer.WriteTag(otlpTagWriterState.Buffer, otlpTagWriterState.WritePosition, ProtobufOtlpTraceFieldNumberConstants.Event_Attributes, ProtobufWireType.LEN);
                 int eventAttributesLengthPosition = otlpTagWriterState.WritePosition;
                 otlpTagWriterState.WritePosition += ReserveSizeForLength;
                 ProtobufOtlpTagWriter.Instance.TryWriteTag(ref otlpTagWriterState, tag.Key, tag.Value, maxAttributeValueLength);
                 ProtobufSerializer.WriteReservedLength(buffer, eventAttributesLengthPosition, otlpTagWriterState.WritePosition - (eventAttributesLengthPosition + ReserveSizeForLength));
-                attributeCount++;
+                otlpTagWriterState.TagCount++;
             }
             else
             {
-                droppedAttributeCount++;
+                otlpTagWriterState.DroppedTagCount++;
             }
         }
 
-        if (droppedAttributeCount > 0)
+        if (otlpTagWriterState.DroppedTagCount > 0)
         {
             otlpTagWriterState.WritePosition = ProtobufSerializer.WriteTag(buffer, otlpTagWriterState.WritePosition, ProtobufOtlpTraceFieldNumberConstants.Event_Dropped_Attributes_Count, ProtobufWireType.VARINT);
-            otlpTagWriterState.WritePosition = ProtobufSerializer.WriteVarInt32(buffer, otlpTagWriterState.WritePosition, (uint)droppedAttributeCount);
+            otlpTagWriterState.WritePosition = ProtobufSerializer.WriteVarInt32(buffer, otlpTagWriterState.WritePosition, (uint)otlpTagWriterState.DroppedTagCount);
         }
 
         return otlpTagWriterState.WritePosition;
@@ -423,36 +419,35 @@ internal static int WriteLinkAttributes(byte[] buffer, int writePosition, SdkLim
     {
         int maxAttributeCount = sdkLimitOptions.SpanLinkAttributeCountLimit ?? int.MaxValue;
         int maxAttributeValueLength = sdkLimitOptions.AttributeValueLengthLimit ?? int.MaxValue;
-        int attributeCount = 0;
-        int droppedAttributeCount = 0;
-
         ProtobufOtlpTagWriter.OtlpTagWriterState otlpTagWriterState = new ProtobufOtlpTagWriter.OtlpTagWriterState
         {
             Buffer = buffer,
             WritePosition = writePosition,
+            TagCount = 0,
+            DroppedTagCount = 0,
         };
 
         foreach (ref readonly var tag in link.EnumerateTagObjects())
         {
-            if (attributeCount < maxAttributeCount)
+            if (otlpTagWriterState.TagCount < maxAttributeCount)
             {
                 otlpTagWriterState.WritePosition = ProtobufSerializer.WriteTag(otlpTagWriterState.Buffer, otlpTagWriterState.WritePosition, ProtobufOtlpTraceFieldNumberConstants.Link_Attributes, ProtobufWireType.LEN);
                 int linkAttributesLengthPosition = otlpTagWriterState.WritePosition;
                 otlpTagWriterState.WritePosition += ReserveSizeForLength;
                 ProtobufOtlpTagWriter.Instance.TryWriteTag(ref otlpTagWriterState, tag.Key, tag.Value, maxAttributeValueLength);
                 ProtobufSerializer.WriteReservedLength(buffer, linkAttributesLengthPosition, otlpTagWriterState.WritePosition - (linkAttributesLengthPosition + ReserveSizeForLength));
-                attributeCount++;
+                otlpTagWriterState.TagCount++;
             }
             else
             {
-                droppedAttributeCount++;
+                otlpTagWriterState.DroppedTagCount++;
             }
         }
 
-        if (droppedAttributeCount > 0)
+        if (otlpTagWriterState.DroppedTagCount > 0)
         {
             otlpTagWriterState.WritePosition = ProtobufSerializer.WriteTag(buffer, otlpTagWriterState.WritePosition, ProtobufOtlpTraceFieldNumberConstants.Link_Dropped_Attributes_Count, ProtobufWireType.VARINT);
-            otlpTagWriterState.WritePosition = ProtobufSerializer.WriteVarInt32(buffer, otlpTagWriterState.WritePosition, (uint)droppedAttributeCount);
+            otlpTagWriterState.WritePosition = ProtobufSerializer.WriteVarInt32(buffer, otlpTagWriterState.WritePosition, (uint)otlpTagWriterState.DroppedTagCount);
         }
 
         return otlpTagWriterState.WritePosition;

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,6 @@ internal static void ReturnActivityListToPool()`
`54`	`54`
`55`	`55`	`internal static int WriteResourceSpans(byte[] buffer, int writePosition, SdkLimitOptions sdkLimitOptions, Resources.Resource? resource, Dictionary<string, List<Activity>> scopeTraces)`
`56`	`56`	`{`
`57`		`- int maxAttributeValueLength = sdkLimitOptions.AttributeValueLengthLimit ?? int.MaxValue;`
`58`		`-`
`59`	`57`	`writePosition = ProtobufOtlpResourceSerializer.WriteResource(buffer, writePosition, resource);`
`60`	`58`	`writePosition = WriteScopeSpans(buffer, writePosition, sdkLimitOptions, scopeTraces);`
`61`	`59`
`@@ -96,20 +94,19 @@ internal static int WriteScopeSpan(byte[] buffer, int writePosition, SdkLimitOpt`
`96`	`94`	`{`
`97`	`95`	`var maxAttributeCount = sdkLimitOptions.SpanAttributeCountLimit ?? int.MaxValue;`
`98`	`96`	`var maxAttributeValueLength = sdkLimitOptions.AttributeValueLengthLimit ?? int.MaxValue;`
`99`		`- var attributeCount = 0;`
`100`		`- var droppedAttributeCount = 0;`
`101`		`-`
`102`	`97`	`ProtobufOtlpTagWriter.OtlpTagWriterState otlpTagWriterState = new ProtobufOtlpTagWriter.OtlpTagWriterState`
`103`	`98`	`{`
`104`	`99`	`Buffer = buffer,`
`105`	`100`	`WritePosition = writePosition,`
	`101`	`+ TagCount = 0,`
	`102`	`+ DroppedTagCount = 0,`
`106`	`103`	`};`
`107`	`104`
`108`	`105`	`if (activitySource.Tags is IReadOnlyList<KeyValuePair<string, object?>> activitySourceTagsList)`
`109`	`106`	`{`
`110`	`107`	`for (int i = 0; i < activitySourceTagsList.Count; i++)`
`111`	`108`	`{`
`112`		`- if (attributeCount < maxAttributeCount)`
	`109`	`+ if (otlpTagWriterState.TagCount < maxAttributeCount)`
`113`	`110`	`{`
`114`	`111`	`otlpTagWriterState.WritePosition = ProtobufSerializer.WriteTag(otlpTagWriterState.Buffer, otlpTagWriterState.WritePosition, ProtobufOtlpTraceFieldNumberConstants.InstrumentationScope_Attributes, ProtobufWireType.LEN);`
`115`	`112`	`int instrumentationScopeAttributesLengthPosition = otlpTagWriterState.WritePosition;`
`@@ -119,19 +116,19 @@ internal static int WriteScopeSpan(byte[] buffer, int writePosition, SdkLimitOpt`
`119`	`116`
`120`	`117`	`var instrumentationScopeAttributesLength = otlpTagWriterState.WritePosition - (instrumentationScopeAttributesLengthPosition + ReserveSizeForLength);`
`121`	`118`	`ProtobufSerializer.WriteReservedLength(otlpTagWriterState.Buffer, instrumentationScopeAttributesLengthPosition, instrumentationScopeAttributesLength);`
`122`		`- attributeCount++;`
	`119`	`+ otlpTagWriterState.TagCount++;`
`123`	`120`	`}`
`124`	`121`	`else`
`125`	`122`	`{`
`126`		`- droppedAttributeCount++;`
	`123`	`+ otlpTagWriterState.DroppedTagCount++;`
`127`	`124`	`}`
`128`	`125`	`}`
`129`	`126`	`}`
`130`	`127`	`else`
`131`	`128`	`{`
`132`	`129`	`foreach (var tag in activitySource.Tags)`
`133`	`130`	`{`
`134`		`- if (attributeCount < maxAttributeCount)`
	`131`	`+ if (otlpTagWriterState.TagCount < maxAttributeCount)`
`135`	`132`	`{`
`136`	`133`	`otlpTagWriterState.WritePosition = ProtobufSerializer.WriteTag(otlpTagWriterState.Buffer, otlpTagWriterState.WritePosition, ProtobufOtlpTraceFieldNumberConstants.InstrumentationScope_Attributes, ProtobufWireType.LEN);`
`137`	`134`	`int instrumentationScopeAttributesLengthPosition = otlpTagWriterState.WritePosition;`
`@@ -141,19 +138,19 @@ internal static int WriteScopeSpan(byte[] buffer, int writePosition, SdkLimitOpt`
`141`	`138`
`142`	`139`	`var instrumentationScopeAttributesLength = otlpTagWriterState.WritePosition - (instrumentationScopeAttributesLengthPosition + ReserveSizeForLength);`
`143`	`140`	`ProtobufSerializer.WriteReservedLength(otlpTagWriterState.Buffer, instrumentationScopeAttributesLengthPosition, instrumentationScopeAttributesLength);`
`144`		`- attributeCount++;`
	`141`	`+ otlpTagWriterState.TagCount++;`
`145`	`142`	`}`
`146`	`143`	`else`
`147`	`144`	`{`
`148`		`- droppedAttributeCount++;`
	`145`	`+ otlpTagWriterState.DroppedTagCount++;`
`149`	`146`	`}`
`150`	`147`	`}`
`151`	`148`	`}`
`152`	`149`
`153`		`- if (droppedAttributeCount > 0)`
	`150`	`+ if (otlpTagWriterState.DroppedTagCount > 0)`
`154`	`151`	`{`
`155`	`152`	`otlpTagWriterState.WritePosition = ProtobufSerializer.WriteTag(buffer, otlpTagWriterState.WritePosition, ProtobufOtlpTraceFieldNumberConstants.InstrumentationScope_Dropped_Attributes_Count, ProtobufWireType.VARINT);`
`156`		`- otlpTagWriterState.WritePosition = ProtobufSerializer.WriteVarInt32(buffer, otlpTagWriterState.WritePosition, (uint)droppedAttributeCount);`
	`153`	`+ otlpTagWriterState.WritePosition = ProtobufSerializer.WriteVarInt32(buffer, otlpTagWriterState.WritePosition, (uint)otlpTagWriterState.DroppedTagCount);`
`157`	`154`	`}`
`158`	`155`
`159`	`156`	`writePosition = otlpTagWriterState.WritePosition;`
`@@ -242,13 +239,12 @@ internal static (int Position, StatusCode? StatusCode, string? StatusMessage) Wr`
`242`	`239`	`string? statusMessage = null;`
`243`	`240`	`int maxAttributeCount = sdkLimitOptions.SpanAttributeCountLimit ?? int.MaxValue;`
`244`	`241`	`int maxAttributeValueLength = sdkLimitOptions.AttributeValueLengthLimit ?? int.MaxValue;`
`245`		`- int attributeCount = 0;`
`246`		`- int droppedAttributeCount = 0;`
`247`		`-`
`248`	`242`	`ProtobufOtlpTagWriter.OtlpTagWriterState otlpTagWriterState = new ProtobufOtlpTagWriter.OtlpTagWriterState`
`249`	`243`	`{`
`250`	`244`	`Buffer = buffer,`
`251`	`245`	`WritePosition = writePosition,`
	`246`	`+ TagCount = 0,`
	`247`	`+ DroppedTagCount = 0,`
`252`	`248`	`};`
`253`	`249`
`254`	`250`	`foreach (ref readonly var tag in activity.EnumerateTagObjects())`
`@@ -275,7 +271,7 @@ not null when OkStatusCodeTagValue.Equals(tag.Value as string, StringComparison.`
`275`	`271`	`continue;`
`276`	`272`	`}`
`277`	`273`
`278`		`- if (attributeCount < maxAttributeCount)`
	`274`	`+ if (otlpTagWriterState.TagCount < maxAttributeCount)`
`279`	`275`	`{`
`280`	`276`	`otlpTagWriterState.WritePosition = ProtobufSerializer.WriteTag(otlpTagWriterState.Buffer, otlpTagWriterState.WritePosition, ProtobufOtlpTraceFieldNumberConstants.Span_Attributes, ProtobufWireType.LEN);`
`281`	`277`	`int spanAttributesLengthPosition = otlpTagWriterState.WritePosition;`
`@@ -284,18 +280,18 @@ not null when OkStatusCodeTagValue.Equals(tag.Value as string, StringComparison.`
`284`	`280`	`ProtobufOtlpTagWriter.Instance.TryWriteTag(ref otlpTagWriterState, tag.Key, tag.Value, maxAttributeValueLength);`
`285`	`281`
`286`	`282`	`ProtobufSerializer.WriteReservedLength(buffer, spanAttributesLengthPosition, otlpTagWriterState.WritePosition - (spanAttributesLengthPosition + 4));`
`287`		`- attributeCount++;`
	`283`	`+ otlpTagWriterState.TagCount++;`
`288`	`284`	`}`
`289`	`285`	`else`
`290`	`286`	`{`
`291`		`- droppedAttributeCount++;`
	`287`	`+ otlpTagWriterState.DroppedTagCount++;`
`292`	`288`	`}`
`293`	`289`	`}`
`294`	`290`
`295`		`- if (droppedAttributeCount > 0)`
	`291`	`+ if (otlpTagWriterState.DroppedTagCount > 0)`
`296`	`292`	`{`
`297`	`293`	`otlpTagWriterState.WritePosition = ProtobufSerializer.WriteTag(buffer, otlpTagWriterState.WritePosition, ProtobufOtlpTraceFieldNumberConstants.Span_Dropped_Attributes_Count, ProtobufWireType.VARINT);`
`298`		`- otlpTagWriterState.WritePosition = ProtobufSerializer.WriteVarInt32(buffer, otlpTagWriterState.WritePosition, (uint)droppedAttributeCount);`
	`294`	`+ otlpTagWriterState.WritePosition = ProtobufSerializer.WriteVarInt32(buffer, otlpTagWriterState.WritePosition, (uint)otlpTagWriterState.DroppedTagCount);`
`299`	`295`	`}`
`300`	`296`
`301`	`297`	`return (otlpTagWriterState.WritePosition, statusCode, statusMessage);`
`@@ -340,36 +336,36 @@ internal static int WriteEventAttributes(ref byte[] buffer, int writePosition, S`
`340`	`336`	`{`
`341`	`337`	`int maxAttributeCount = sdkLimitOptions.SpanEventAttributeCountLimit ?? int.MaxValue;`
`342`	`338`	`int maxAttributeValueLength = sdkLimitOptions.AttributeValueLengthLimit ?? int.MaxValue;`
`343`		`- int attributeCount = 0;`
`344`		`- int droppedAttributeCount = 0;`
`345`	`339`
`346`	`340`	`ProtobufOtlpTagWriter.OtlpTagWriterState otlpTagWriterState = new ProtobufOtlpTagWriter.OtlpTagWriterState`
`347`	`341`	`{`
`348`	`342`	`Buffer = buffer,`
`349`	`343`	`WritePosition = writePosition,`
	`344`	`+ TagCount = 0,`
	`345`	`+ DroppedTagCount = 0,`
`350`	`346`	`};`
`351`	`347`
`352`	`348`	`foreach (ref readonly var tag in evnt.EnumerateTagObjects())`
`353`	`349`	`{`
`354`		`- if (attributeCount < maxAttributeCount)`
	`350`	`+ if (otlpTagWriterState.TagCount < maxAttributeCount)`
`355`	`351`	`{`
`356`	`352`	`otlpTagWriterState.WritePosition = ProtobufSerializer.WriteTag(otlpTagWriterState.Buffer, otlpTagWriterState.WritePosition, ProtobufOtlpTraceFieldNumberConstants.Event_Attributes, ProtobufWireType.LEN);`
`357`	`353`	`int eventAttributesLengthPosition = otlpTagWriterState.WritePosition;`
`358`	`354`	`otlpTagWriterState.WritePosition += ReserveSizeForLength;`
`359`	`355`	`ProtobufOtlpTagWriter.Instance.TryWriteTag(ref otlpTagWriterState, tag.Key, tag.Value, maxAttributeValueLength);`
`360`	`356`	`ProtobufSerializer.WriteReservedLength(buffer, eventAttributesLengthPosition, otlpTagWriterState.WritePosition - (eventAttributesLengthPosition + ReserveSizeForLength));`
`361`		`- attributeCount++;`
	`357`	`+ otlpTagWriterState.TagCount++;`
`362`	`358`	`}`
`363`	`359`	`else`
`364`	`360`	`{`
`365`		`- droppedAttributeCount++;`
	`361`	`+ otlpTagWriterState.DroppedTagCount++;`
`366`	`362`	`}`
`367`	`363`	`}`
`368`	`364`
`369`		`- if (droppedAttributeCount > 0)`
	`365`	`+ if (otlpTagWriterState.DroppedTagCount > 0)`
`370`	`366`	`{`
`371`	`367`	`otlpTagWriterState.WritePosition = ProtobufSerializer.WriteTag(buffer, otlpTagWriterState.WritePosition, ProtobufOtlpTraceFieldNumberConstants.Event_Dropped_Attributes_Count, ProtobufWireType.VARINT);`
`372`		`- otlpTagWriterState.WritePosition = ProtobufSerializer.WriteVarInt32(buffer, otlpTagWriterState.WritePosition, (uint)droppedAttributeCount);`
	`368`	`+ otlpTagWriterState.WritePosition = ProtobufSerializer.WriteVarInt32(buffer, otlpTagWriterState.WritePosition, (uint)otlpTagWriterState.DroppedTagCount);`
`373`	`369`	`}`
`374`	`370`
`375`	`371`	`return otlpTagWriterState.WritePosition;`
`@@ -423,36 +419,35 @@ internal static int WriteLinkAttributes(byte[] buffer, int writePosition, SdkLim`
`423`	`419`	`{`
`424`	`420`	`int maxAttributeCount = sdkLimitOptions.SpanLinkAttributeCountLimit ?? int.MaxValue;`
`425`	`421`	`int maxAttributeValueLength = sdkLimitOptions.AttributeValueLengthLimit ?? int.MaxValue;`
`426`		`- int attributeCount = 0;`
`427`		`- int droppedAttributeCount = 0;`
`428`		`-`
`429`	`422`	`ProtobufOtlpTagWriter.OtlpTagWriterState otlpTagWriterState = new ProtobufOtlpTagWriter.OtlpTagWriterState`
`430`	`423`	`{`
`431`	`424`	`Buffer = buffer,`
`432`	`425`	`WritePosition = writePosition,`
	`426`	`+ TagCount = 0,`
	`427`	`+ DroppedTagCount = 0,`
`433`	`428`	`};`
`434`	`429`
`435`	`430`	`foreach (ref readonly var tag in link.EnumerateTagObjects())`
`436`	`431`	`{`
`437`		`- if (attributeCount < maxAttributeCount)`
	`432`	`+ if (otlpTagWriterState.TagCount < maxAttributeCount)`
`438`	`433`	`{`
`439`	`434`	`otlpTagWriterState.WritePosition = ProtobufSerializer.WriteTag(otlpTagWriterState.Buffer, otlpTagWriterState.WritePosition, ProtobufOtlpTraceFieldNumberConstants.Link_Attributes, ProtobufWireType.LEN);`
`440`	`435`	`int linkAttributesLengthPosition = otlpTagWriterState.WritePosition;`
`441`	`436`	`otlpTagWriterState.WritePosition += ReserveSizeForLength;`
`442`	`437`	`ProtobufOtlpTagWriter.Instance.TryWriteTag(ref otlpTagWriterState, tag.Key, tag.Value, maxAttributeValueLength);`
`443`	`438`	`ProtobufSerializer.WriteReservedLength(buffer, linkAttributesLengthPosition, otlpTagWriterState.WritePosition - (linkAttributesLengthPosition + ReserveSizeForLength));`
`444`		`- attributeCount++;`
	`439`	`+ otlpTagWriterState.TagCount++;`
`445`	`440`	`}`
`446`	`441`	`else`
`447`	`442`	`{`
`448`		`- droppedAttributeCount++;`
	`443`	`+ otlpTagWriterState.DroppedTagCount++;`
`449`	`444`	`}`
`450`	`445`	`}`
`451`	`446`
`452`		`- if (droppedAttributeCount > 0)`
	`447`	`+ if (otlpTagWriterState.DroppedTagCount > 0)`
`453`	`448`	`{`
`454`	`449`	`otlpTagWriterState.WritePosition = ProtobufSerializer.WriteTag(buffer, otlpTagWriterState.WritePosition, ProtobufOtlpTraceFieldNumberConstants.Link_Dropped_Attributes_Count, ProtobufWireType.VARINT);`
`455`		`- otlpTagWriterState.WritePosition = ProtobufSerializer.WriteVarInt32(buffer, otlpTagWriterState.WritePosition, (uint)droppedAttributeCount);`
	`450`	`+ otlpTagWriterState.WritePosition = ProtobufSerializer.WriteVarInt32(buffer, otlpTagWriterState.WritePosition, (uint)otlpTagWriterState.DroppedTagCount);`
`456`	`451`	`}`
`457`	`452`
`458`	`453`	`return otlpTagWriterState.WritePosition;`