Skip to content

[ETW] Fix tracer initialization order #3824

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

Merged
marcalff merged 4 commits into from
Jan 24, 2026
+17 −13
Merged

[ETW] Fix tracer initialization order #3824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18503ab
Refactor: Inline initProvHandle and fix formatting
beep-boopp Jan 22, 2026
0d18db0
fix: restore public access and revert isClosed_ order
beep-boopp Jan 23, 2026
596b6af
test: fix MSVC namespace resolution and add constructor test
beep-boopp Jan 23, 2026
8966698
Merge branch 'main' into fix/etw-initialization-order
marcalff Jan 24, 2026
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
21 changes: 8 additions & 13 deletions exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,16 @@ 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>
{
public:
/**
* @brief Indicates whether the tracer is closed.
*/
bool IsClosed() const noexcept { return isClosed_.load(); }

private:
/**
* @brief Parent provider of this Tracer
*/
Expand Down Expand Up @@ -397,16 +402,6 @@ class Tracer : public opentelemetry::trace::Tracer,

friend class Span;

/**
* @brief Init a reference to etw::ProviderHandle
* @return Provider Handle
*/
ETWProvider::Handle &initProvHandle()
{
isClosed_ = false;
return etwProvider().open(provId, encoding);
}

public:
Copy link
Member

@marcalff marcalff Jan 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the public: declaration for the constructor ?

This breaks the build, see CI.

/**
* @brief Tracer constructor
Expand All @@ -421,11 +416,11 @@ class Tracer : public opentelemetry::trace::Tracer,
tracerProvider_(parent),
provId(providerId.data(), providerId.size()),
encoding(encoding),
provHandle(initProvHandle())
provHandle(etwProvider().open(provId, encoding))
{
isClosed_.store(false);
traceId_ = GetIdGenerator(tracerProvider_).GenerateTraceId();
}

/**
* @brief Start Span
* @param name Span name
Expand Down
9 changes: 9 additions & 0 deletions exporters/etw/test/etw_tracer_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,15 @@ TEST(ETWTracer, EndWithCustomTime)

}

TEST(ETWTracer, ConstructorInitializesToOpenState)
{
opentelemetry::exporter::etw::TracerProvider provider;
std::string providerId = "TestProvider";
opentelemetry::exporter::etw::Tracer tracer(provider, providerId);
// Tracer should be open after construction
EXPECT_FALSE(tracer.IsClosed());
}

/* clang-format on */

#endif
Loading