Skip to content

Commit f1771de

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

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
@@ -328,27 +328,22 @@ void addHeadResultSpanTags(
328328
kj::str(toISOString(js, headResult.getUploaded()).asPtr()));
329329
auto checksums = headResult.getChecksums();
330330
KJ_IF_SOME(md5, checksums.get()->md5) {
331-
traceContext.userSpan.setTag("cloudflare.r2.response.checksum.value"_kjc, kj::encodeHex(md5));
332-
traceContext.userSpan.setTag("cloudflare.r2.response.checksum.type"_kjc, kj::str("md5"));
331+
traceContext.userSpan.setTag("cloudflare.r2.response.checksum.md5"_kjc, kj::encodeHex(md5));
333332
}
334333
KJ_IF_SOME(sha1, checksums.get()->sha1) {
335-
traceContext.userSpan.setTag("cloudflare.r2.response.checksum.value"_kjc, kj::encodeHex(sha1));
336-
traceContext.userSpan.setTag("cloudflare.r2.response.checksum.type"_kjc, kj::str("sha1"));
334+
traceContext.userSpan.setTag("cloudflare.r2.response.checksum.sha1"_kjc, kj::encodeHex(sha1));
337335
}
338336
KJ_IF_SOME(sha256, checksums.get()->sha256) {
339337
traceContext.userSpan.setTag(
340-
"cloudflare.r2.response.checksum.value"_kjc, kj::encodeHex(sha256));
341-
traceContext.userSpan.setTag("cloudflare.r2.response.checksum.type"_kjc, kj::str("sha256"));
338+
"cloudflare.r2.response.checksum.sha256"_kjc, kj::encodeHex(sha256));
342339
}
343340
KJ_IF_SOME(sha384, checksums.get()->sha384) {
344341
traceContext.userSpan.setTag(
345-
"cloudflare.r2.response.checksum.value"_kjc, kj::encodeHex(sha384));
346-
traceContext.userSpan.setTag("cloudflare.r2.response.checksum.type"_kjc, kj::str("sha384"));
342+
"cloudflare.r2.response.checksum.sha384"_kjc, kj::encodeHex(sha384));
347343
}
348344
KJ_IF_SOME(sha512, checksums.get()->sha512) {
349345
traceContext.userSpan.setTag(
350-
"cloudflare.r2.response.checksum.value"_kjc, kj::encodeHex(sha512));
351-
traceContext.userSpan.setTag("cloudflare.r2.response.checksum.type"_kjc, kj::str("sha512"));
346+
"cloudflare.r2.response.checksum.sha512"_kjc, kj::encodeHex(sha512));
352347
}
353348

354349
traceContext.userSpan.setTag(

0 commit comments

Comments
 (0)