shim, continued

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

@@ -25,7 +25,6 @@
 #include "opentelemetry/trace/span_context.h"
 #include "opentelemetry/trace/span_context_kv_iterable.h"
 #include "opentelemetry/trace/span_startoptions.h"
-#include "opentelemetry/trace/tracer.h"
 #include "opentelemetry/version.h"
 #include "opentracing/propagation.h"
 #include "opentracing/span.h"

opentracing-shim/src/span_context_shim.cc

@@ -3,12 +3,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <functional>
+#include <memory>
 #include <new>
+#include <string>
 
+#include "opentelemetry/baggage/baggage.h"
 #include "opentelemetry/nostd/function_ref.h"
+#include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/opentracingshim/span_context_shim.h"
+#include "opentelemetry/trace/span_context.h"
 #include "opentelemetry/trace/span_id.h"
 #include "opentelemetry/trace/trace_id.h"
+#include "opentelemetry/version.h"
+#include "opentracing/span.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace opentracingshim

opentracing-shim/src/span_shim.cc

@@ -4,17 +4,30 @@
  */
 
 #include <algorithm>
+#include <initializer_list>
+#include <memory>
 #include <mutex>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "opentelemetry/common/attribute_value.h"
+#include "opentelemetry/common/spin_lock_mutex.h"
 #include "opentelemetry/common/timestamp.h"
+#include "opentelemetry/nostd/span.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/opentracingshim/shim_utils.h"
 #include "opentelemetry/opentracingshim/span_context_shim.h"
 #include "opentelemetry/opentracingshim/span_shim.h"
 #include "opentelemetry/semconv/exception_attributes.h"
+#include "opentelemetry/trace/span.h"
 #include "opentelemetry/trace/span_metadata.h"
+#include "opentelemetry/version.h"
 #include "opentracing/ext/tags.h"
+#include "opentracing/span.h"
+#include "opentracing/string_view.h"
+#include "opentracing/util.h"
+#include "opentracing/value.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace opentracingshim

opentracing-shim/src/tracer_shim.cc

@@ -4,14 +4,18 @@
  */
 
 #include <algorithm>
+#include <iosfwd>
+#include <new>
 #include <string>
 #include <system_error>
 #include <utility>
 #include <vector>
 
 #include "opentelemetry/baggage/baggage_context.h"
 #include "opentelemetry/context/propagation/global_propagator.h"
+#include "opentelemetry/context/propagation/text_map_propagator.h"
 #include "opentelemetry/context/runtime_context.h"
+#include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/opentracingshim/propagation.h"
 #include "opentelemetry/opentracingshim/shim_utils.h"
@@ -22,7 +26,14 @@
 #include "opentelemetry/trace/default_span.h"
 #include "opentelemetry/trace/span.h"
 #include "opentelemetry/trace/span_context.h"
+#include "opentelemetry/trace/tracer.h"
+#include "opentelemetry/version.h"
+#include "opentracing/expected/expected.hpp"
 #include "opentracing/ext/tags.h"
+#include "opentracing/propagation.h"
+#include "opentracing/span.h"
+#include "opentracing/string_view.h"
+#include "opentracing/tracer.h"
 #include "opentracing/value.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE

opentracing-shim/test/span_context_shim_test.cc

@@ -3,14 +3,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "opentelemetry/opentracingshim/span_context_shim.h"
+#include <gtest/gtest.h>
+#include <algorithm>
+#include <initializer_list>
+#include <utility>
+#include <vector>
 
 #include "opentelemetry/baggage/baggage.h"
+#include "opentelemetry/nostd/unique_ptr.h"
+#include "opentelemetry/opentracingshim/span_context_shim.h"
 #include "opentelemetry/trace/span_context.h"
-
 #include "opentracing/noop.h"
-
-#include <gtest/gtest.h>
+#include "opentracing/tracer.h"
+#include "opentracing/value.h"
 
 namespace trace_api = opentelemetry::trace;
 namespace baggage   = opentelemetry::baggage;

opentracing-shim/test/tracer_shim_test.cc

@@ -3,16 +3,46 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "shim_mocks.h"
-
+#include <gtest/gtest.h>
+#include <stdint.h>
+#include <iostream>
+#include <string>
+#include <system_error>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+#include "opentelemetry/baggage/baggage.h"
+#include "opentelemetry/common/key_value_iterable.h"
+#include "opentelemetry/context/propagation/text_map_propagator.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/opentracingshim/shim_utils.h"
 #include "opentelemetry/opentracingshim/span_context_shim.h"
 #include "opentelemetry/opentracingshim/span_shim.h"
 #include "opentelemetry/opentracingshim/tracer_shim.h"
-
+#include "opentelemetry/trace/default_span.h"
+#include "opentelemetry/trace/provider.h"
+#include "opentelemetry/trace/span.h"
+#include "opentelemetry/trace/span_context.h"
+#include "opentelemetry/trace/span_context_kv_iterable.h"
+#include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/trace/span_metadata.h"
+#include "opentelemetry/trace/span_startoptions.h"
+#include "opentelemetry/trace/trace_flags.h"
+#include "opentelemetry/trace/trace_id.h"
+#include "opentelemetry/trace/tracer.h"
+#include "opentelemetry/trace/tracer_provider.h"
+#include "opentracing/expected/expected.hpp"
 #include "opentracing/noop.h"
+#include "opentracing/propagation.h"
+#include "opentracing/span.h"
+#include "opentracing/tracer.h"
+#include "opentracing/util.h"
+#include "opentracing/value.h"
 
-#include <gtest/gtest.h>
+#include "shim_mocks.h"
 
 namespace trace_api = opentelemetry::trace;
 namespace nostd     = opentelemetry::nostd;