From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 11 Dec 2025 15:00:32 +0000 (+0100)
Subject: fix(dnsdist): reuse buffer for protobuf messages
X-Git-Tag: rec-5.4.0-beta1~65^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4614b5eafd9713d6a67047c19666a7160ec83ec;p=thirdparty%2Fpdns.git

fix(dnsdist): reuse buffer for protobuf messages
---

diff --git a/pdns/dnsdistdist/dnsdist-idstate.cc b/pdns/dnsdistdist/dnsdist-idstate.cc
index 3f6ec8999a..5f5576da0b 100644
--- a/pdns/dnsdistdist/dnsdist-idstate.cc
+++ b/pdns/dnsdistdist/dnsdist-idstate.cc
@@ -70,10 +70,11 @@ InternalQueryState::~InternalQueryState()
   }
 
   std::string OTData;
-  static thread_local string otPBBuf;
-  otPBBuf.clear();
+  static thread_local string pbBuf;
+  pbBuf.clear();
+
   if (tracingEnabled && d_OTTracer != nullptr) {
-    pdns::ProtoZero::Message msg{otPBBuf};
+    pdns::ProtoZero::Message msg{pbBuf};
     OTData = d_OTTracer->getOTProtobuf();
     msg.setOpenTelemetryData(OTData);
   }
@@ -87,18 +88,17 @@ InternalQueryState::~InternalQueryState()
       }
       // Protobuf wireformat allows us to simply append the second "message"
       // that only contains the OTTrace data as a single bytes field
-      msg_logger.second->queueData(msg_logger.first + otPBBuf);
+      msg_logger.second->queueData(msg_logger.first + pbBuf);
     }
   }
 
   if (!ottraceLoggers.empty()) {
-    static thread_local string minimalPBBuf;
-    minimalPBBuf.clear();
-    pdns::ProtoZero::Message minimalMsg{minimalPBBuf};
+    pbBuf.clear();
+    pdns::ProtoZero::Message minimalMsg{pbBuf};
     minimalMsg.setType(pdns::ProtoZero::Message::MessageType::DNSQueryType);
     minimalMsg.setOpenTelemetryData(OTData);
     for (auto const& msg_logger : ottraceLoggers) {
-      msg_logger->queueData(minimalPBBuf);
+      msg_logger->queueData(pbBuf);
     }
   }
 #endif