feat(dnsdist): Add Span Kind to Spans and add a name to ScopeSpan

diff --git a/pdns/dnsdistdist/dnsdist-opentelemetry.cc b/pdns/dnsdistdist/dnsdist-opentelemetry.cc
index f5fea72056fbdb6d2448aa66652cf50356eff078..822f385bea0116f6afebccb2143a7d9904118e59 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-opentelemetry.cc
+++ b/pdns/dnsdistdist/dnsdist-opentelemetry.cc
@@ -45,6 +45,7 @@ TracesData Tracer::getTracesData()
               "service.name", pdns::trace::AnyValue{"dnsdist"}},
           }},
         .scope_spans = std::vector<pdns::trace::ScopeSpans>{{.scope = {
+                                                               .name = "queryFromFrontend",
                                                                .attributes = {d_attributes.begin(), d_attributes.end()},
                                                              },
                                                              .spans = {}}}}}};
@@ -59,6 +60,7 @@ TracesData Tracer::getTracesData()
           .span_id = preActivationTrace.span_id,
           .parent_span_id = preActivationTrace.parent_span_id,
           .name = preActivationTrace.name,
+          .kind = pdns::trace::Span::SpanKind::SPAN_KINSERVER,
           .start_time_unix_nano = preActivationTrace.start_time_unix_nano,
           .end_time_unix_nano = preActivationTrace.end_time_unix_nano,
         });

diff --git a/pdns/dnsdistdist/test-dnsdist-opentelemetry_cc.cc b/pdns/dnsdistdist/test-dnsdist-opentelemetry_cc.cc
index 847437aa327942d8f438eb030e2312402becebfb..49364631be6ad666b75bba925c06c1ec7b458922 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdist-opentelemetry_cc.cc
+++ b/pdns/dnsdistdist/test-dnsdist-opentelemetry_cc.cc
@@ -238,12 +238,12 @@ BOOST_AUTO_TEST_CASE(getOTProtobuf)
 {
   auto tracer = pdns::trace::dnsdist::Tracer::getTracer();
   auto data = tracer->getOTProtobuf();
-  BOOST_TEST(data.size() == 31U);
+  BOOST_TEST(data.size() == 54U);
 
   tracer->activate();
   tracer->setTraceAttribute("foo", AnyValue{"bar"});
   data = tracer->getOTProtobuf();
-  BOOST_TEST(data.size() == 49U);
+  BOOST_TEST(data.size() == 68U);
 }
 
 BOOST_AUTO_TEST_SUITE_END()