Skip to content

Commit

Permalink
Fix references to trace namespace to be fully qualified
Browse files Browse the repository at this point in the history
Signed-off-by: Bogdan Drutu <[email protected]>
  • Loading branch information
bogdandrutu committed Dec 1, 2023
1 parent 064fef0 commit 7e293f3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions sdk/include/opentelemetry/sdk/metrics/data/exemplar_data.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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)
{
Expand All @@ -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_;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down

0 comments on commit 7e293f3

Please sign in to comment.