Merge pull request #16190 from omoerbeek/rec-more-ottracing

rec: OT tracing: define more Spans with actual duration and add more attributes

diff --cc pdns/protozero-trace.hh
Simple merge

diff --cc pdns/recursordist/pdns_recursor.cc
Simple merge

diff --cc pdns/recursordist/rec-eventtrace.cc
Simple merge

diff --cc pdns/recursordist/rec-main.cc
index 365a1d13f3f6628a66328077224c2e835c4e1591,8c01a5eca73958e4f06ecf94ebd4ab8ca7bce42f..c1d0f6101c8c9603821acce5e8a357486e1a6d2c
--- 1/pdns/recursordist/rec-main.cc
--- 2/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@@ -636,12 -633,12 +636,15 @@@ void protobufLogResponse(const DNSName
      pbMessage.addEvents(eventTrace);
    }
    if (eventTrace.enabled() && (SyncRes::s_event_trace_enabled & SyncRes::event_trace_to_ot) != 0) {
-     auto trace = pdns::trace::TracesData::boilerPlate("rec", qname.toLogString() + '/' + qtype.toString(), eventTrace.convertToOT(otTrace));
+     auto trace = pdns::trace::TracesData::boilerPlate("rec", eventTrace.convertToOT(otTrace),
+                                                       {{"query.qname", {qname.toLogString()}},
+                                                        {"query.qtype", {qtype.toString()}}},
+                                                       SyncRes::s_serverID);
      pbMessage.setOpenTelemetryData(trace.encode());
    }
 +  if (otTrace.trace_id != pdns::trace::s_emptyTraceID) {
 +    pbMessage.setOpenTelemetryTraceID(otTrace.trace_id);
 +  }
    pbMessage.addPolicyTags(policyTags);
  
    protobufLogResponse(pbMessage);

diff --cc pdns/recursordist/rec-tcp.cc
Simple merge

diff --cc pdns/recursordist/syncres.cc
Simple merge