Skip to content

[ETW Exporter] - ETW provider handle cleanup #1322

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
lalitb merged 5 commits into from
Apr 11, 2022
Merged

[ETW Exporter] - ETW provider handle cleanup #1322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd757f6
fix provider cleanup
lalitb Apr 8, 2022
2f102f6
fix
lalitb Apr 8, 2022
0f87019
add comment
lalitb Apr 8, 2022
c4ffe77
remove from provider list only if removal is successful
lalitb Apr 8, 2022
17a3b7a
fix test case
lalitb Apr 11, 2022
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: 6 additions & 2 deletions exporters/etw/include/opentelemetry/exporters/etw/etw_provider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@ class ETWProvider
{
std::lock_guard<std::mutex> lock(m_providerMapLock);

auto m = providers();
// use reference to provider list, NOT it' copy.
auto &m = providers();
Comment thread
ThomsonTan marked this conversation as resolved.
auto it = m.begin();
while (it != m.end())
{
Expand All @@ -228,7 +229,10 @@ class ETWProvider
}

it->second.providerHandle = INVALID_HANDLE;
m.erase(it);
if (result == STATUS_OK)
{
m.erase(it);
}
}
return result;
}
Expand Down
6 changes: 4 additions & 2 deletions exporters/etw/test/etw_provider_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ TEST(ETWProvider, ProviderIsRegisteredSuccessfully)

bool registered = etw.is_registered(providerName);
ASSERT_TRUE(registered);
etw.close(handle);
}

TEST(ETWProvider, ProviderIsNotRegisteredSuccessfully)
Expand Down Expand Up @@ -46,17 +47,18 @@ TEST(ETWProvider, CheckOpenGUIDDataSuccessfully)
auto guidStrName = uuid_name.to_string();

ASSERT_STREQ(guidStrHandle.c_str(), guidStrName.c_str());
etw.close(handle);
}

TEST(ETWProvider, CheckCloseSuccess)
{
std::string providerName = "OpenTelemetry-ETW-Provider";

static ETWProvider etw;
auto handle = etw.open(providerName.c_str());

auto handle = etw.open(providerName.c_str(), ETWProvider::EventFormat::ETW_MANIFEST);
auto result = etw.close(handle);
ASSERT_NE(result, etw.STATUS_ERROR);
ASSERT_FALSE(etw.is_registered(providerName));
}

#endif