Skip to content

Fix MarshalerUtil sizeRepeatedString calculation per issue#8272 #8284

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

Merged
jack-berg merged 2 commits into from
Apr 16, 2026
+7 −2
Merged

Fix MarshalerUtil sizeRepeatedString calculation per issue#8272 #8284

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74e4ad0
Fix MarshalerUtil sizeRepeatedString calculation per issue#8272
jhalliday Apr 13, 2026
487c0cc
Fix MarshalerUtil sizeRepeatedString calculation per issue#8272
jhalliday Apr 16, 2026
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: 7 additions & 2 deletions exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/MarshalerUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ private static int sizeRepeatedFixed64(ProtoFieldInfo field, int numValues) {
public static int sizeRepeatedString(ProtoFieldInfo field, byte[][] utf8Bytes) {
int size = 0;
for (byte[] i : utf8Bytes) {
size += MarshalerUtil.sizeBytes(field, i);
Comment thread
jhalliday marked this conversation as resolved.
size += sizeBytes(field, i, /* skipEmpty= */ false);
}
return size;
}
Expand Down Expand Up @@ -384,7 +384,12 @@ public static int sizeFixed32(ProtoFieldInfo field, int message) {

/** Returns the size of a bytes field. */
public static int sizeBytes(ProtoFieldInfo field, byte[] message) {
if (message.length == 0) {
return sizeBytes(field, message, /* skipEmpty= */ true);
}

/** Returns the size of a bytes field. */
public static int sizeBytes(ProtoFieldInfo field, byte[] message, boolean skipEmpty) {
if (message.length == 0 && skipEmpty) {
return 0;
}
return field.getTagSize() + CodedOutputStream.computeByteArraySizeNoTag(message);
Expand Down
Loading