From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 30 Mar 2026 10:04:34 +0000 (+0200)
Subject: fix(dnsdist): don't do work without a tracer
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec7f94b64ceebf35e9d8d2c84ab487cf7f1806dd;p=thirdparty%2Fpdns.git

fix(dnsdist): don't do work without a tracer
---

diff --git a/pdns/dnsdistdist/dnsdist-lua-bindings-opentelemetry.cc b/pdns/dnsdistdist/dnsdist-lua-bindings-opentelemetry.cc
index f77ed34944..19c358c046 100644
--- a/pdns/dnsdistdist/dnsdist-lua-bindings-opentelemetry.cc
+++ b/pdns/dnsdistdist/dnsdist-lua-bindings-opentelemetry.cc
@@ -41,31 +41,29 @@ void emptyLuaTracing(LuaContext& luaCtx)
 
 void setupLuaTracing(LuaContext& luaCtx, std::shared_ptr<Tracer>& tracer)
 {
-  if (tracer != nullptr) {
-    luaCtx.writeFunction<void(const std::string&, const std::function<void()>&)>(
-      "withTraceSpan",
-      [&tracer](const std::string& name, const std::function<void()>& luaFunc) {
+  if (tracer == nullptr) {
+    return;
+  }
+
+  luaCtx.writeFunction<void(const std::string&, const std::function<void()>&)>(
+    "withTraceSpan",
+    [&tracer](const std::string& name, const std::function<void()>& luaFunc) {
 #ifndef DISABLE_PROTOBUF
-        if (tracer != nullptr) {
-          auto closer = tracer->openSpan(name);
-          luaFunc();
-          return;
-        }
+      auto closer = tracer->openSpan(name);
+      luaFunc();
+      return;
 #endif
-        luaFunc();
-      });
+      luaFunc();
+    });
 
-    luaCtx.writeFunction<void(const std::string&, const std::string&)>(
-      "setSpanAttribute",
-      [&tracer](const std::string& key, const std::string& value) {
+  luaCtx.writeFunction<void(const std::string&, const std::string&)>(
+    "setSpanAttribute",
+    [&tracer](const std::string& key, const std::string& value) {
 #ifndef DISABLE_PROTOBUF
-        if (tracer != nullptr) {
-          tracer->setSpanAttribute(tracer->getLastSpanID(), key, AnyValue{value});
-        }
+      tracer->setSpanAttribute(tracer->getLastSpanID(), key, AnyValue{value});
 #endif
-        return;
-      });
-  }
+      return;
+    });
 }
 
 } // namespace pdns::trace::dnsdist