Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BUILD] Fix references to trace namespace to be fully qualified #2422

Merged
merged 1 commit into from
Dec 1, 2023
+6 −6
Merged

[BUILD] Fix references to trace namespace to be fully qualified #2422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions sdk/include/opentelemetry/sdk/metrics/data/exemplar_data.h
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell.h
View file
Open in desktop
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