Skip to content
Open
Changes from all commits
Commits
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
33 changes: 17 additions & 16 deletions exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ class Span;
* @return Span instance
*/
template <class SpanType, class TracerType>
SpanType *new_span(TracerType *objPtr,
SpanType *new_span(nostd::shared_ptr<TracerType> objPtr,
nostd::string_view name,
const opentelemetry::trace::StartSpanOptions &options,
std::unique_ptr<opentelemetry::trace::SpanContext> spanContext)
{
return new (std::nothrow) SpanType{*objPtr, name, options, std::move(spanContext)};
return new (std::nothrow) SpanType{std::move(objPtr), name, options, std::move(spanContext)};
}

/**
Expand Down Expand Up @@ -159,8 +159,7 @@ void UpdateStatus(T &t, Properties &props)
/**
* @brief Tracer class that allows to send spans to ETW Provider.
*/
class Tracer : public opentelemetry::trace::Tracer,
public std::enable_shared_from_this<opentelemetry::trace::Tracer>
class Tracer : public opentelemetry::trace::Tracer, public std::enable_shared_from_this<Tracer>
{
public:
/**
Expand Down Expand Up @@ -530,7 +529,9 @@ class Tracer : public opentelemetry::trace::Tracer,

// This template pattern allows us to forward-declare the etw::Span,
// create an instance of it, then assign it to tracer::Span result.
auto currentSpan = new_span<Span, Tracer>(this, name, options, std::move(spanContext));
auto owner_ptr = nostd::shared_ptr<Tracer>(this->shared_from_this());
auto currentSpan =
new_span<Span, Tracer>(std::move(owner_ptr), name, options, std::move(spanContext));
nostd::shared_ptr<opentelemetry::trace::Span> result = to_span_ptr<Span>(currentSpan);

// Decorate with additional standard fields
Expand Down Expand Up @@ -783,7 +784,7 @@ class Span : public opentelemetry::trace::Span
/**
* @brief Owner Tracer of this Span
*/
Tracer &owner_;
nostd::shared_ptr<Tracer> owner_;

/**
* @brief Span name.
Expand Down Expand Up @@ -862,14 +863,14 @@ class Span : public opentelemetry::trace::Span
* @param parent Parent Span (optional)
* @return
*/
Span(Tracer &owner,
Span(nostd::shared_ptr<Tracer> owner,
nostd::string_view name,
const opentelemetry::trace::StartSpanOptions &options,
std::unique_ptr<opentelemetry::trace::SpanContext> spanContext,
Span *parent = nullptr) noexcept
: opentelemetry::trace::Span(),
start_time_(std::chrono::system_clock::now()),
owner_(owner),
owner_(std::move(owner)),
context_(std::move(spanContext)),
parent_(parent)
{
Expand All @@ -887,7 +888,7 @@ class Span : public opentelemetry::trace::Span
* @param name Event name.
* @return
*/
void AddEvent(nostd::string_view name) noexcept override { owner_.AddEvent(*this, name); }
void AddEvent(nostd::string_view name) noexcept override { owner_->AddEvent(*this, name); }

/**
* @brief Add named event with custom timestamp.
Expand All @@ -898,7 +899,7 @@ class Span : public opentelemetry::trace::Span
void AddEvent(nostd::string_view name,
opentelemetry::common::SystemTimestamp timestamp) noexcept override
{
owner_.AddEvent(*this, name, timestamp);
owner_->AddEvent(*this, name, timestamp);
}

/**
Expand All @@ -912,7 +913,7 @@ class Span : public opentelemetry::trace::Span
opentelemetry::common::SystemTimestamp timestamp,
const opentelemetry::common::KeyValueIterable &attributes) noexcept override
{
owner_.AddEvent(*this, name, timestamp, attributes);
owner_->AddEvent(*this, name, timestamp, attributes);
}

#if OPENTELEMETRY_ABI_VERSION_NO >= 2
Expand Down Expand Up @@ -1024,7 +1025,7 @@ class Span : public opentelemetry::trace::Span

if (!has_ended_.exchange(true))
{
owner_.EndSpan(*this, parent_, options);
owner_->EndSpan(*this, parent_, options);
}
}

Expand Down Expand Up @@ -1056,7 +1057,7 @@ class Span : public opentelemetry::trace::Span
/// Get Owner tracer of this Span
/// </summary>
/// <returns></returns>
opentelemetry::trace::Tracer &tracer() const noexcept { return this->owner_; }
opentelemetry::trace::Tracer &tracer() const noexcept { return *this->owner_; }
};

/**
Expand Down Expand Up @@ -1177,9 +1178,9 @@ class TracerProvider : public opentelemetry::trace::TracerProvider
UNREFERENCED_PARAMETER(args);
UNREFERENCED_PARAMETER(schema_url);
ETWProvider::EventFormat evtFmt = config_.encoding;
std::shared_ptr<opentelemetry::trace::Tracer> tracer{new (std::nothrow)
Tracer(*this, name, evtFmt)};
return nostd::shared_ptr<opentelemetry::trace::Tracer>{tracer};
std::shared_ptr<Tracer> tracer{new (std::nothrow) Tracer(*this, name, evtFmt)};
return nostd::shared_ptr<opentelemetry::trace::Tracer>{
std::static_pointer_cast<opentelemetry::trace::Tracer>(tracer)};
}
};

Expand Down
Loading