From a496f42151ab0ec9a8e285278eac2867b310ce3b Mon Sep 17 00:00:00 2001 From: Lalit Date: Thu, 26 Aug 2021 00:31:59 +0000 Subject: [PATCH 1/3] fix setstatus login --- exporters/otlp/src/otlp_recordable.cc | 5 ++++- exporters/otlp/test/otlp_recordable_test.cc | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/exporters/otlp/src/otlp_recordable.cc b/exporters/otlp/src/otlp_recordable.cc index a17419df7e..8562ecc7ae 100644 --- a/exporters/otlp/src/otlp_recordable.cc +++ b/exporters/otlp/src/otlp_recordable.cc @@ -293,7 +293,10 @@ void OtlpRecordable::AddLink(const opentelemetry::trace::SpanContext &span_conte void OtlpRecordable::SetStatus(trace::StatusCode code, nostd::string_view description) noexcept { span_.mutable_status()->set_code(opentelemetry::proto::trace::v1::Status_StatusCode(code)); - span_.mutable_status()->set_message(description.data(), description.size()); + if (code == trace::StatusCode::kError) + { + span_.mutable_status()->set_message(description.data(), description.size()); + } } void OtlpRecordable::SetName(nostd::string_view name) noexcept diff --git a/exporters/otlp/test/otlp_recordable_test.cc b/exporters/otlp/test/otlp_recordable_test.cc index 9d34cd26a4..e4eb630b87 100644 --- a/exporters/otlp/test/otlp_recordable_test.cc +++ b/exporters/otlp/test/otlp_recordable_test.cc @@ -94,7 +94,7 @@ TEST(OtlpRecordable, SetDuration) TEST(OtlpRecordable, SetStatus) { OtlpRecordable rec; - trace::StatusCode code(trace::StatusCode::kOk); + trace::StatusCode code(trace::StatusCode::kError); nostd::string_view description = "For test"; rec.SetStatus(code, description); From fbd1dce38228faa7be2d70dddca909eeb0cb714a Mon Sep 17 00:00:00 2001 From: Lalit Date: Thu, 26 Aug 2021 01:04:44 +0000 Subject: [PATCH 2/3] add more test --- exporters/otlp/test/otlp_recordable_test.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/exporters/otlp/test/otlp_recordable_test.cc b/exporters/otlp/test/otlp_recordable_test.cc index e4eb630b87..55883d5413 100644 --- a/exporters/otlp/test/otlp_recordable_test.cc +++ b/exporters/otlp/test/otlp_recordable_test.cc @@ -100,6 +100,11 @@ TEST(OtlpRecordable, SetStatus) EXPECT_EQ(rec.span().status().code(), opentelemetry::proto::trace::v1::Status_StatusCode(code)); EXPECT_EQ(rec.span().status().message(), description); + + trace::StatusCode code_ok(trace::StatusCode::kOk); + rec.SetStatus(code, description); + EXPECT_EQ(rec.span().status().code(), opentelemetry::proto::trace::v1::Status_StatusCode(code)); + EXPECT_EQ(rec.span().status().message(), ""); } TEST(OtlpRecordable, AddEventDefault) From a4bf333a4f74ce822237e4999aebd72b5928e9ee Mon Sep 17 00:00:00 2001 From: Lalit Date: Thu, 26 Aug 2021 04:00:04 +0000 Subject: [PATCH 3/3] fix test --- exporters/otlp/test/otlp_recordable_test.cc | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/exporters/otlp/test/otlp_recordable_test.cc b/exporters/otlp/test/otlp_recordable_test.cc index 55883d5413..bc5e76bac0 100644 --- a/exporters/otlp/test/otlp_recordable_test.cc +++ b/exporters/otlp/test/otlp_recordable_test.cc @@ -93,18 +93,21 @@ TEST(OtlpRecordable, SetDuration) TEST(OtlpRecordable, SetStatus) { - OtlpRecordable rec; - trace::StatusCode code(trace::StatusCode::kError); + OtlpRecordable rec1; + trace::StatusCode code_error(trace::StatusCode::kError); nostd::string_view description = "For test"; - rec.SetStatus(code, description); + rec1.SetStatus(code_error, description); - EXPECT_EQ(rec.span().status().code(), opentelemetry::proto::trace::v1::Status_StatusCode(code)); - EXPECT_EQ(rec.span().status().message(), description); + EXPECT_EQ(rec1.span().status().code(), + opentelemetry::proto::trace::v1::Status_StatusCode(code_error)); + EXPECT_EQ(rec1.span().status().message(), description); + OtlpRecordable rec2; trace::StatusCode code_ok(trace::StatusCode::kOk); - rec.SetStatus(code, description); - EXPECT_EQ(rec.span().status().code(), opentelemetry::proto::trace::v1::Status_StatusCode(code)); - EXPECT_EQ(rec.span().status().message(), ""); + rec2.SetStatus(code_ok, description); + EXPECT_EQ(rec2.span().status().code(), + opentelemetry::proto::trace::v1::Status_StatusCode(code_ok)); + EXPECT_EQ(rec2.span().status().message(), ""); } TEST(OtlpRecordable, AddEventDefault)