From 3701ffa6733b001d4278a0b68395c5efe2382f25 Mon Sep 17 00:00:00 2001 From: Lucian Petrut Date: Wed, 12 Apr 2023 09:39:52 +0000 Subject: [PATCH] common/tracer: fix decoding when jaeger tracing is disabled We aren't currently using jaeger tracing on Windows. The issue is that Windows hosts (or any other host that doesn't use jaeger) are experiencing message decoding failures after a recent change [1]. This change updates the tracer encoding so that messages from non-jaeger hosts may be decoded by services that use jaeger. [1] https://github.com/ceph/ceph/pull/47457 Signed-off-by: Lucian Petrut --- src/common/tracer.h | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/common/tracer.h b/src/common/tracer.h index f0a4df51207..87f3e5d98d0 100644 --- a/src/common/tracer.h +++ b/src/common/tracer.h @@ -144,8 +144,21 @@ struct Tracer { jspan add_span(std::string_view span_name, const jspan_context& parent_ctx) { return {}; } void init(std::string_view service_name) {} }; - inline void encode(const jspan_context& span, bufferlist& bl, uint64_t f=0) {} - inline void decode(jspan_context& span_ctx, ceph::buffer::list::const_iterator& bl) {} + +inline void encode(const jspan_context& span_ctx, bufferlist& bl, uint64_t f = 0) { + ENCODE_START(1, 1, bl); + // jaeger is missing, set "is_valid" to false. + bool is_valid = false; + encode(is_valid, bl); + ENCODE_FINISH(bl); } +inline void decode(jspan_context& span_ctx, bufferlist::const_iterator& bl) { + DECODE_START(254, bl); + // jaeger is missing, consume the buffer but do not decode it. + DECODE_FINISH(bl); +} + +} // namespace tracing + #endif // !HAVE_JAEGER -- 2.39.5