From 4b48c93c480040d2d37f49c721b9ae7997460a68 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Thu, 12 Jun 2025 14:27:37 +0200 Subject: [PATCH] Rename sdig argument from otid to traceid Signed-off-by: Otto Moerbeek --- .github/actions/spell-check/expect.txt | 1 + docs/manpages/sdig.1.rst | 2 +- pdns/recursordist/docs/lua-config/protobuf.rst | 2 +- pdns/sdig.cc | 8 ++++---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt index e0626a36b1..a0362dfef1 100644 --- a/.github/actions/spell-check/expect.txt +++ b/.github/actions/spell-check/expect.txt @@ -1439,6 +1439,7 @@ tolua Toosarani Toshifumi totms +traceid Travaille treemacs tribool diff --git a/docs/manpages/sdig.1.rst b/docs/manpages/sdig.1.rst index 5da95be9dd..4d974df248 100644 --- a/docs/manpages/sdig.1.rst +++ b/docs/manpages/sdig.1.rst @@ -59,7 +59,7 @@ opcode *OPNUM* Use opcode *OPNUM* instead of 0 (Query). For example, ``sdig 192.0.2.1 53 example.com SOA opcode 4`` sends a ``NOTIFY``. cookie *COOKIE* if *COOKIE* is ``-`` send a random client cookie. Otherwise send the given cookie, which should be a hex string received from a server earlier. -otid *TraceID* +traceid *TraceID* include a TraceID and an empty SpanID value into the EDNS data. If TraceID is ``-``, a random TraceID is generated, otherwise it is a hex string. Examples -------- diff --git a/pdns/recursordist/docs/lua-config/protobuf.rst b/pdns/recursordist/docs/lua-config/protobuf.rst index eaecdd8c1b..b2dbd6359e 100644 --- a/pdns/recursordist/docs/lua-config/protobuf.rst +++ b/pdns/recursordist/docs/lua-config/protobuf.rst @@ -8,7 +8,7 @@ In addition, messages related to responses contain the name, type, class and rda Finally, if a RPZ or custom Lua policy has been applied, response messages also contain the applied policy name and some tags. This is particularly useful to detect and act on infected hosts. -The Protobuf loggging stream can also include event information in a proprietary format and (starting with version 5.3.0) OpenTelemetry Trace data. +The Protobuf logging stream can include event information in a proprietary format and (starting with version 5.3.0) OpenTelemetry Trace data. See :ref:`event-tracing` for more information. Configuring Protocol Buffer logs diff --git a/pdns/sdig.cc b/pdns/sdig.cc index 151770d35d..41f67128d9 100644 --- a/pdns/sdig.cc +++ b/pdns/sdig.cc @@ -45,7 +45,7 @@ static void usage() "[proxy UDP(0)/TCP(1) SOURCE-IP-ADDRESS-AND-PORT DESTINATION-IP-ADDRESS-AND-PORT] " "[cookie -/HEX] " "[dumpluaraw] [opcode OPNUM] " - "[otid -/HEX]" + "[traceid -/HEX]" << endl; } @@ -358,9 +358,9 @@ try { else if (strcmp(argv[i], "dumpluaraw") == 0) { dumpluaraw = true; } - else if (strcmp(argv[i], "otid") == 0) { + else if (strcmp(argv[i], "traceid") == 0) { if (argc < i + 2) { - cerr << "otid needs an argument" << endl; + cerr << "traceid needs an argument" << endl; exit(EXIT_FAILURE); } auto traceIDArg = std::string(argv[++i]); @@ -371,7 +371,7 @@ try { else { auto traceIDStr = makeBytesFromHex(traceIDArg); if (traceIDStr.size() > traceid.size()) { - cerr << "Maximum length of TraceID is " << traceid.size() << " bytes" << endl; + cerr << "Maximum length of traceid is " << traceid.size() << " bytes" << endl; exit(EXIT_FAILURE); } traceIDStr.resize(traceid.size()); -- 2.47.2