Disable by default

CMakeLists.txt

@@ -170,7 +170,7 @@ option(BUILD_W3CTRACECONTEXT_TEST "Whether to build w3c trace context" OFF)
 
 option(OTELCPP_MAINTAINER_MODE "Build in maintainer mode (-Wall -Werror)" OFF)
 
-option(WITH_OPENTRACING "Whether to include the Opentracing shim" ON)
+option(WITH_OPENTRACING "Whether to include the Opentracing shim" OFF)
 
 set(OTELCPP_PROTO_PATH
     ""

opentracing-shim/include/opentelemetry/opentracingshim/shim_utils.h

@@ -113,15 +113,15 @@ class LinksIterable final : public opentelemetry::trace::SpanContextKeyValueIter
 public:
   using RefsList = std::vector<std::pair<opentracing::SpanReferenceType, const opentracing::SpanContext*>>;
   explicit LinksIterable(const RefsList& refs) noexcept : refs_(refs) {}
-  
-  bool ForEachKeyValue(nostd::function_ref<bool(opentelemetry::trace::SpanContext, 
+
+  bool ForEachKeyValue(nostd::function_ref<bool(opentelemetry::trace::SpanContext,
                                                 const opentelemetry::common::KeyValueIterable&)>
                                                 callback) const noexcept override
   {
     using opentracing::SpanReferenceType;
     using namespace opentelemetry::trace::SemanticConventions;
     using LinksList = std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>;
-    
+
     for (const auto& entry : refs_)
     {
       auto context_shim = dynamic_cast<const SpanContextShim*>(entry.second);
@@ -138,7 +138,7 @@ class LinksIterable final : public opentelemetry::trace::SpanContextKeyValueIter
 
       if (context_shim && !span_kind.empty())
       {
-        if (!callback(context_shim->context(), 
+        if (!callback(context_shim->context(),
                       opentelemetry::common::KeyValueIterableView<LinksList>(
                         {{ kOpentracingRefType, span_kind }})))
           return false;

opentracing-shim/test/shim_mocks.h

@@ -68,7 +68,7 @@ struct MockSpan final : public trace_api::Span
 
   void AddEvent(nostd::string_view name) noexcept override {}
 
-  void SetStatus(trace_api::StatusCode code, nostd::string_view description) noexcept override 
+  void SetStatus(trace_api::StatusCode code, nostd::string_view description) noexcept override
   {
     status_ = {code, description.data()};
   }

opentracing-shim/test/shim_utils_test.cc

@@ -103,7 +103,7 @@ TEST(ShimUtilsTest, MakeOptionsShim_EmptyRefs)
   auto span_context_shim = nostd::shared_ptr<shim::SpanContextShim>(new shim::SpanContextShim(
     trace_api::SpanContext::GetInvalid(), baggage::Baggage::GetDefault()));
   auto span_context = static_cast<opentracing::SpanContext*>(span_context_shim.get());
-  
+
   opentracing::StartSpanOptions options;
   options.start_system_timestamp = opentracing::SystemTime::time_point::clock::now();
   options.start_steady_timestamp = opentracing::SteadyTime::time_point::clock::now();
@@ -119,7 +119,7 @@ TEST(ShimUtilsTest, MakeOptionsShim_InvalidSpanContext)
   auto span_context_shim = nostd::shared_ptr<shim::SpanContextShim>(new shim::SpanContextShim(
     trace_api::SpanContext::GetInvalid(), baggage::Baggage::GetDefault()));
   auto span_context = static_cast<opentracing::SpanContext*>(span_context_shim.get());
-  
+
   opentracing::StartSpanOptions options;
   options.start_system_timestamp = opentracing::SystemTime::time_point::clock::now();
   options.start_steady_timestamp = opentracing::SteadyTime::time_point::clock::now();
@@ -136,7 +136,7 @@ TEST(ShimUtilsTest, MakeOptionsShim_FirstChildOf)
   auto span_context_shim = nostd::shared_ptr<shim::SpanContextShim>(new shim::SpanContextShim(
     trace_api::SpanContext::GetInvalid(), baggage::Baggage::GetDefault()));
   auto span_context = static_cast<opentracing::SpanContext*>(span_context_shim.get());
-  
+
   opentracing::StartSpanOptions options;
   options.start_system_timestamp = opentracing::SystemTime::time_point::clock::now();
   options.start_steady_timestamp = opentracing::SteadyTime::time_point::clock::now();
@@ -157,7 +157,7 @@ TEST(ShimUtilsTest, MakeOptionsShim_FirstInList)
   auto span_context_shim = nostd::shared_ptr<shim::SpanContextShim>(new shim::SpanContextShim(
     trace_api::SpanContext::GetInvalid(), baggage::Baggage::GetDefault()));
   auto span_context = static_cast<opentracing::SpanContext*>(span_context_shim.get());
-  
+
   opentracing::StartSpanOptions options;
   options.start_system_timestamp = opentracing::SystemTime::time_point::clock::now();
   options.start_steady_timestamp = opentracing::SteadyTime::time_point::clock::now();
@@ -237,11 +237,11 @@ TEST(ShimUtilsTest, MakeBaggage_EmptyRefs)
 TEST(ShimUtilsTest, MakeBaggage_NonEmptyRefs)
 {
   auto span_context_shim1 = nostd::shared_ptr<shim::SpanContextShim>(new shim::SpanContextShim(
-    trace_api::SpanContext::GetInvalid(), 
+    trace_api::SpanContext::GetInvalid(),
     baggage::Baggage::GetDefault()->Set("test", "foo")->Set("test1", "hello")));
   auto span_context1 = static_cast<opentracing::SpanContext*>(span_context_shim1.get());
   auto span_context_shim2 = nostd::shared_ptr<shim::SpanContextShim>(new shim::SpanContextShim(
-    trace_api::SpanContext::GetInvalid(), 
+    trace_api::SpanContext::GetInvalid(),
     baggage::Baggage::GetDefault()->Set("test", "bar")->Set("test2", "world")));
   auto span_context2 = static_cast<opentracing::SpanContext*>(span_context_shim2.get());
 

opentracing-shim/test/span_context_shim_test.cc

@@ -76,7 +76,7 @@ TEST_F(SpanContextShimTest, ForeachBaggageItem)
   ASSERT_EQ(concatenated.size(), 3);
   ASSERT_EQ(concatenated[0], "foo:bar");
   ASSERT_EQ(concatenated[1], "bar:baz");
-  ASSERT_EQ(concatenated[2], "baz:foo"); 
+  ASSERT_EQ(concatenated[2], "baz:foo");
 }
 
 TEST_F(SpanContextShimTest, Clone)

opentracing-shim/test/span_shim_test.cc

@@ -120,7 +120,7 @@ TEST_F(SpanShimTest, SetBaggageItem_MultiThreaded)
   std::vector<std::string> values;
   int thread_count = 100;
 
-  for (int index = 0; index < thread_count; ++index) 
+  for (int index = 0; index < thread_count; ++index)
   {
     keys.emplace_back("key-" + std::to_string(index));
     values.emplace_back("value-" + std::to_string(index));
@@ -132,7 +132,7 @@ TEST_F(SpanShimTest, SetBaggageItem_MultiThreaded)
     thread.join();
   }
 
-  for (int index = 0; index < thread_count; ++index) 
+  for (int index = 0; index < thread_count; ++index)
   {
     ASSERT_EQ(span_shim.BaggageItem(keys[index]), values[index]);
   }

opentracing-shim/test/tracer_shim_test.cc

@@ -71,7 +71,7 @@ TEST_F(TracerShimTest, SpanParentChildRelationship)
   ASSERT_NE(span_shim1, span_shim2);
   ASSERT_EQ(span_shim1->context().ToSpanID(), span_shim2->context().ToSpanID());
   ASSERT_EQ(span_shim1->context().ToTraceID(), span_shim2->context().ToTraceID());
-  
+
   auto span_context_shim1 = dynamic_cast<const shim::SpanContextShim*>(&span_shim1->context());
   auto span_context_shim2 = dynamic_cast<const shim::SpanContextShim*>(&span_shim2->context());
   ASSERT_TRUE(span_context_shim1 != nullptr);