Skip to content

Commit 2965d0b

Browse files
committed
Fix naming conflict
1 parent 1923f05 commit 2965d0b

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

exporters/jaeger/test/jaeger_recordable_test.cc

+9-9
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ using namespace opentelemetry::exporter::jaeger;
1818

1919
TEST(JaegerSpanRecordable, SetIdentity)
2020
{
21-
Recordable rec;
21+
opentelemetry::exporter::jaeger::Recordable rec;
2222

2323
int64_t trace_id_val[2] = {0x0000000000000000, 0x1000000000000000};
2424
int64_t span_id_val = 0x2000000000000000;
@@ -41,10 +41,10 @@ TEST(JaegerSpanRecordable, SetIdentity)
4141
std::unique_ptr<thrift::Span> span{rec.Span()};
4242

4343
#if JAEGER_IS_LITTLE_ENDIAN == 1
44-
EXPECT_EQ(span->traceIdLow, bswap_64(trace_id_val[1]));
45-
EXPECT_EQ(span->traceIdHigh, bswap_64(trace_id_val[0]));
46-
EXPECT_EQ(span->spanId, bswap_64(span_id_val));
47-
EXPECT_EQ(span->parentSpanId, bswap_64(parent_span_id_val));
44+
EXPECT_EQ(span->traceIdLow, opentelemetry::exporter::jaeger::bswap_64(trace_id_val[1]));
45+
EXPECT_EQ(span->traceIdHigh, opentelemetry::exporter::jaeger::bswap_64(trace_id_val[0]));
46+
EXPECT_EQ(span->spanId, opentelemetry::exporter::jaeger::bswap_64(span_id_val));
47+
EXPECT_EQ(span->parentSpanId, opentelemetry::exporter::jaeger::bswap_64(parent_span_id_val));
4848
#else
4949
EXPECT_EQ(span->traceIdLow, trace_id_val[0]);
5050
EXPECT_EQ(span->traceIdHigh, trace_id_val[1]);
@@ -55,7 +55,7 @@ TEST(JaegerSpanRecordable, SetIdentity)
5555

5656
TEST(JaegerSpanRecordable, SetName)
5757
{
58-
Recordable rec;
58+
opentelemetry::exporter::jaeger::Recordable rec;
5959

6060
nostd::string_view name = "Test Span";
6161
rec.SetName(name);
@@ -67,7 +67,7 @@ TEST(JaegerSpanRecordable, SetName)
6767

6868
TEST(JaegerSpanRecordable, SetStartTime)
6969
{
70-
Recordable rec;
70+
opentelemetry::exporter::jaeger::Recordable rec;
7171

7272
std::chrono::system_clock::time_point start_time = std::chrono::system_clock::now();
7373
opentelemetry::common::SystemTimestamp start_timestamp(start_time);
@@ -82,7 +82,7 @@ TEST(JaegerSpanRecordable, SetStartTime)
8282

8383
TEST(JaegerSpanRecordable, SetDuration)
8484
{
85-
Recordable rec;
85+
opentelemetry::exporter::jaeger::Recordable rec;
8686

8787
opentelemetry::common::SystemTimestamp start_timestamp;
8888

@@ -100,7 +100,7 @@ TEST(JaegerSpanRecordable, SetDuration)
100100

101101
TEST(JaegerSpanRecordable, SetStatus)
102102
{
103-
Recordable rec;
103+
opentelemetry::exporter::jaeger::Recordable rec;
104104

105105
const char *error_description = "Error test";
106106
rec.SetStatus(trace::StatusCode::kError, error_description);

0 commit comments

Comments
 (0)