Typos in comments from miod

Co-authored-by: Miod Vallat <miod.vallat@powerdns.com>
Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>

diff --git a/docs/manpages/sdig.1.rst b/docs/manpages/sdig.1.rst
index 4d974df248c45f0fdafc730f3ce0172b14ed8364..a727fd88872131c02c2f28a7151f1b3c22f36e56 100644 (file)
--- 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 141f79c103e102075dc0db55a87f263513da1dda..c501c4ce1c4b21f3f42c4a7adbe616d2dca15243 100644 (file)
--- 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 393535660750a9d995baaa48b97df4c46671b324..8df1a3bf47af03331838bb6c3348f8c75975aee2 100644 (file)
--- 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 779bb626ee241babc25818e910bb92c98d5ea3fe..a050909a09d4cf455d9f0da06941db5a1bde2cf4 100644 (file)
--- 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<pdns::trace::Span> RecEventTrace::convertToOT(const Span& span) const
 {
   timespec realtime{};
@@ -79,7 +79,7 @@ std::vector<pdns::trace::Span> RecEventTrace::convertToOT(const Span& span) cons
   std::vector<pdns::trace::Span> ret;
   ret.reserve((d_events.size() / 2) + 1);
 
-  // The parent of all Span
+  // The parent of all Spans
   ret.emplace_back(span);
 
   std::vector<SpanID> 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 cf1cc25c68414c8ad8e79eff64c3d303e51a33c9..f5afff10bd07a51199d5d90024eb0af47b907add 100644 (file)
--- 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 0c59266e0e8ffa6b331f960704fb4bd23a8178c5..2b164c21e18cf21f14ee6a18f6f584fd2d3bd6d2 100644 (file)
--- a/pdns/recursordist/rec-tcp.cc
+++ b/pdns/recursordist/rec-tcp.cc
@@ -307,8 +307,8 @@ static void doProcessTCPQuestion(std::unique_ptr<DNSComboWriter>& comboWriter, s
   boost::optional<uint32_t> 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);