From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Wed, 25 Jun 2025 07:15:51 +0000 (+0200)
Subject: rec: a few minor Coverity cases in the new OpenTelemetry trace code
X-Git-Tag: rec-5.3.0-alpha2~18^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c85a226bfaa8c85a8d0792b8de5dda9bc04fd91;p=thirdparty%2Fpdns.git

rec: a few minor Coverity cases in the new OpenTelemetry trace code

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>
---

diff --git a/pdns/protozero-trace.hh b/pdns/protozero-trace.hh
index 36fcaad53a..c07acc6ac7 100644
--- a/pdns/protozero-trace.hh
+++ b/pdns/protozero-trace.hh
@@ -134,7 +134,7 @@ T decode(protozero::pbf_reader& reader)
       vec.emplace_back(E::decode(sub));
     }
   }
-  return {vec};
+  return {std::move(vec)};
 }
 
 struct ArrayValue
diff --git a/pdns/recursordist/rec-eventtrace.cc b/pdns/recursordist/rec-eventtrace.cc
index 52c9fe7601..360ad29e3d 100644
--- a/pdns/recursordist/rec-eventtrace.cc
+++ b/pdns/recursordist/rec-eventtrace.cc
@@ -49,18 +49,18 @@ static void addValue(const RecEventTrace::Entry& event, Span& work, bool start)
   if (std::holds_alternative<std::nullopt_t>(event.d_value)) {
     return;
   }
-  const string key = start ? "arg" : "result";
+  string key = start ? "arg" : "result";
   if (std::holds_alternative<bool>(event.d_value)) {
-    work.attributes.emplace_back(KeyValue{key, {std::get<bool>(event.d_value)}});
+    work.attributes.emplace_back(KeyValue{std::move(key), {std::get<bool>(event.d_value)}});
   }
   else if (std::holds_alternative<int64_t>(event.d_value)) {
-    work.attributes.emplace_back(KeyValue{key, {std::get<int64_t>(event.d_value)}});
+    work.attributes.emplace_back(KeyValue{std::move(key), {std::get<int64_t>(event.d_value)}});
   }
   else if (std::holds_alternative<std::string>(event.d_value)) {
-    work.attributes.emplace_back(KeyValue{key, {std::get<std::string>(event.d_value)}});
+    work.attributes.emplace_back(KeyValue{std::move(key), {std::get<std::string>(event.d_value)}});
   }
   else {
-    work.attributes.emplace_back(KeyValue{key, {RecEventTrace::toString(event.d_value)}});
+    work.attributes.emplace_back(KeyValue{std::move(key), {RecEventTrace::toString(event.d_value)}});
   }
 }