Skip to content

AddEvent support for Span #343

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
reyang merged 6 commits into from
Sep 30, 2020
Merged

AddEvent support for Span #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd45010
AddEvent support for Span
ThomsonTan Sep 29, 2020
9cc2c46
Add unittest for Span::AddEvent
ThomsonTan Sep 29, 2020
f43360a
Add test path with attributes to AddEvent
ThomsonTan Sep 29, 2020
aaab8a8
Pass non-empty attributes to AddEvent
ThomsonTan Sep 29, 2020
74f371f
Merge branch 'master' into SpanAddEvent
ThomsonTan Sep 29, 2020
a9cb3cf
Fix CI build issue
ThomsonTan Sep 30, 2020
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
24 changes: 18 additions & 6 deletions sdk/src/trace/span.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,22 +118,34 @@ void Span::SetAttribute(nostd::string_view key,

void Span::AddEvent(nostd::string_view name) noexcept
{
(void)name;
std::lock_guard<std::mutex> lock_guard{mu_};
if (recordable_ == nullptr)
{
return;
}
recordable_->AddEvent(name);
}

void Span::AddEvent(nostd::string_view name, core::SystemTimestamp timestamp) noexcept
{
(void)name;
(void)timestamp;
std::lock_guard<std::mutex> lock_guard{mu_};
if (recordable_ == nullptr)
{
return;
}
recordable_->AddEvent(name, timestamp);
}

void Span::AddEvent(nostd::string_view name,
core::SystemTimestamp timestamp,
const trace_api::KeyValueIterable &attributes) noexcept
{
(void)name;
(void)timestamp;
(void)attributes;
std::lock_guard<std::mutex> lock_guard{mu_};
if (recordable_ == nullptr)
{
return;
}
recordable_->AddEvent(name, timestamp, attributes);
}

void Span::SetStatus(trace_api::CanonicalCode code, nostd::string_view description) noexcept
Expand Down
25 changes: 25 additions & 0 deletions sdk/test/trace/tracer_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,31 @@ TEST(Tracer, SpanSetAttribute)
ASSERT_EQ(3.1, nostd::get<double>(cur_span_data->GetAttributes().at("abc")));
}

TEST(Tracer, SpanSetEvents)
{
std::unique_ptr<InMemorySpanExporter> exporter(new InMemorySpanExporter());
std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
auto tracer = initTracer(std::move(exporter));

auto span = tracer->StartSpan("span 1");
span->AddEvent("event 1");
span->AddEvent("event 2", std::chrono::system_clock::now());
Comment thread
ThomsonTan marked this conversation as resolved.
span->AddEvent("event 3", std::chrono::system_clock::now(), {{"attr1", 1}});
span->End();

auto spans = span_data->GetSpans();
ASSERT_EQ(1, spans.size());

auto &span_data_events = spans.at(0)->GetEvents();
ASSERT_EQ(3, span_data_events.size());
ASSERT_EQ("event 1", span_data_events[0].GetName());
ASSERT_EQ("event 2", span_data_events[1].GetName());
ASSERT_EQ("event 3", span_data_events[2].GetName());
ASSERT_EQ(0, span_data_events[0].GetAttributes().size());
ASSERT_EQ(0, span_data_events[1].GetAttributes().size());
ASSERT_EQ(1, span_data_events[2].GetAttributes().size());
}

TEST(Tracer, TestAlwaysOnSampler)
{
std::unique_ptr<InMemorySpanExporter> exporter(new InMemorySpanExporter());
Expand Down