Skip to content

Commit

Permalink
[otlp] Update TraceSerializer to use attributes / dropped from state. (…
Browse files Browse the repository at this point in the history 
…open-telemetry#5946)

Co-authored-by: Mikel Blanchard <mblanchard@macrosssoftware.com>
  • Loading branch information
@rajkumar-rangaraj @CodeBlanch
rajkumar-rangaraj and CodeBlanch authored Nov 1, 2024
1 parent dc7f1eb commit ed1b27f
Showing 1 changed file with 31 additions and 36 deletions.
67 changes: 31 additions & 36 deletions ...y.Exporter.OpenTelemetryProtocol/Implementation/Serializer/ProtobufOtlpTraceSerializer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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())
Expand All @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit ed1b27f

Please sign in to comment.