From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 11 Dec 2025 14:11:23 +0000 (+0100)
Subject: fix(dnsdist): hide the TraceAction class on non-PB builds
X-Git-Tag: rec-5.4.0-beta1~65^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a960d46d7d5ac91a111e08fc468217d4e1dd8abb;p=thirdparty%2Fpdns.git

fix(dnsdist): hide the TraceAction class on non-PB builds
---

diff --git a/pdns/dnsdistdist/dnsdist-actions-factory.cc b/pdns/dnsdistdist/dnsdist-actions-factory.cc
index 54fabf3959..cf4c5cbdf1 100644
--- a/pdns/dnsdistdist/dnsdist-actions-factory.cc
+++ b/pdns/dnsdistdist/dnsdist-actions-factory.cc
@@ -1678,17 +1678,15 @@ private:
 };
 #endif /* DISABLE_PROTOBUF */
 
+#ifndef DISABLE_PROTOBUF
 class SetTraceAction : public DNSAction
 {
 public:
-#ifndef DISABLE_PROTOBUF
   SetTraceAction(SetTraceActionConfiguration& config) :
     d_value{config.value}, d_loggers(config.remote_loggers), d_useIncomingTraceID(config.use_incoming_traceid), d_incomingTraceIDOptionCode(config.trace_edns_option) {};
-#endif /* DISABLE_PROTOBUF */
 
   DNSAction::Action operator()([[maybe_unused]] DNSQuestion* dnsquestion, [[maybe_unused]] std::string* ruleresult) const override
   {
-#ifndef DISABLE_PROTOBUF
     auto tracer = dnsquestion->ids.getTracer();
     if (tracer == nullptr) {
       vinfolog("SetTraceAction called, but OpenTelemetry tracing is globally disabled. Did you forget to call setOpenTelemetryTracing?");
@@ -1721,20 +1719,14 @@ public:
       }
       dnsquestion->ids.ottraceLoggers = d_loggers;
     }
-#endif
     return Action::None;
   }
 
   [[nodiscard]] std::string toString() const override
   {
-#ifndef DISABLE_PROTOBUF
     return string((d_value ? "en" : "dis")) + string("able OpenTelemetry Tracing");
-#else
-    return "";
-#endif
   }
 
-#ifndef DISABLE_PROTOBUF
 private:
   bool d_value;
 
@@ -1742,8 +1734,8 @@ private:
 
   std::optional<bool> d_useIncomingTraceID;
   std::optional<short unsigned int> d_incomingTraceIDOptionCode;
-#endif
 };
+#endif
 
 class SNMPTrapAction : public DNSAction
 {