From 99e3672f846fc76a4f7252629dde6dbba0a364f2 Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Mon, 22 Jun 2020 22:11:46 +0000 Subject: [PATCH 01/21] Add basic recordable functions --- exporters/otlp/recordable.cc | 5 +++++ exporters/otlp/recordable.h | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/exporters/otlp/recordable.cc b/exporters/otlp/recordable.cc index d38f284577..ee44f947d5 100644 --- a/exporters/otlp/recordable.cc +++ b/exporters/otlp/recordable.cc @@ -20,6 +20,11 @@ void Recordable::SetName(nostd::string_view name) noexcept { span_.set_name(name.data(), name.size()); } + +void Recordable::SetStartTime(opentelemetry::core::SystemTimestamp start_time) noexcept +{ + span_.set_start_time_unixnano(start_time.time_since_epoch()); +} } // namespace otlp } // namespace exporter OPENTELEMETRY_END_NAMESPACE diff --git a/exporters/otlp/recordable.h b/exporters/otlp/recordable.h index 5ea1edf497..ace4e05f35 100644 --- a/exporters/otlp/recordable.h +++ b/exporters/otlp/recordable.h @@ -14,13 +14,20 @@ class Recordable final : public sdk::trace::Recordable public: const proto::trace::v1::Span &span() const noexcept { return span_; } - // sdk::trace::Recordable + void SetIds(trace::TraceId trace_id, + trace::SpanId span_id, + trace::SpanId parent_span_id) noexcept override; + void AddEvent(nostd::string_view name, core::SystemTimestamp timestamp) noexcept override; void SetStatus(trace::CanonicalCode code, nostd::string_view description) noexcept override; void SetName(nostd::string_view name) noexcept override; + void SetStartTime(opentelemetry::core::SystemTimestamp start_time) noexcept override; + + void SetDuration(std::chrono::nanoseconds duration) noexcept override; + private: proto::trace::v1::Span span_; }; From e326783fe7d505b65fa0c5c18a3cdddda0b1babc Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Tue, 23 Jun 2020 01:02:33 +0000 Subject: [PATCH 02/21] Add start time --- exporters/otlp/recordable.cc | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/exporters/otlp/recordable.cc b/exporters/otlp/recordable.cc index ee44f947d5..0094cf6d68 100644 --- a/exporters/otlp/recordable.cc +++ b/exporters/otlp/recordable.cc @@ -5,6 +5,12 @@ namespace exporter { namespace otlp { +// void Recordable::SetIds(trace::TraceId trace_id, +// trace::SpanId span_id, +// trace::SpanId parent_span_id) noexcept { +// span_.set_trace_id(trace_id); +// } + void Recordable::AddEvent(nostd::string_view name, core::SystemTimestamp timestamp) noexcept { (void)name; @@ -23,8 +29,14 @@ void Recordable::SetName(nostd::string_view name) noexcept void Recordable::SetStartTime(opentelemetry::core::SystemTimestamp start_time) noexcept { - span_.set_start_time_unixnano(start_time.time_since_epoch()); + std::chrono::nanoseconds nano_time = start_time.time_since_epoch(); + uint64_t nano_unix_time = std::chrono::duration_cast(nano_time).count(); + span_.set_start_time_unixnano(nano_unix_time); } + +// void Recordable::SetDuration(std::chrono::nanoseconds duration) noexcept { + +// } } // namespace otlp } // namespace exporter OPENTELEMETRY_END_NAMESPACE From bb8b215791773a92d971597b8eff895a82c0ce9f Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Tue, 23 Jun 2020 19:02:46 +0000 Subject: [PATCH 03/21] Add duration and ids --- exporters/otlp/recordable.cc | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/exporters/otlp/recordable.cc b/exporters/otlp/recordable.cc index 0094cf6d68..cbe9636241 100644 --- a/exporters/otlp/recordable.cc +++ b/exporters/otlp/recordable.cc @@ -5,11 +5,21 @@ namespace exporter { namespace otlp { -// void Recordable::SetIds(trace::TraceId trace_id, -// trace::SpanId span_id, -// trace::SpanId parent_span_id) noexcept { -// span_.set_trace_id(trace_id); -// } +void Recordable::SetIds(trace::TraceId trace_id, + trace::SpanId span_id, + trace::SpanId parent_span_id) noexcept { + char trace_id_buff[32] = {0}; + char span_id_buff[16] = {0}; + char parent_span_id_buff[16] = {0}; + + trace_id.ToLowerBase16(trace_id_buff); + span_id.ToLowerBase16(span_id_buff); + parent_span_id.ToLowerBase16(parent_span_id_buff); + + span_.set_trace_id(trace_id_buff); + span_.set_span_id(span_id_buff); + span_.set_parent_span_id(parent_span_id_buff); +} void Recordable::AddEvent(nostd::string_view name, core::SystemTimestamp timestamp) noexcept { @@ -30,13 +40,16 @@ void Recordable::SetName(nostd::string_view name) noexcept void Recordable::SetStartTime(opentelemetry::core::SystemTimestamp start_time) noexcept { std::chrono::nanoseconds nano_time = start_time.time_since_epoch(); - uint64_t nano_unix_time = std::chrono::duration_cast(nano_time).count(); + uint64_t nano_unix_time = nano_time.count(); span_.set_start_time_unixnano(nano_unix_time); } -// void Recordable::SetDuration(std::chrono::nanoseconds duration) noexcept { +void Recordable::SetDuration(std::chrono::nanoseconds duration) noexcept { + uint64_t unix_duration = duration.count(); -// } + uint64_t unix_end_time = span_.start_time_unixnano() + unix_duration; + span_.set_end_time_unixnano(unix_end_time); +} } // namespace otlp } // namespace exporter OPENTELEMETRY_END_NAMESPACE From 257d03a4867aa9e41794f0552b23e0f7cbac5979 Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Tue, 23 Jun 2020 22:56:47 +0000 Subject: [PATCH 04/21] Add recordable test --- exporters/otlp/BUILD | 9 ++++++ exporters/otlp/recordable.cc | 4 +-- exporters/otlp/recordable_test.cc | 51 +++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 exporters/otlp/recordable_test.cc diff --git a/exporters/otlp/BUILD b/exporters/otlp/BUILD index 09b1516ab5..fd1f048889 100644 --- a/exporters/otlp/BUILD +++ b/exporters/otlp/BUILD @@ -28,3 +28,12 @@ cc_library( "@com_github_opentelemetry_proto//:trace_proto_cc", ], ) + +cc_test( + name = "recordable_test", + srcs = ["recordable_test.cc"], + deps = [ + ":recordable", + "@com_google_googletest//:gtest_main", + ], +) diff --git a/exporters/otlp/recordable.cc b/exporters/otlp/recordable.cc index cbe9636241..23739791b1 100644 --- a/exporters/otlp/recordable.cc +++ b/exporters/otlp/recordable.cc @@ -44,9 +44,9 @@ void Recordable::SetStartTime(opentelemetry::core::SystemTimestamp start_time) n span_.set_start_time_unixnano(nano_unix_time); } -void Recordable::SetDuration(std::chrono::nanoseconds duration) noexcept { +void Recordable::SetDuration(std::chrono::nanoseconds duration) noexcept +{ uint64_t unix_duration = duration.count(); - uint64_t unix_end_time = span_.start_time_unixnano() + unix_duration; span_.set_end_time_unixnano(unix_end_time); } diff --git a/exporters/otlp/recordable_test.cc b/exporters/otlp/recordable_test.cc new file mode 100644 index 0000000000..e4131a55a0 --- /dev/null +++ b/exporters/otlp/recordable_test.cc @@ -0,0 +1,51 @@ +#include "exporters/otlp/recordable.h" + +#include + +using namespace opentelemetry::exporter::otlp; + +OPENTELEMETRY_BEGIN_NAMESPACE + +TEST(RecordableTest, OtlpRecordable) +{ + Recordable rec; + + // For SetName + nostd::string_view name = "TestSpan"; + + // For SetStartTime + std::chrono::system_clock::time_point start_time = std::chrono::system_clock::now(); + core::SystemTimestamp start_timestamp(start_time); + + uint64_t unix_start = std::chrono::duration_cast( + start_time.time_since_epoch()).count(); + + // For SetDuration + std::chrono::nanoseconds duration(10); + uint64_t unix_end = unix_start + duration.count(); + + // For SetIds + // trace::TraceId trace_id(); + // trace::SpanId span_id(); + // trace::SpanId parent_span_id(); + + // nostd::span span_trace_id(0, 16); + // nostd::span span_span_id(0, 8); + // nostd::span span_parent_span_id(0, 8); + + // trace::TraceId trace_id(span_trace_id); + // trace::SpanId span_id(span_span_id); + // trace::SpanId parent_span_id(span_parent_span_id); + + rec.SetName(name); + rec.SetStartTime(start_timestamp); + rec.SetDuration(duration); + //rec.SetIds(trace_id, span_id, parent_span_id); + + ASSERT_EQ(rec.span().name(), name); + ASSERT_EQ(rec.span().start_time_unixnano(), unix_start); + ASSERT_EQ(rec.span().end_time_unixnano(), unix_end); + + //ASSERT_EQ(rec.span().trace_id(), trace_id); +} +OPENTELEMETRY_END_NAMESPACE \ No newline at end of file From 249b30895b7275cb5cac4bf99e6490a118ab7627 Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Wed, 24 Jun 2020 00:33:19 +0000 Subject: [PATCH 05/21] Move SetIds to its own test --- exporters/otlp/recordable.cc | 3 +- exporters/otlp/recordable_test.cc | 58 ++++++++++++++++++++++--------- 2 files changed, 43 insertions(+), 18 deletions(-) diff --git a/exporters/otlp/recordable.cc b/exporters/otlp/recordable.cc index 23739791b1..6821e255e7 100644 --- a/exporters/otlp/recordable.cc +++ b/exporters/otlp/recordable.cc @@ -7,7 +7,8 @@ namespace otlp { void Recordable::SetIds(trace::TraceId trace_id, trace::SpanId span_id, - trace::SpanId parent_span_id) noexcept { + trace::SpanId parent_span_id) noexcept +{ char trace_id_buff[32] = {0}; char span_id_buff[16] = {0}; char parent_span_id_buff[16] = {0}; diff --git a/exporters/otlp/recordable_test.cc b/exporters/otlp/recordable_test.cc index e4131a55a0..30247ce062 100644 --- a/exporters/otlp/recordable_test.cc +++ b/exporters/otlp/recordable_test.cc @@ -6,7 +6,47 @@ using namespace opentelemetry::exporter::otlp; OPENTELEMETRY_BEGIN_NAMESPACE -TEST(RecordableTest, OtlpRecordable) +TEST(Recordable, SetIds) +{ + Recordable rec; + + // trace::TraceId trace_id(); + // trace::SpanId span_id(); + // trace::SpanId parent_span_id(); + + // nostd::span span_trace_id(0, 16); + // nostd::span span_span_id(0, 8); + // nostd::span span_parent_span_id(0, 8); + + // trace::TraceId trace_id(span_trace_id); + // trace::SpanId span_id(span_span_id); + // trace::SpanId parent_span_id(span_parent_span_id); + + // constexpr uint8_t buf[] = {1, 2, 3, 4, 5, 6, 7, 8}; + // trace::TraceId trace_id(buf); + // trace::SpanId span_id(buf); + // trace::SpanId parent_span_id(buf); + + opentelemetry::trace::TraceId trace_id; + opentelemetry::trace::SpanId span_id; + opentelemetry::trace::SpanId parent_span_id; + + char trace_id_buff[32] = {0}; + char span_id_buff[16] = {0}; + char parent_span_id_buff[16] = {0}; + + trace_id.ToLowerBase16(trace_id_buff); + span_id.ToLowerBase16(span_id_buff); + parent_span_id.ToLowerBase16(parent_span_id_buff); + + rec.SetIds(trace_id, span_id, parent_span_id); + + ASSERT_EQ(rec.span().trace_id(), trace_id_buff); + ASSERT_EQ(rec.span().span_id(), span_id_buff); + ASSERT_EQ(rec.span().parent_span_id(), parent_span_id_buff); +} + +TEST(Recordable, OtlpRecordable) { Recordable rec; @@ -24,28 +64,12 @@ TEST(RecordableTest, OtlpRecordable) std::chrono::nanoseconds duration(10); uint64_t unix_end = unix_start + duration.count(); - // For SetIds - // trace::TraceId trace_id(); - // trace::SpanId span_id(); - // trace::SpanId parent_span_id(); - - // nostd::span span_trace_id(0, 16); - // nostd::span span_span_id(0, 8); - // nostd::span span_parent_span_id(0, 8); - - // trace::TraceId trace_id(span_trace_id); - // trace::SpanId span_id(span_span_id); - // trace::SpanId parent_span_id(span_parent_span_id); - rec.SetName(name); rec.SetStartTime(start_timestamp); rec.SetDuration(duration); - //rec.SetIds(trace_id, span_id, parent_span_id); ASSERT_EQ(rec.span().name(), name); ASSERT_EQ(rec.span().start_time_unixnano(), unix_start); ASSERT_EQ(rec.span().end_time_unixnano(), unix_end); - - //ASSERT_EQ(rec.span().trace_id(), trace_id); } OPENTELEMETRY_END_NAMESPACE \ No newline at end of file From b85b49a77d0388ae0f71f16c442cced070b5f714 Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Wed, 24 Jun 2020 18:21:42 +0000 Subject: [PATCH 06/21] Fix SetIds by not converting to hex --- exporters/otlp/recordable.cc | 13 +++++++------ exporters/otlp/recordable_test.cc | 30 ++++-------------------------- 2 files changed, 11 insertions(+), 32 deletions(-) diff --git a/exporters/otlp/recordable.cc b/exporters/otlp/recordable.cc index 6821e255e7..33ce6a0404 100644 --- a/exporters/otlp/recordable.cc +++ b/exporters/otlp/recordable.cc @@ -9,13 +9,14 @@ void Recordable::SetIds(trace::TraceId trace_id, trace::SpanId span_id, trace::SpanId parent_span_id) noexcept { - char trace_id_buff[32] = {0}; - char span_id_buff[16] = {0}; - char parent_span_id_buff[16] = {0}; + const uint8_t* trace_id_data = trace_id.Id().data(); + const char* trace_id_buff = (char*)trace_id_data; - trace_id.ToLowerBase16(trace_id_buff); - span_id.ToLowerBase16(span_id_buff); - parent_span_id.ToLowerBase16(parent_span_id_buff); + const uint8_t* span_id_data = span_id.Id().data(); + const char* span_id_buff = (char*)span_id_data; + + const uint8_t* parent_span_id_data = parent_span_id.Id().data(); + const char* parent_span_id_buff = (char*)parent_span_id_data; span_.set_trace_id(trace_id_buff); span_.set_span_id(span_id_buff); diff --git a/exporters/otlp/recordable_test.cc b/exporters/otlp/recordable_test.cc index 30247ce062..589aa71571 100644 --- a/exporters/otlp/recordable_test.cc +++ b/exporters/otlp/recordable_test.cc @@ -10,40 +10,18 @@ TEST(Recordable, SetIds) { Recordable rec; - // trace::TraceId trace_id(); - // trace::SpanId span_id(); - // trace::SpanId parent_span_id(); - - // nostd::span span_trace_id(0, 16); - // nostd::span span_span_id(0, 8); - // nostd::span span_parent_span_id(0, 8); - - // trace::TraceId trace_id(span_trace_id); - // trace::SpanId span_id(span_span_id); - // trace::SpanId parent_span_id(span_parent_span_id); - - // constexpr uint8_t buf[] = {1, 2, 3, 4, 5, 6, 7, 8}; - // trace::TraceId trace_id(buf); - // trace::SpanId span_id(buf); - // trace::SpanId parent_span_id(buf); - opentelemetry::trace::TraceId trace_id; opentelemetry::trace::SpanId span_id; opentelemetry::trace::SpanId parent_span_id; - char trace_id_buff[32] = {0}; - char span_id_buff[16] = {0}; - char parent_span_id_buff[16] = {0}; - - trace_id.ToLowerBase16(trace_id_buff); - span_id.ToLowerBase16(span_id_buff); - parent_span_id.ToLowerBase16(parent_span_id_buff); - rec.SetIds(trace_id, span_id, parent_span_id); + char trace_id_buff[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; + char span_id_buff[8] = {0,0,0,0,0,0,0,0}; + ASSERT_EQ(rec.span().trace_id(), trace_id_buff); ASSERT_EQ(rec.span().span_id(), span_id_buff); - ASSERT_EQ(rec.span().parent_span_id(), parent_span_id_buff); + ASSERT_EQ(rec.span().parent_span_id(), span_id_buff); } TEST(Recordable, OtlpRecordable) From 78cf8e0f8d0b5af6cfbe77c985978ba3c9eeb4ec Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Wed, 24 Jun 2020 19:02:30 +0000 Subject: [PATCH 07/21] Reformat tests --- exporters/otlp/recordable.cc | 7 ++-- exporters/otlp/recordable_test.cc | 57 ++++++++++++++++++------------- 2 files changed, 37 insertions(+), 27 deletions(-) diff --git a/exporters/otlp/recordable.cc b/exporters/otlp/recordable.cc index 33ce6a0404..b695faf6bd 100644 --- a/exporters/otlp/recordable.cc +++ b/exporters/otlp/recordable.cc @@ -10,12 +10,11 @@ void Recordable::SetIds(trace::TraceId trace_id, trace::SpanId parent_span_id) noexcept { const uint8_t* trace_id_data = trace_id.Id().data(); - const char* trace_id_buff = (char*)trace_id_data; - const uint8_t* span_id_data = span_id.Id().data(); - const char* span_id_buff = (char*)span_id_data; - const uint8_t* parent_span_id_data = parent_span_id.Id().data(); + + const char* trace_id_buff = (char*)trace_id_data; + const char* span_id_buff = (char*)span_id_data; const char* parent_span_id_buff = (char*)parent_span_id_data; span_.set_trace_id(trace_id_buff); diff --git a/exporters/otlp/recordable_test.cc b/exporters/otlp/recordable_test.cc index 589aa71571..3d14635be9 100644 --- a/exporters/otlp/recordable_test.cc +++ b/exporters/otlp/recordable_test.cc @@ -4,50 +4,61 @@ using namespace opentelemetry::exporter::otlp; -OPENTELEMETRY_BEGIN_NAMESPACE - TEST(Recordable, SetIds) { Recordable rec; - opentelemetry::trace::TraceId trace_id; - opentelemetry::trace::SpanId span_id; - opentelemetry::trace::SpanId parent_span_id; + const uint8_t trace_id_buff[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1}; + const uint8_t span_id_buff[8] = {0,0,0,0,0,0,0,2}; + const uint8_t parent_span_id_buff[8] = {0,0,0,0,0,0,0,3}; - rec.SetIds(trace_id, span_id, parent_span_id); + opentelemetry::nostd::spantrace_id_span(trace_id_buff, 16); + opentelemetry::nostd::span span_id_span(span_id_buff, 8); + opentelemetry::nostd::span parent_span_id_span(parent_span_id_buff, 8); - char trace_id_buff[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; - char span_id_buff[8] = {0,0,0,0,0,0,0,0}; + opentelemetry::trace::TraceId trace_id(trace_id_span); + opentelemetry::trace::SpanId span_id(span_id_span); + opentelemetry::trace::SpanId parent_span_id(parent_span_id_span); - ASSERT_EQ(rec.span().trace_id(), trace_id_buff); - ASSERT_EQ(rec.span().span_id(), span_id_buff); - ASSERT_EQ(rec.span().parent_span_id(), span_id_buff); + rec.SetIds(trace_id, span_id, parent_span_id); + + ASSERT_EQ(rec.span().trace_id(), (char*)trace_id_buff); + ASSERT_EQ(rec.span().span_id(), (char*)span_id_buff); + ASSERT_EQ(rec.span().parent_span_id(), (char*)parent_span_id_buff); } -TEST(Recordable, OtlpRecordable) +TEST(Recordable, SetName) { Recordable rec; + opentelemetry::nostd::string_view name = "TestSpan"; + rec.SetName(name); + ASSERT_EQ(rec.span().name(), name); +} - // For SetName - nostd::string_view name = "TestSpan"; - - // For SetStartTime +TEST(Recordable, SetStartTime) +{ + Recordable rec; std::chrono::system_clock::time_point start_time = std::chrono::system_clock::now(); - core::SystemTimestamp start_timestamp(start_time); + opentelemetry::core::SystemTimestamp start_timestamp(start_time); uint64_t unix_start = std::chrono::duration_cast( start_time.time_since_epoch()).count(); - // For SetDuration + rec.SetStartTime(start_timestamp); + ASSERT_EQ(rec.span().start_time_unixnano(), unix_start); +} + +TEST(Recordable, SetDuration) +{ + Recordable rec; + // Start time is 0 + opentelemetry::core::SystemTimestamp start_timestamp; + std::chrono::nanoseconds duration(10); - uint64_t unix_end = unix_start + duration.count(); + uint64_t unix_end = duration.count(); - rec.SetName(name); rec.SetStartTime(start_timestamp); rec.SetDuration(duration); - ASSERT_EQ(rec.span().name(), name); - ASSERT_EQ(rec.span().start_time_unixnano(), unix_start); ASSERT_EQ(rec.span().end_time_unixnano(), unix_end); } -OPENTELEMETRY_END_NAMESPACE \ No newline at end of file From a53e87166723bb783f30850d3c7128346d264118 Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Wed, 24 Jun 2020 19:40:35 +0000 Subject: [PATCH 08/21] Fix Recordable instantiation in test --- exporters/otlp/recordable_test.cc | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/exporters/otlp/recordable_test.cc b/exporters/otlp/recordable_test.cc index 3d14635be9..893820d523 100644 --- a/exporters/otlp/recordable_test.cc +++ b/exporters/otlp/recordable_test.cc @@ -6,7 +6,7 @@ using namespace opentelemetry::exporter::otlp; TEST(Recordable, SetIds) { - Recordable rec; + Recordable* rec = new Recordable(); const uint8_t trace_id_buff[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1}; const uint8_t span_id_buff[8] = {0,0,0,0,0,0,0,2}; @@ -20,45 +20,45 @@ TEST(Recordable, SetIds) opentelemetry::trace::SpanId span_id(span_id_span); opentelemetry::trace::SpanId parent_span_id(parent_span_id_span); - rec.SetIds(trace_id, span_id, parent_span_id); + rec->SetIds(trace_id, span_id, parent_span_id); - ASSERT_EQ(rec.span().trace_id(), (char*)trace_id_buff); - ASSERT_EQ(rec.span().span_id(), (char*)span_id_buff); - ASSERT_EQ(rec.span().parent_span_id(), (char*)parent_span_id_buff); + ASSERT_EQ(rec->span().trace_id(), (char*)trace_id_buff); + ASSERT_EQ(rec->span().span_id(), (char*)span_id_buff); + ASSERT_EQ(rec->span().parent_span_id(), (char*)parent_span_id_buff); } TEST(Recordable, SetName) { - Recordable rec; + Recordable* rec = new Recordable(); opentelemetry::nostd::string_view name = "TestSpan"; - rec.SetName(name); - ASSERT_EQ(rec.span().name(), name); + rec->SetName(name); + ASSERT_EQ(rec->span().name(), name); } TEST(Recordable, SetStartTime) { - Recordable rec; + Recordable* rec = new Recordable(); std::chrono::system_clock::time_point start_time = std::chrono::system_clock::now(); opentelemetry::core::SystemTimestamp start_timestamp(start_time); uint64_t unix_start = std::chrono::duration_cast( start_time.time_since_epoch()).count(); - rec.SetStartTime(start_timestamp); - ASSERT_EQ(rec.span().start_time_unixnano(), unix_start); + rec->SetStartTime(start_timestamp); + ASSERT_EQ(rec->span().start_time_unixnano(), unix_start); } TEST(Recordable, SetDuration) { - Recordable rec; + Recordable* rec = new Recordable(); // Start time is 0 opentelemetry::core::SystemTimestamp start_timestamp; std::chrono::nanoseconds duration(10); uint64_t unix_end = duration.count(); - rec.SetStartTime(start_timestamp); - rec.SetDuration(duration); + rec->SetStartTime(start_timestamp); + rec->SetDuration(duration); - ASSERT_EQ(rec.span().end_time_unixnano(), unix_end); + ASSERT_EQ(rec->span().end_time_unixnano(), unix_end); } From ce61e404345e81590d6cddd73e968693f71dc58c Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Wed, 24 Jun 2020 23:40:31 +0000 Subject: [PATCH 09/21] Update code for new function (SetAttribute) --- exporters/otlp/recordable.cc | 7 +++++++ exporters/otlp/recordable.h | 3 +++ 2 files changed, 10 insertions(+) diff --git a/exporters/otlp/recordable.cc b/exporters/otlp/recordable.cc index b695faf6bd..2ba6de6398 100644 --- a/exporters/otlp/recordable.cc +++ b/exporters/otlp/recordable.cc @@ -22,6 +22,13 @@ void Recordable::SetIds(trace::TraceId trace_id, span_.set_parent_span_id(parent_span_id_buff); } +void SetAttribute(nostd::string_view key, + const opentelemetry::common::AttributeValue &&value) noexcept +{ + (void)key; + (void)value; +} + void Recordable::AddEvent(nostd::string_view name, core::SystemTimestamp timestamp) noexcept { (void)name; diff --git a/exporters/otlp/recordable.h b/exporters/otlp/recordable.h index ace4e05f35..8490bc9141 100644 --- a/exporters/otlp/recordable.h +++ b/exporters/otlp/recordable.h @@ -18,6 +18,9 @@ class Recordable final : public sdk::trace::Recordable trace::SpanId span_id, trace::SpanId parent_span_id) noexcept override; + void SetAttribute(nostd::string_view key, + const opentelemetry::common::AttributeValue &&value) noexcept override; + void AddEvent(nostd::string_view name, core::SystemTimestamp timestamp) noexcept override; void SetStatus(trace::CanonicalCode code, nostd::string_view description) noexcept override; From 11ce576c1af66cbd631746fce057865ce00ab679 Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Wed, 24 Jun 2020 23:50:03 +0000 Subject: [PATCH 10/21] Fix undefined reference error --- exporters/otlp/recordable.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exporters/otlp/recordable.cc b/exporters/otlp/recordable.cc index 2ba6de6398..6ddc66d003 100644 --- a/exporters/otlp/recordable.cc +++ b/exporters/otlp/recordable.cc @@ -22,8 +22,8 @@ void Recordable::SetIds(trace::TraceId trace_id, span_.set_parent_span_id(parent_span_id_buff); } -void SetAttribute(nostd::string_view key, - const opentelemetry::common::AttributeValue &&value) noexcept +void Recordable::SetAttribute(nostd::string_view key, + const opentelemetry::common::AttributeValue &&value) noexcept { (void)key; (void)value; From bc98b812b1350b706ccf3c9f787b73ffb37a30ad Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Thu, 25 Jun 2020 00:05:24 +0000 Subject: [PATCH 11/21] Fix memory leak --- exporters/otlp/recordable_test.cc | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/exporters/otlp/recordable_test.cc b/exporters/otlp/recordable_test.cc index 893820d523..3d14635be9 100644 --- a/exporters/otlp/recordable_test.cc +++ b/exporters/otlp/recordable_test.cc @@ -6,7 +6,7 @@ using namespace opentelemetry::exporter::otlp; TEST(Recordable, SetIds) { - Recordable* rec = new Recordable(); + Recordable rec; const uint8_t trace_id_buff[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1}; const uint8_t span_id_buff[8] = {0,0,0,0,0,0,0,2}; @@ -20,45 +20,45 @@ TEST(Recordable, SetIds) opentelemetry::trace::SpanId span_id(span_id_span); opentelemetry::trace::SpanId parent_span_id(parent_span_id_span); - rec->SetIds(trace_id, span_id, parent_span_id); + rec.SetIds(trace_id, span_id, parent_span_id); - ASSERT_EQ(rec->span().trace_id(), (char*)trace_id_buff); - ASSERT_EQ(rec->span().span_id(), (char*)span_id_buff); - ASSERT_EQ(rec->span().parent_span_id(), (char*)parent_span_id_buff); + ASSERT_EQ(rec.span().trace_id(), (char*)trace_id_buff); + ASSERT_EQ(rec.span().span_id(), (char*)span_id_buff); + ASSERT_EQ(rec.span().parent_span_id(), (char*)parent_span_id_buff); } TEST(Recordable, SetName) { - Recordable* rec = new Recordable(); + Recordable rec; opentelemetry::nostd::string_view name = "TestSpan"; - rec->SetName(name); - ASSERT_EQ(rec->span().name(), name); + rec.SetName(name); + ASSERT_EQ(rec.span().name(), name); } TEST(Recordable, SetStartTime) { - Recordable* rec = new Recordable(); + Recordable rec; std::chrono::system_clock::time_point start_time = std::chrono::system_clock::now(); opentelemetry::core::SystemTimestamp start_timestamp(start_time); uint64_t unix_start = std::chrono::duration_cast( start_time.time_since_epoch()).count(); - rec->SetStartTime(start_timestamp); - ASSERT_EQ(rec->span().start_time_unixnano(), unix_start); + rec.SetStartTime(start_timestamp); + ASSERT_EQ(rec.span().start_time_unixnano(), unix_start); } TEST(Recordable, SetDuration) { - Recordable* rec = new Recordable(); + Recordable rec; // Start time is 0 opentelemetry::core::SystemTimestamp start_timestamp; std::chrono::nanoseconds duration(10); uint64_t unix_end = duration.count(); - rec->SetStartTime(start_timestamp); - rec->SetDuration(duration); + rec.SetStartTime(start_timestamp); + rec.SetDuration(duration); - ASSERT_EQ(rec->span().end_time_unixnano(), unix_end); + ASSERT_EQ(rec.span().end_time_unixnano(), unix_end); } From a61c01f66f41f5292df15938715eccb01b752443 Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Thu, 25 Jun 2020 17:05:10 +0000 Subject: [PATCH 12/21] Address review comments --- exporters/otlp/recordable.cc | 17 ++---- exporters/otlp/recordable_test.cc | 89 +++++++++++++++++-------------- 2 files changed, 54 insertions(+), 52 deletions(-) diff --git a/exporters/otlp/recordable.cc b/exporters/otlp/recordable.cc index 6ddc66d003..4af62db8c6 100644 --- a/exporters/otlp/recordable.cc +++ b/exporters/otlp/recordable.cc @@ -9,17 +9,10 @@ void Recordable::SetIds(trace::TraceId trace_id, trace::SpanId span_id, trace::SpanId parent_span_id) noexcept { - const uint8_t* trace_id_data = trace_id.Id().data(); - const uint8_t* span_id_data = span_id.Id().data(); - const uint8_t* parent_span_id_data = parent_span_id.Id().data(); - - const char* trace_id_buff = (char*)trace_id_data; - const char* span_id_buff = (char*)span_id_data; - const char* parent_span_id_buff = (char*)parent_span_id_data; - - span_.set_trace_id(trace_id_buff); - span_.set_span_id(span_id_buff); - span_.set_parent_span_id(parent_span_id_buff); + span_.set_trace_id(reinterpret_cast(trace_id.Id().data()), trace::TraceId::kSize); + span_.set_span_id(reinterpret_cast(span_id.Id().data()), trace::SpanId::kSize); + span_.set_parent_span_id(reinterpret_cast(parent_span_id.Id().data()), + trace::SpanId::kSize); } void Recordable::SetAttribute(nostd::string_view key, @@ -48,7 +41,7 @@ void Recordable::SetName(nostd::string_view name) noexcept void Recordable::SetStartTime(opentelemetry::core::SystemTimestamp start_time) noexcept { std::chrono::nanoseconds nano_time = start_time.time_since_epoch(); - uint64_t nano_unix_time = nano_time.count(); + uint64_t nano_unix_time = nano_time.count(); span_.set_start_time_unixnano(nano_unix_time); } diff --git a/exporters/otlp/recordable_test.cc b/exporters/otlp/recordable_test.cc index 3d14635be9..0318bd0587 100644 --- a/exporters/otlp/recordable_test.cc +++ b/exporters/otlp/recordable_test.cc @@ -2,63 +2,72 @@ #include -using namespace opentelemetry::exporter::otlp; - +OPENTELEMETRY_BEGIN_NAMESPACE +namespace exporter +{ +namespace otlp +{ TEST(Recordable, SetIds) { - Recordable rec; - - const uint8_t trace_id_buff[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1}; - const uint8_t span_id_buff[8] = {0,0,0,0,0,0,0,2}; - const uint8_t parent_span_id_buff[8] = {0,0,0,0,0,0,0,3}; - - opentelemetry::nostd::spantrace_id_span(trace_id_buff, 16); - opentelemetry::nostd::span span_id_span(span_id_buff, 8); - opentelemetry::nostd::span parent_span_id_span(parent_span_id_buff, 8); - - opentelemetry::trace::TraceId trace_id(trace_id_span); - opentelemetry::trace::SpanId span_id(span_id_span); - opentelemetry::trace::SpanId parent_span_id(parent_span_id_span); - - rec.SetIds(trace_id, span_id, parent_span_id); - - ASSERT_EQ(rec.span().trace_id(), (char*)trace_id_buff); - ASSERT_EQ(rec.span().span_id(), (char*)span_id_buff); - ASSERT_EQ(rec.span().parent_span_id(), (char*)parent_span_id_buff); + Recordable rec; + + const uint8_t trace_id_buff[trace::TraceId::kSize] = {0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1}; + const uint8_t span_id_buff[trace::SpanId::kSize] = {0, 0, 0, 0, 0, 0, 0, 2}; + const uint8_t parent_span_id_buff[trace::SpanId::kSize] = {0, 0, 0, 0, 0, 0, 0, 3}; + + const trace::TraceId trace_id( + nostd::span(trace_id_buff, trace::TraceId::kSize)); + const trace::SpanId span_id( + nostd::span(span_id_buff, trace::SpanId::kSize)); + const trace::SpanId parent_span_id( + nostd::span(parent_span_id_buff, trace::SpanId::kSize)); + + rec.SetIds(trace_id, span_id, parent_span_id); + + EXPECT_EQ(rec.span().trace_id(), + std::string(reinterpret_cast(trace_id_buff), trace::TraceId::kSize)); + EXPECT_EQ(rec.span().span_id(), + std::string(reinterpret_cast(span_id_buff), trace::SpanId::kSize)); + EXPECT_EQ(rec.span().parent_span_id(), + std::string(reinterpret_cast(parent_span_id_buff), trace::SpanId::kSize)); } TEST(Recordable, SetName) { - Recordable rec; - opentelemetry::nostd::string_view name = "TestSpan"; - rec.SetName(name); - ASSERT_EQ(rec.span().name(), name); + Recordable rec; + nostd::string_view name = "TestSpan"; + rec.SetName(name); + ASSERT_EQ(rec.span().name(), name); } TEST(Recordable, SetStartTime) { - Recordable rec; - std::chrono::system_clock::time_point start_time = std::chrono::system_clock::now(); - opentelemetry::core::SystemTimestamp start_timestamp(start_time); + Recordable rec; + std::chrono::system_clock::time_point start_time = std::chrono::system_clock::now(); + core::SystemTimestamp start_timestamp(start_time); - uint64_t unix_start = std::chrono::duration_cast( - start_time.time_since_epoch()).count(); + uint64_t unix_start = + std::chrono::duration_cast(start_time.time_since_epoch()).count(); - rec.SetStartTime(start_timestamp); - ASSERT_EQ(rec.span().start_time_unixnano(), unix_start); + rec.SetStartTime(start_timestamp); + ASSERT_EQ(rec.span().start_time_unixnano(), unix_start); } TEST(Recordable, SetDuration) { - Recordable rec; - // Start time is 0 - opentelemetry::core::SystemTimestamp start_timestamp; + Recordable rec; + // Start time is 0 + core::SystemTimestamp start_timestamp; - std::chrono::nanoseconds duration(10); - uint64_t unix_end = duration.count(); + std::chrono::nanoseconds duration(10); + uint64_t unix_end = duration.count(); - rec.SetStartTime(start_timestamp); - rec.SetDuration(duration); + rec.SetStartTime(start_timestamp); + rec.SetDuration(duration); - ASSERT_EQ(rec.span().end_time_unixnano(), unix_end); + ASSERT_EQ(rec.span().end_time_unixnano(), unix_end); } +} // namespace otlp +} // namespace exporter +OPENTELEMETRY_END_NAMESPACE From afa17f13850e689f057155bc7fd7c0c5c19119fa Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Thu, 25 Jun 2020 20:40:35 +0000 Subject: [PATCH 13/21] Update Bazel version for MacOS check --- .bazelversion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelversion b/.bazelversion index 944880fa15..15a2799817 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -3.2.0 +3.3.0 From 4b16157420c8fbee7f593fba655ffaad16555f72 Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Thu, 25 Jun 2020 22:16:56 +0000 Subject: [PATCH 14/21] Address additional review comments --- exporters/otlp/recordable.cc | 6 ++---- exporters/otlp/recordable_test.cc | 34 +++++++++++++++---------------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/exporters/otlp/recordable.cc b/exporters/otlp/recordable.cc index 4af62db8c6..ac53abbd26 100644 --- a/exporters/otlp/recordable.cc +++ b/exporters/otlp/recordable.cc @@ -40,15 +40,13 @@ void Recordable::SetName(nostd::string_view name) noexcept void Recordable::SetStartTime(opentelemetry::core::SystemTimestamp start_time) noexcept { - std::chrono::nanoseconds nano_time = start_time.time_since_epoch(); - uint64_t nano_unix_time = nano_time.count(); + const uint64_t nano_unix_time = start_time.time_since_epoch().count(); span_.set_start_time_unixnano(nano_unix_time); } void Recordable::SetDuration(std::chrono::nanoseconds duration) noexcept { - uint64_t unix_duration = duration.count(); - uint64_t unix_end_time = span_.start_time_unixnano() + unix_duration; + const uint64_t unix_end_time = span_.start_time_unixnano() + duration.count(); span_.set_end_time_unixnano(unix_end_time); } } // namespace otlp diff --git a/exporters/otlp/recordable_test.cc b/exporters/otlp/recordable_test.cc index 0318bd0587..a1e423cf91 100644 --- a/exporters/otlp/recordable_test.cc +++ b/exporters/otlp/recordable_test.cc @@ -9,28 +9,28 @@ namespace otlp { TEST(Recordable, SetIds) { - Recordable rec; + const opentelemetry::trace::TraceId trace_id( + std::array( + {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1})); + + const opentelemetry::trace::SpanId span_id( + std::array( + {0, 0, 0, 0, 0, 0, 0, 2})); - const uint8_t trace_id_buff[trace::TraceId::kSize] = {0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 1}; - const uint8_t span_id_buff[trace::SpanId::kSize] = {0, 0, 0, 0, 0, 0, 0, 2}; - const uint8_t parent_span_id_buff[trace::SpanId::kSize] = {0, 0, 0, 0, 0, 0, 0, 3}; + const opentelemetry::trace::SpanId parent_span_id( + std::array( + {0, 0, 0, 0, 0, 0, 0, 3})); - const trace::TraceId trace_id( - nostd::span(trace_id_buff, trace::TraceId::kSize)); - const trace::SpanId span_id( - nostd::span(span_id_buff, trace::SpanId::kSize)); - const trace::SpanId parent_span_id( - nostd::span(parent_span_id_buff, trace::SpanId::kSize)); + Recordable rec; rec.SetIds(trace_id, span_id, parent_span_id); EXPECT_EQ(rec.span().trace_id(), - std::string(reinterpret_cast(trace_id_buff), trace::TraceId::kSize)); + std::string(reinterpret_cast(trace_id.Id().data()), trace::TraceId::kSize)); EXPECT_EQ(rec.span().span_id(), - std::string(reinterpret_cast(span_id_buff), trace::SpanId::kSize)); + std::string(reinterpret_cast(span_id.Id().data()), trace::SpanId::kSize)); EXPECT_EQ(rec.span().parent_span_id(), - std::string(reinterpret_cast(parent_span_id_buff), trace::SpanId::kSize)); + std::string(reinterpret_cast(parent_span_id.Id().data()), trace::SpanId::kSize)); } TEST(Recordable, SetName) @@ -38,7 +38,7 @@ TEST(Recordable, SetName) Recordable rec; nostd::string_view name = "TestSpan"; rec.SetName(name); - ASSERT_EQ(rec.span().name(), name); + EXPECT_EQ(rec.span().name(), name); } TEST(Recordable, SetStartTime) @@ -51,7 +51,7 @@ TEST(Recordable, SetStartTime) std::chrono::duration_cast(start_time.time_since_epoch()).count(); rec.SetStartTime(start_timestamp); - ASSERT_EQ(rec.span().start_time_unixnano(), unix_start); + EXPECT_EQ(rec.span().start_time_unixnano(), unix_start); } TEST(Recordable, SetDuration) @@ -66,7 +66,7 @@ TEST(Recordable, SetDuration) rec.SetStartTime(start_timestamp); rec.SetDuration(duration); - ASSERT_EQ(rec.span().end_time_unixnano(), unix_end); + EXPECT_EQ(rec.span().end_time_unixnano(), unix_end); } } // namespace otlp } // namespace exporter From 4b4153812e65cc600c7a76d94424b3282fda8b89 Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Fri, 26 Jun 2020 22:16:52 +0000 Subject: [PATCH 15/21] Add recordable_test to CMakeLists --- exporters/otlp/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/exporters/otlp/CMakeLists.txt b/exporters/otlp/CMakeLists.txt index 07311ce909..1d44dfc834 100644 --- a/exporters/otlp/CMakeLists.txt +++ b/exporters/otlp/CMakeLists.txt @@ -1,3 +1,4 @@ add_library(opentelemetry_exporter_otprotocol recordable.cc) target_link_libraries(opentelemetry_exporter_otprotocol $) +gtest_add_tests(TARGET recordable_test TEST_PREFIX exporter. TEST_LIST recordable_test) From 91f55b63e960e356180c748568d3b3e8d92c6bac Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Fri, 26 Jun 2020 22:47:41 +0000 Subject: [PATCH 16/21] Fix CMakeList --- exporters/otlp/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/exporters/otlp/CMakeLists.txt b/exporters/otlp/CMakeLists.txt index 1d44dfc834..8111e75317 100644 --- a/exporters/otlp/CMakeLists.txt +++ b/exporters/otlp/CMakeLists.txt @@ -1,4 +1,8 @@ add_library(opentelemetry_exporter_otprotocol recordable.cc) target_link_libraries(opentelemetry_exporter_otprotocol $) -gtest_add_tests(TARGET recordable_test TEST_PREFIX exporter. TEST_LIST recordable_test) + +add_executable(recordable_test "recordable_test.cc") +target_link_libraries(recordable_test ${GTEST_BOTH_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} opentelemetry_exporters) +gtest_add_tests(TARGET recordable_test TEST_PREFIX exporters. TEST_LIST recordable_test) From 1ac3883e593df64224a739532c3554877a7382e1 Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Fri, 26 Jun 2020 23:31:51 +0000 Subject: [PATCH 17/21] Fix CMakeLists by using opentelemetry_trace --- exporters/otlp/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exporters/otlp/CMakeLists.txt b/exporters/otlp/CMakeLists.txt index 8111e75317..2a259147ad 100644 --- a/exporters/otlp/CMakeLists.txt +++ b/exporters/otlp/CMakeLists.txt @@ -4,5 +4,5 @@ target_link_libraries(opentelemetry_exporter_otprotocol add_executable(recordable_test "recordable_test.cc") target_link_libraries(recordable_test ${GTEST_BOTH_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} opentelemetry_exporters) -gtest_add_tests(TARGET recordable_test TEST_PREFIX exporters. TEST_LIST recordable_test) + ${CMAKE_THREAD_LIBS_INIT} opentelemetry_trace) +gtest_add_tests(TARGET recordable_test TEST_PREFIX trace. TEST_LIST recordable_test) From f2e7430191c0405209ac3d416c298212091463c0 Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Mon, 29 Jun 2020 04:58:36 +0000 Subject: [PATCH 18/21] Link test with proper library --- exporters/otlp/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exporters/otlp/CMakeLists.txt b/exporters/otlp/CMakeLists.txt index 2a259147ad..81648a4258 100644 --- a/exporters/otlp/CMakeLists.txt +++ b/exporters/otlp/CMakeLists.txt @@ -4,5 +4,5 @@ target_link_libraries(opentelemetry_exporter_otprotocol add_executable(recordable_test "recordable_test.cc") target_link_libraries(recordable_test ${GTEST_BOTH_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} opentelemetry_trace) -gtest_add_tests(TARGET recordable_test TEST_PREFIX trace. TEST_LIST recordable_test) + ${CMAKE_THREAD_LIBS_INIT} opentelemetry_exporter_otprotocol) +gtest_add_tests(TARGET recordable_test TEST_PREFIX exporter. TEST_LIST recordable_test) From 5ffea5afe6d915beb4f6e9da6178c94299ad524d Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Mon, 29 Jun 2020 16:42:38 +0000 Subject: [PATCH 19/21] Link to proto object library --- exporters/otlp/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/exporters/otlp/CMakeLists.txt b/exporters/otlp/CMakeLists.txt index 81648a4258..82e7fafbc7 100644 --- a/exporters/otlp/CMakeLists.txt +++ b/exporters/otlp/CMakeLists.txt @@ -4,5 +4,6 @@ target_link_libraries(opentelemetry_exporter_otprotocol add_executable(recordable_test "recordable_test.cc") target_link_libraries(recordable_test ${GTEST_BOTH_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} opentelemetry_exporter_otprotocol) + ${CMAKE_THREAD_LIBS_INIT} $ + opentelemetry_exporter_otprotocol) gtest_add_tests(TARGET recordable_test TEST_PREFIX exporter. TEST_LIST recordable_test) From 7a2179575fa1e422b4c472c066cc24f187f899dd Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Mon, 29 Jun 2020 23:37:06 +0000 Subject: [PATCH 20/21] Add protobuf dependency --- exporters/otlp/CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/exporters/otlp/CMakeLists.txt b/exporters/otlp/CMakeLists.txt index 82e7fafbc7..3cfc1a5832 100644 --- a/exporters/otlp/CMakeLists.txt +++ b/exporters/otlp/CMakeLists.txt @@ -2,8 +2,10 @@ add_library(opentelemetry_exporter_otprotocol recordable.cc) target_link_libraries(opentelemetry_exporter_otprotocol $) -add_executable(recordable_test "recordable_test.cc") -target_link_libraries(recordable_test ${GTEST_BOTH_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} $ - opentelemetry_exporter_otprotocol) +add_executable(recordable_test recordable_test.cc) +target_link_libraries(recordable_test + ${GTEST_BOTH_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + opentelemetry_exporter_otprotocol + protobuf::libprotobuf) gtest_add_tests(TARGET recordable_test TEST_PREFIX exporter. TEST_LIST recordable_test) From b9e135b1d8d067f412b394e8bcd09f99646b5db8 Mon Sep 17 00:00:00 2001 From: Nadia Ciobanu Date: Tue, 30 Jun 2020 21:19:56 +0000 Subject: [PATCH 21/21] Simplify namespaces in test --- exporters/otlp/recordable_test.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/exporters/otlp/recordable_test.cc b/exporters/otlp/recordable_test.cc index a1e423cf91..7e114ab539 100644 --- a/exporters/otlp/recordable_test.cc +++ b/exporters/otlp/recordable_test.cc @@ -9,16 +9,16 @@ namespace otlp { TEST(Recordable, SetIds) { - const opentelemetry::trace::TraceId trace_id( - std::array( + const trace::TraceId trace_id( + std::array( {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1})); - const opentelemetry::trace::SpanId span_id( - std::array( + const trace::SpanId span_id( + std::array( {0, 0, 0, 0, 0, 0, 0, 2})); - const opentelemetry::trace::SpanId parent_span_id( - std::array( + const trace::SpanId parent_span_id( + std::array( {0, 0, 0, 0, 0, 0, 0, 3})); Recordable rec;