From 7ac480b506c2590bdbb48196798c00545588aaf7 Mon Sep 17 00:00:00 2001 From: Tobias Stadler Date: Fri, 29 Jan 2021 09:55:47 +0100 Subject: [PATCH] Do not strip leading zeros from span IDs --- src/jaegertracing/SpanContext.h | 5 +++-- src/jaegertracing/SpanContextTest.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/jaegertracing/SpanContext.h b/src/jaegertracing/SpanContext.h index 295a7e91..4055e4e5 100644 --- a/src/jaegertracing/SpanContext.h +++ b/src/jaegertracing/SpanContext.h @@ -156,8 +156,9 @@ class SpanContext : public opentracing::SpanContext { void print(Stream& out) const { _traceID.print(out); - out << ':' << std::hex << _spanID << ':' << std::hex << _parentID << ':' - << std::hex << static_cast(_flags); + out << ':' << std::setw(16) << std::setfill('0') << std::hex << _spanID + << ':' << std::setw(16) << std::setfill('0') << std::hex << _parentID + << ':' << std::hex << static_cast(_flags); } void ForeachBaggageItem( diff --git a/src/jaegertracing/SpanContextTest.cpp b/src/jaegertracing/SpanContextTest.cpp index 33530668..bcb4b177 100644 --- a/src/jaegertracing/SpanContextTest.cpp +++ b/src/jaegertracing/SpanContextTest.cpp @@ -78,7 +78,7 @@ TEST(SpanContext, testFormatting) SpanContext spanContext(TraceID(255, 255), 0, 0, 0, SpanContext::StrMap()); std::ostringstream oss; oss << spanContext; - ASSERT_EQ("00000000000000ff00000000000000ff:0:0:0", oss.str()); + ASSERT_EQ("00000000000000ff00000000000000ff:0000000000000000:0000000000000000:0", oss.str()); } TEST(SpanContext, testBaggage)