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

Enable setting Span endtime for ETW exporter #1846

Merged
merged 8 commits into from
Dec 8, 2022
Merged

Enable setting Span endtime for ETW exporter #1846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4b207c9
fix
lalitb Dec 7, 2022
fef90a6
fix test formay
lalitb Dec 7, 2022
c26babb
Merge branch 'main' into etw-custom-endtime
lalitb Dec 7, 2022
3fc90e8
Merge branch 'main' into etw-custom-endtime
ThomsonTan Dec 8, 2022
62bd6df
fix comments
lalitb Dec 8, 2022
2182311
Merge branch 'etw-custom-endtime' of https://github.com/lalitb/opente…
lalitb Dec 8, 2022
d37deb0
format fix
lalitb Dec 8, 2022
ab2ea8a
fix spell
lalitb Dec 8, 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
12 changes: 11 additions & 1 deletion 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 @@ -899,7 +899,17 @@ class Span : public opentelemetry::trace::Span
*/
void End(const opentelemetry::trace::EndSpanOptions &options = {}) noexcept override
{
end_time_ = std::chrono::system_clock::now();
// TODO - explicitly setting end_time as 0 is not supported, and would be changed to
// current_time.
if (options.end_steady_time.time_since_epoch().count() == 0)
{
end_time_ = std::chrono::system_clock::now();
}
else
{
end_time_ =
opentelemetry::common::SystemTimestamp(options.end_steady_time.time_since_epoch());
}

if (!has_ended_.exchange(true))
{
Expand Down
14 changes: 14 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 @@ -537,6 +537,20 @@ TEST(ETWTracer, CustomSampler)
}
}

TEST(ETWTracer, EndWithCustomTime)
{
// Obtain a global tracer using C++11 magic static.
auto& globalTracer = GetGlobalTracer();
auto s1 = globalTracer.StartSpan("Span1");
auto traceId1 = s1->GetContext().trace_id();
opentelemetry::trace::EndSpanOptions end;
end.end_steady_time = opentelemetry::common::SteadyTimestamp(std::chrono::nanoseconds(40));
s1->End(end);
auto end_time = static_cast<opentelemetry::exporter::etw::Span *>(s1.get())->GetEndTime();
EXPECT_EQ(end.end_steady_time.time_since_epoch(), end_time.time_since_epoch());

}

/* clang-format on */

#endif