Cleanup

open-telemetry · May 18, 2024 · 5291e93 · 5291e93
1 parent cb4beee
commit 5291e93
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 13 deletions.
diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml
@@ -36,7 +36,7 @@ jobs:
           TOPDIR=`pwd`
           mkdir build && cd build
           CC="clang" CXX="clang++" cmake \
-            -DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="include-what-you-use;-w;-Xiwyu;--mapping_file=${TOPDIR}/.iwyu.imp;--verbose=1" \
+            -DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="include-what-you-use;-w;-Xiwyu;--mapping_file=${TOPDIR}/.iwyu.imp;" \
             -DBUILD_TESTING=OFF \
             -DBUILD_W3CTRACECONTEXT_TEST=OFF \
             ..

diff --git a/api/include/opentelemetry/version.h b/api/include/opentelemetry/version.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "opentelemetry/common/macros.h" // IWYU pragma: export
+#include "opentelemetry/common/macros.h"  // IWYU pragma: export
 #include "opentelemetry/detail/preprocessor.h"
 
 #ifndef OPENTELEMETRY_ABI_VERSION_NO

diff --git a/sdk/include/opentelemetry/sdk/common/base64.h b/sdk/include/opentelemetry/sdk/common/base64.h
@@ -5,7 +5,6 @@
 
 #include <string>
 
-#include "opentelemetry/common/macros.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/version.h"
 

diff --git a/sdk/include/opentelemetry/sdk/common/global_log_handler.h b/sdk/include/opentelemetry/sdk/common/global_log_handler.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <sstream>
+#include <sstream>  // IWYU pragma: keep
 #include <string>
 #include <utility>
 

diff --git a/sdk/include/opentelemetry/sdk/trace/tracer.h b/sdk/include/opentelemetry/sdk/trace/tracer.h
@@ -7,7 +7,6 @@
 #include <memory>
 
 #include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/macros.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/nostd/unique_ptr.h"

diff --git a/sdk/include/opentelemetry/sdk/trace/tracer_provider.h b/sdk/include/opentelemetry/sdk/trace/tracer_provider.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <chrono>
 #include <memory>
 #include <mutex>
 #include <vector>

diff --git a/sdk/src/common/env_variables.cc b/sdk/src/common/env_variables.cc
@@ -10,8 +10,11 @@
 #  include <strings.h>
 #endif
 
+#include <cstdlib>
 #include <memory>
+#include <ostream>
 
+#include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/sdk/common/global_log_handler.h"
 #include "opentelemetry/version.h"
 

diff --git a/sdk/src/resource/resource.cc b/sdk/src/resource/resource.cc
@@ -1,9 +1,9 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <string>
 #include <unordered_map>
 #include <utility>
-#include <string>
 
 #include "opentelemetry/nostd/variant.h"
 #include "opentelemetry/sdk/resource/resource.h"

diff --git a/sdk/src/trace/span.cc b/sdk/src/trace/span.cc
@@ -1,14 +1,15 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "src/trace/span.h"
-#include "src/common/random.h"
+#include <chrono>
+#include <utility>
 
-#include "opentelemetry/context/runtime_context.h"
+#include "opentelemetry/sdk/trace/processor.h"
 #include "opentelemetry/sdk/trace/recordable.h"
+#include "opentelemetry/trace/span_id.h"
 #include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_flags.h"
 #include "opentelemetry/version.h"
+#include "src/trace/span.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk

diff --git a/sdk/src/trace/tracer_context.cc b/sdk/src/trace/tracer_context.cc
@@ -1,8 +1,10 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/sdk/trace/tracer_context.h"
+#include <utility>
+
 #include "opentelemetry/sdk/trace/multi_span_processor.h"
+#include "opentelemetry/sdk/trace/tracer_context.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk

diff --git a/sdk/src/trace/tracer_context_factory.cc b/sdk/src/trace/tracer_context_factory.cc
@@ -1,11 +1,14 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/sdk/trace/tracer_context_factory.h"
+#include <utility>
+
 #include "opentelemetry/sdk/trace/multi_span_processor.h"
 #include "opentelemetry/sdk/trace/random_id_generator_factory.h"
 #include "opentelemetry/sdk/trace/samplers/always_on_factory.h"
 #include "opentelemetry/sdk/trace/tracer_context.h"
+#include "opentelemetry/sdk/trace/tracer_context_factory.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk

diff --git a/sdk/src/trace/tracer_provider_factory.cc b/sdk/src/trace/tracer_provider_factory.cc
@@ -1,12 +1,16 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
+#include <utility>
+
 #include "opentelemetry/sdk/trace/processor.h"
 #include "opentelemetry/sdk/trace/random_id_generator_factory.h"
 #include "opentelemetry/sdk/trace/samplers/always_on_factory.h"
 #include "opentelemetry/sdk/trace/tracer_context.h"
 #include "opentelemetry/sdk/trace/tracer_provider.h"
+#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
+#include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/version.h"
 
 namespace trace_api = opentelemetry::trace;
 namespace trace_sdk = opentelemetry::sdk::trace;