From: Otto Moerbeek Date: Fri, 13 Jun 2025 09:28:35 +0000 (+0200) Subject: Typos in comments from miod X-Git-Tag: rec-5.3.0-alpha1^2~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb980dede60e46396bfb2c9570f8e06ffe2c0fbd;p=thirdparty%2Fpdns.git Typos in comments from miod Co-authored-by: Miod Vallat Signed-off-by: Otto Moerbeek --- diff --git a/docs/manpages/sdig.1.rst b/docs/manpages/sdig.1.rst index 4d974df248..a727fd8887 100644 --- a/docs/manpages/sdig.1.rst +++ b/docs/manpages/sdig.1.rst @@ -61,6 +61,7 @@ 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. 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/protozero-trace.cc b/pdns/protozero-trace.cc index 141f79c103..c501c4ce1c 100644 --- a/pdns/protozero-trace.cc +++ b/pdns/protozero-trace.cc @@ -509,7 +509,7 @@ KeyValue KeyValue::decode(protozero::pbf_reader& reader) void extractOTraceIDs(const EDNSOptionViewMap& map, pdns::trace::Span& span) { // traceid gets set from edns options (if available and well-formed), otherwise random - // parent_span_id gets set form edns options (if available and well-formed, otherwise it says cleared (no parent) + // parent_span_id gets set from edns options (if available and well-formed, otherwise it remains cleared (no parent)) // span_id gets inited randomly bool traceidset = false; if (const auto& option = map.find(EDNSOptionCode::OTTRACEID); option != map.end()) { diff --git a/pdns/recursordist/pdns_recursor.cc b/pdns/recursordist/pdns_recursor.cc index 3935356607..8df1a3bf47 100644 --- a/pdns/recursordist/pdns_recursor.cc +++ b/pdns/recursordist/pdns_recursor.cc @@ -2487,8 +2487,8 @@ static void handleNewUDPQuestion(int fileDesc, FDMultiplexer::funcparam_t& /* va if (ssize_t len = recvmsg(fileDesc, &msgh, 0); len >= 0) { eventTrace.clear(); eventTrace.setEnabled(SyncRes::s_event_trace_enabled != 0); - // evenTrace use monotonic time, while OpenTelemetry uses absolute time. setEnabled() - // estabslished the reference point, get an absolute TS as close as possible to the + // eventTrace uses monotonic time, while OpenTelemetry uses absolute time. setEnabled() + // established the reference point, get an absolute TS as close as possible to the // eventTrace start of trace time. auto traceTS = pdns::trace::timestamp(); eventTrace.add(RecEventTrace::ReqRecv); diff --git a/pdns/recursordist/rec-eventtrace.cc b/pdns/recursordist/rec-eventtrace.cc index 779bb626ee..a050909a09 100644 --- a/pdns/recursordist/rec-eventtrace.cc +++ b/pdns/recursordist/rec-eventtrace.cc @@ -64,9 +64,9 @@ static void addValue(const RecEventTrace::Entry& event, Span& work) } // The event trace uses start-stop records which need to be mapped to opentrace spans, which is a -// list of spans. Spans can refer to other spand as their parent. I have the feeling this code is -// to complex and a brittle. Maybe we should add some extra info to the event trace records to make -// is easier to map the event trace list to the open trace list of spans. +// list of spans. Spans can refer to other spans as their parent. I have the feeling this code is +// too complex and brittle. Maybe we should add some extra info to the event trace records to make +// it easier to map the event trace list to the open trace list of spans. std::vector RecEventTrace::convertToOT(const Span& span) const { timespec realtime{}; @@ -79,7 +79,7 @@ std::vector RecEventTrace::convertToOT(const Span& span) cons std::vector ret; ret.reserve((d_events.size() / 2) + 1); - // The parent of all Span + // The parent of all Spans ret.emplace_back(span); std::vector spanIDs; // mapping of span index in ret vector to SpanID diff --git a/pdns/recursordist/rec-rust-lib/table.py b/pdns/recursordist/rec-rust-lib/table.py index cf1cc25c68..f5afff10bd 100644 --- a/pdns/recursordist/rec-rust-lib/table.py +++ b/pdns/recursordist/rec-rust-lib/table.py @@ -998,7 +998,7 @@ This file can be used to serve data authoritatively using :ref:`setting-export-e 'help' : 'If set, event traces are collected and send out via protobuf logging (1), logfile (2), opentelemetry trace data (4) or a combination', 'doc' : ''' Enable the recording and logging of ref:`event traces`. This is an experimental feature and subject to change. -Possible values are 0: (disabled), 1 (add information to protobuf logging messages), 2 (write to log), 4 (output OpenTelemetry Trace data in protobuf logging messages). Values can be added to get multiple types of logging simultaneously. +Possible values are 0: (disabled), 1 (add information to protobuf logging messages), 2 (write to log), 4 (output OpenTelemetry Trace data in protobuf logging messages). Values can be added to get multiple types of logging simultaneously. For example, 6 means: write to log and output OpenTelemetry Trace data in the protobuf stream. ''', 'versionadded': '4.6.0', diff --git a/pdns/recursordist/rec-tcp.cc b/pdns/recursordist/rec-tcp.cc index 0c59266e0e..2b164c21e1 100644 --- a/pdns/recursordist/rec-tcp.cc +++ b/pdns/recursordist/rec-tcp.cc @@ -307,8 +307,8 @@ static void doProcessTCPQuestion(std::unique_ptr& comboWriter, s boost::optional ednsVersion; comboWriter->d_eventTrace.setEnabled(SyncRes::s_event_trace_enabled != 0); - // evenTrace use monotonic time, while OpenTelemetry uses absolute time. setEnabled() - // estabslished the reference point, get an absolute TS as close as possible to the + // eventTrace uses monotonic time, while OpenTelemetry uses absolute time. setEnabled() + // established the reference point, get an absolute TS as close as possible to the // eventTrace start of trace time. auto traceTS = pdns::trace::timestamp(); comboWriter->d_eventTrace.add(RecEventTrace::ReqRecv);