No const move for AttributeValue

open-telemetry · Jul 8, 2020 · 0e25607 · 0e25607
1 parent 65f6639
commit 0e25607
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/api/include/opentelemetry/plugin/tracer.h b/api/include/opentelemetry/plugin/tracer.h
@@ -18,9 +18,9 @@ class Span final : public trace::Span
   {}
 
   // trace::Span
-  void SetAttribute(nostd::string_view name, const common::AttributeValue &&value) noexcept override
+  void SetAttribute(nostd::string_view name, const common::AttributeValue &value) noexcept override
   {
-    span_->SetAttribute(name, std::move(value));
+    span_->SetAttribute(name, value);
   }
 
   void AddEvent(nostd::string_view name) noexcept override { span_->AddEvent(name); }

diff --git a/api/include/opentelemetry/trace/noop.h b/api/include/opentelemetry/trace/noop.h
@@ -25,7 +25,7 @@ class NoopSpan final : public Span
   explicit NoopSpan(const std::shared_ptr<Tracer> &tracer) noexcept : tracer_{tracer} {}
 
   void SetAttribute(nostd::string_view /*key*/,
-                    const common::AttributeValue && /*value*/) noexcept override
+                    const common::AttributeValue & /*value*/) noexcept override
   {}
 
   void AddEvent(nostd::string_view /*name*/) noexcept override {}

diff --git a/api/include/opentelemetry/trace/span.h b/api/include/opentelemetry/trace/span.h
@@ -77,7 +77,7 @@ class Span
   // Sets an attribute on the Span. If the Span previously contained a mapping for
   // the key, the old value is replaced.
   virtual void SetAttribute(nostd::string_view key,
-                            const common::AttributeValue &&value) noexcept = 0;
+                            const common::AttributeValue &value) noexcept = 0;
 
   // Adds an event to the Span.
   virtual void AddEvent(nostd::string_view name) noexcept = 0;

diff --git a/examples/plugin/plugin/tracer.cc b/examples/plugin/plugin/tracer.cc
@@ -25,7 +25,7 @@ class Span final : public trace::Span
 
   // opentelemetry::trace::Span
   void SetAttribute(nostd::string_view /*name*/,
-                    const common::AttributeValue && /*value*/) noexcept override
+                    const common::AttributeValue & /*value*/) noexcept override
   {}
 
   void AddEvent(nostd::string_view /*name*/) noexcept override {}

diff --git a/exporters/otlp/recordable.cc b/exporters/otlp/recordable.cc
@@ -16,7 +16,7 @@ void Recordable::SetIds(trace::TraceId trace_id,
 }
 
 void Recordable::SetAttribute(nostd::string_view key,
-                              const opentelemetry::common::AttributeValue &&value) noexcept
+                              const opentelemetry::common::AttributeValue &value) noexcept
 {
   (void)key;
   (void)value;

diff --git a/exporters/otlp/recordable.h b/exporters/otlp/recordable.h
@@ -19,7 +19,7 @@ class Recordable final : public sdk::trace::Recordable
               trace::SpanId parent_span_id) noexcept override;
 
   void SetAttribute(nostd::string_view key,
-                    const opentelemetry::common::AttributeValue &&value) noexcept override;
+                    const opentelemetry::common::AttributeValue &value) noexcept override;
 
   void AddEvent(nostd::string_view name, core::SystemTimestamp timestamp) noexcept override;
 

diff --git a/sdk/include/opentelemetry/sdk/trace/recordable.h b/sdk/include/opentelemetry/sdk/trace/recordable.h
@@ -40,7 +40,7 @@ class Recordable
    * @param value the attribute value
    */
   virtual void SetAttribute(nostd::string_view key,
-                            const opentelemetry::common::AttributeValue &&value) noexcept = 0;
+                            const opentelemetry::common::AttributeValue &value) noexcept = 0;
 
   /**
    * Add an event to a span.

diff --git a/sdk/include/opentelemetry/sdk/trace/span_data.h b/sdk/include/opentelemetry/sdk/trace/span_data.h
@@ -86,7 +86,7 @@ class SpanData final : public Recordable
     parent_span_id_ = parent_span_id;
   }
 
-  void SetAttribute(nostd::string_view key, const common::AttributeValue &&value) noexcept override
+  void SetAttribute(nostd::string_view key, const common::AttributeValue &value) noexcept override
   {
     attributes_[std::string(key)] = value;
   }

diff --git a/sdk/src/trace/span.cc b/sdk/src/trace/span.cc
@@ -57,7 +57,7 @@ Span::Span(std::shared_ptr<Tracer> &&tracer,
   recordable_->SetName(name);
 
   attributes.ForEachKeyValue([&](nostd::string_view key, common::AttributeValue value) noexcept {
-    recordable_->SetAttribute(key, std::move(value));
+    recordable_->SetAttribute(key, value);
     return true;
   });
 
@@ -70,11 +70,11 @@ Span::~Span()
   End();
 }
 
-void Span::SetAttribute(nostd::string_view key, const common::AttributeValue &&value) noexcept
+void Span::SetAttribute(nostd::string_view key, const common::AttributeValue &value) noexcept
 {
   std::lock_guard<std::mutex> lock_guard{mu_};
 
-  recordable_->SetAttribute(key, std::move(value));
+  recordable_->SetAttribute(key, value);
 }
 
 void Span::AddEvent(nostd::string_view name) noexcept

diff --git a/sdk/src/trace/span.h b/sdk/src/trace/span.h
@@ -24,7 +24,7 @@ class Span final : public trace_api::Span
   ~Span() override;
 
   // trace_api::Span
-  void SetAttribute(nostd::string_view key, const common::AttributeValue &&value) noexcept override;
+  void SetAttribute(nostd::string_view key, const common::AttributeValue &value) noexcept override;
 
   void AddEvent(nostd::string_view name) noexcept override;