Fix SetIds by not converting to hex

open-telemetry · Jun 24, 2020 · b85b49a · b85b49a
1 parent 249b308
commit b85b49a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 32 deletions.
diff --git 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
@@ -10,40 +10,18 @@ TEST(Recordable, SetIds)
 {
     Recordable rec;
 
-    // trace::TraceId trace_id();
-    // trace::SpanId span_id();
-    // trace::SpanId parent_span_id();
-
-    // nostd::span<const uint8_t, 16> span_trace_id(0, 16);
-    // nostd::span<const uint8_t, 8> span_span_id(0, 8);
-    // nostd::span<const uint8_t, 8> 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)