Skip to content

Commit a07b1d4

Browse files
committed
Fix R2 tracing to use unique tags for each checksum type instead of overwriting shared tags
1 parent 2943b90 commit a07b1d4

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

src/workerd/api/r2-bucket.c++

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -329,27 +329,22 @@ void addHeadResultSpanTags(
329329
kj::str(toISOString(js, headResult.getUploaded()).asPtr()));
330330
auto checksums = headResult.getChecksums();
331331
KJ_IF_SOME(md5, checksums.get()->md5) {
332-
traceContext.userSpan.setTag("cloudflare.r2.response.checksum.value"_kjc, kj::encodeHex(md5));
333-
traceContext.userSpan.setTag("cloudflare.r2.response.checksum.type"_kjc, kj::str("md5"));
332+
traceContext.userSpan.setTag("cloudflare.r2.response.checksum.md5"_kjc, kj::encodeHex(md5));
334333
}
335334
KJ_IF_SOME(sha1, checksums.get()->sha1) {
336-
traceContext.userSpan.setTag("cloudflare.r2.response.checksum.value"_kjc, kj::encodeHex(sha1));
337-
traceContext.userSpan.setTag("cloudflare.r2.response.checksum.type"_kjc, kj::str("sha1"));
335+
traceContext.userSpan.setTag("cloudflare.r2.response.checksum.sha1"_kjc, kj::encodeHex(sha1));
338336
}
339337
KJ_IF_SOME(sha256, checksums.get()->sha256) {
340338
traceContext.userSpan.setTag(
341-
"cloudflare.r2.response.checksum.value"_kjc, kj::encodeHex(sha256));
342-
traceContext.userSpan.setTag("cloudflare.r2.response.checksum.type"_kjc, kj::str("sha256"));
339+
"cloudflare.r2.response.checksum.sha256"_kjc, kj::encodeHex(sha256));
343340
}
344341
KJ_IF_SOME(sha384, checksums.get()->sha384) {
345342
traceContext.userSpan.setTag(
346-
"cloudflare.r2.response.checksum.value"_kjc, kj::encodeHex(sha384));
347-
traceContext.userSpan.setTag("cloudflare.r2.response.checksum.type"_kjc, kj::str("sha384"));
343+
"cloudflare.r2.response.checksum.sha384"_kjc, kj::encodeHex(sha384));
348344
}
349345
KJ_IF_SOME(sha512, checksums.get()->sha512) {
350346
traceContext.userSpan.setTag(
351-
"cloudflare.r2.response.checksum.value"_kjc, kj::encodeHex(sha512));
352-
traceContext.userSpan.setTag("cloudflare.r2.response.checksum.type"_kjc, kj::str("sha512"));
347+
"cloudflare.r2.response.checksum.sha512"_kjc, kj::encodeHex(sha512));
353348
}
354349

355350
traceContext.userSpan.setTag(

0 commit comments

Comments
 (0)