Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[otlp] Custom serialzer resource tweaks #5947

Merged
merged 2 commits into from
Nov 4, 2024
Merged

[otlp] Custom serialzer resource tweaks #5947

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41f0406
Tweaks for ProtobufOtlpResourceSerializer.
CodeBlanch Nov 1, 2024
e036f52
Merge branch 'main' into otlp-customserializer-resource-tweaks
CodeBlanch Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions ...xporter.OpenTelemetryProtocol/Implementation/Serializer/ProtobufOtlpResourceSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ internal static int WriteResource(byte[] buffer, int writePosition, Resource? re
isServiceNamePresent = true;
}

otlpTagWriterState = ProcessResourceAttribute(ref otlpTagWriterState, attribute);
ProcessResourceAttribute(ref otlpTagWriterState, attribute);
}
}
else
Expand All @@ -49,14 +49,14 @@ internal static int WriteResource(byte[] buffer, int writePosition, Resource? re
isServiceNamePresent = true;
}

otlpTagWriterState = ProcessResourceAttribute(ref otlpTagWriterState, attribute);
ProcessResourceAttribute(ref otlpTagWriterState, attribute);
}
}
}

if (!isServiceNamePresent)
{
otlpTagWriterState = ProcessResourceAttribute(ref otlpTagWriterState, new KeyValuePair<string, object>(ResourceSemanticConventions.AttributeServiceName, DefaultServiceName));
ProcessResourceAttribute(ref otlpTagWriterState, new KeyValuePair<string, object>(ResourceSemanticConventions.AttributeServiceName, DefaultServiceName));
}

var resourceLength = otlpTagWriterState.WritePosition - (resourceLengthPosition + ReserveSizeForLength);
Expand All @@ -65,7 +65,7 @@ internal static int WriteResource(byte[] buffer, int writePosition, Resource? re
return otlpTagWriterState.WritePosition;
}

private static ProtobufOtlpTagWriter.OtlpTagWriterState ProcessResourceAttribute(ref ProtobufOtlpTagWriter.OtlpTagWriterState otlpTagWriterState, KeyValuePair<string, object> attribute)
private static void ProcessResourceAttribute(ref ProtobufOtlpTagWriter.OtlpTagWriterState otlpTagWriterState, KeyValuePair<string, object> attribute)
{
otlpTagWriterState.WritePosition = ProtobufSerializer.WriteTag(otlpTagWriterState.Buffer, otlpTagWriterState.WritePosition, ProtobufOtlpTraceFieldNumberConstants.Resource_Attributes, ProtobufWireType.LEN);
int resourceAttributesLengthPosition = otlpTagWriterState.WritePosition;
Expand All @@ -75,6 +75,5 @@ private static ProtobufOtlpTagWriter.OtlpTagWriterState ProcessResourceAttribute

var resourceAttributesLength = otlpTagWriterState.WritePosition - (resourceAttributesLengthPosition + ReserveSizeForLength);
ProtobufSerializer.WriteReservedLength(otlpTagWriterState.Buffer, resourceAttributesLengthPosition, resourceAttributesLength);
return otlpTagWriterState;
}
}
Loading