Merge branch 'main' into fixgoogletest

open-telemetry · Dec 1, 2023 · db1551f · db1551f
2 parents a1aa303 + 27a58cd
commit db1551f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/sdk/include/opentelemetry/sdk/metrics/data/exemplar_data.h b/sdk/include/opentelemetry/sdk/metrics/data/exemplar_data.h
@@ -26,7 +26,7 @@ using MetricAttributes = opentelemetry::sdk::common::OrderedAttributeMap;
 class ExemplarData
 {
 public:
-  static ExemplarData Create(std::shared_ptr<trace::SpanContext> context,
+  static ExemplarData Create(std::shared_ptr<opentelemetry::trace::SpanContext> context,
                              const opentelemetry::common::SystemTimestamp &timestamp,
                              const PointDataAttributes &point_data_attr)
   {
@@ -47,7 +47,7 @@ class ExemplarData
    * Returns the SpanContext associated with this exemplar. If the exemplar was not recorded
    * inside a sampled trace, the Context will be invalid.
    */
-  const trace::SpanContext &GetSpanContext() const noexcept { return context_; }
+  const opentelemetry::trace::SpanContext &GetSpanContext() const noexcept { return context_; }
 
   static PointType CreateSumPointData(ValueType value)
   {
@@ -68,13 +68,13 @@ class ExemplarData
   static PointType CreateDropPointData() { return DropPointData{}; }
 
 private:
-  ExemplarData(std::shared_ptr<trace::SpanContext> context,
+  ExemplarData(std::shared_ptr<opentelemetry::trace::SpanContext> context,
                opentelemetry::common::SystemTimestamp timestamp,
                const PointDataAttributes &point_data_attr)
       : context_(*context.get()), timestamp_(timestamp), point_data_attr_(point_data_attr)
   {}
 
-  trace::SpanContext context_;
+  opentelemetry::trace::SpanContext context_;
   opentelemetry::common::SystemTimestamp timestamp_;
   PointDataAttributes point_data_attr_;
 };

diff --git a/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell.h b/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell.h
@@ -137,13 +137,13 @@ class ReservoirCell
       auto current_ctx = span->GetContext();
       if (current_ctx.IsValid())
       {
-        context_.reset(new trace::SpanContext{current_ctx});
+        context_.reset(new opentelemetry::trace::SpanContext{current_ctx});
       }
     }
   }
 
   // Cell stores either long or double values, but must not store both
-  std::shared_ptr<trace::SpanContext> context_;
+  std::shared_ptr<opentelemetry::trace::SpanContext> context_;
   nostd::variant<int64_t, double> value_;
   opentelemetry::common::SystemTimestamp record_time_;
   MetricAttributes attributes_;