bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

tracing: add formatter for tracing::span_id

Browse Source 
before this change, we rely on the default-generated fmt::formatter
created from operator<<, but fmt v10 dropped the default-generated
formatter.

in this change, we define formatters for `tracing::span_id`, and drop
its operator<<.

Refs #13245

Signed-off-by: Kefu Chai <kefu.chai@scylladb.com>

Closes scylladb/scylladb#17058
This commit is contained in:
Kefu Chai
2024-01-30 17:12:41 +08:00
committed by Botond Dénes
parent f5e3a2d98e
commit bd71e0b794
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tracing/tracing.cc
View File

@@ -195,8 +195,4 @@ one_session_records::one_session_records(trace_type type, std::chrono::seconds s
{
}
std::ostream& operator<<(std::ostream& os, const span_id& id) {
return os << id.get_id();
}
}

9
tracing/tracing.hh
View File

@@ -90,8 +90,6 @@ public:
static span_id make_span_id();
};
std::ostream& operator<<(std::ostream& os, const span_id& id);
// !!!!IMPORTANT!!!!
//
// The enum_set based on this enum is serialized using IDL, therefore new items
@@ -661,3 +659,10 @@ inline span_id span_id::make_span_id() {
return 1 + (tracing::get_local_tracing_instance().get_next_rand_uint64() << 1);
}
}
template <> struct fmt::formatter<tracing::span_id> {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
auto format(const tracing::span_id& id, fmt::format_context& ctx) const {
return fmt::format_to(ctx.out(), "{}", id.get_id());
}
};