Convert null to empty string for tracer name (#712)

open-telemetry · Apr 29, 2021 · fc7a325 · fc7a325
1 parent a987f0a
commit fc7a325
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/sdk/src/trace/tracer_provider.cc b/sdk/src/trace/tracer_provider.cc
@@ -33,6 +33,10 @@ nostd::shared_ptr<opentelemetry::trace::Tracer> TracerProvider::GetTracer(
     nostd::string_view library_name,
     nostd::string_view library_version) noexcept
 {
+  if (library_name.data() == nullptr)
+  {
+    library_name = "";
+  }
   // if (library_name == "") {
   //   // TODO: log invalid library_name.
   // }

diff --git a/sdk/test/trace/tracer_provider_test.cc b/sdk/test/trace/tracer_provider_test.cc
@@ -21,13 +21,16 @@ TEST(TracerProvider, GetTracer)
   auto t1 = tp1.GetTracer("test");
   auto t2 = tp1.GetTracer("test");
   auto t3 = tp1.GetTracer("different", "1.0.0");
+  auto t4 = tp1.GetTracer("");
+  auto t5 = tp1.GetTracer(opentelemetry::nostd::string_view{});
   ASSERT_NE(nullptr, t1);
   ASSERT_NE(nullptr, t2);
   ASSERT_NE(nullptr, t3);
 
   // Should return the same instance each time.
   ASSERT_EQ(t1, t2);
   ASSERT_NE(t1, t3);
+  ASSERT_EQ(t4, t5);
 
   // Should be an sdk::trace::Tracer with the processor attached.
   auto sdkTracer1 = dynamic_cast<Tracer *>(t1.get());