Merge pull request #8 from Tianlin-Zhao/origin/propagators

Origin/propagators
open-telemetry · Jul 29, 2020 · 60d95a7 · 60d95a7
2 parents d6be256 + cd057c4
commit 60d95a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/api/include/opentelemetry/trace/default_span.h b/api/include/opentelemetry/trace/default_span.h
@@ -67,8 +67,10 @@ class DefaultSpan: public Span {
     DefaultSpan(DefaultSpan&& spn) : span_context_(spn.GetContext()) {}
     DefaultSpan(const DefaultSpan& spn) : span_context_(spn.GetContext()) {}
 
-    trace::Tracer &tracer() noexcept {
-      return tracer_; // Invalid tracer
+    // This is an invalid implementation
+    trace::Tracer &tracer() const noexcept {
+      trace::Tracer tracer = trace::Tracer();
+      return tracer; // Invalid tracer
     }
 
     // Creates an instance of this class with spancontext.

diff --git a/api/include/opentelemetry/trace/span.h b/api/include/opentelemetry/trace/span.h
@@ -5,6 +5,7 @@
 #include "opentelemetry/common/attribute_value.h"
 #include "opentelemetry/core/timestamp.h"
 #include "opentelemetry/nostd/span.h"
+#include "opentelemetry/trace/span_context.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/trace/canonical_code.h"
 #include "opentelemetry/trace/key_value_iterable_view.h"
@@ -153,7 +154,7 @@ class Span
   // AddEvent).
   virtual bool IsRecording() const noexcept = 0;
 
-  virtual trace::Tracer &tracer() noexcept = 0;
+  virtual trace::Tracer &tracer() const noexcept = 0;
 };
 }  // namespace trace
 OPENTELEMETRY_END_NAMESPACE