[Code Health] include-what-you-use cleanup, part 9

.github/workflows/iwyu.yml

@@ -18,11 +18,11 @@ jobs:
       matrix:
         include:
           - cmake_options: all-options-abiv1
-            warning_limit: 5
+            warning_limit: 0
           - cmake_options: all-options-abiv1-preview
-            warning_limit: 28
+            warning_limit: 0
           - cmake_options: all-options-abiv2-preview
-            warning_limit: 48
+            warning_limit: 0
 
     steps:
       - name: Harden the runner (Audit all outbound calls)

api/test/logs/logger_test.cc

@@ -11,8 +11,8 @@
 #include "opentelemetry/common/key_value_iterable.h"
 #include "opentelemetry/common/key_value_iterable_view.h"
 #include "opentelemetry/logs/event_id.h"
-#include "opentelemetry/logs/event_logger.h"
-#include "opentelemetry/logs/event_logger_provider.h"
+#include "opentelemetry/logs/event_logger.h"           // IWYU pragma: keep
+#include "opentelemetry/logs/event_logger_provider.h"  // IWYU pragma: keep
 #include "opentelemetry/logs/log_record.h"
 #include "opentelemetry/logs/logger.h"
 #include "opentelemetry/logs/logger_provider.h"

api/test/logs/provider_test.cc

@@ -5,9 +5,9 @@
 #include <string>
 
 #include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/logs/event_logger.h"  // IWYU pragma: keep
-#include "opentelemetry/logs/event_logger_provider.h"
-#include "opentelemetry/logs/logger.h"  // IWYU pragma: keep
+#include "opentelemetry/logs/event_logger.h"           // IWYU pragma: keep
+#include "opentelemetry/logs/event_logger_provider.h"  // IWYU pragma: keep
+#include "opentelemetry/logs/logger.h"                 // IWYU pragma: keep
 #include "opentelemetry/logs/logger_provider.h"
 #include "opentelemetry/logs/provider.h"
 #include "opentelemetry/nostd/shared_ptr.h"

api/test/singleton/singleton_test.cc

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <gtest/gtest.h>
-#include <stdint.h>
+#include <stdint.h>  // IWYU pragma: keep
 
 #ifdef _WIN32
 #  include <windows.h>

api/test/trace/provider_test.cc

@@ -8,6 +8,10 @@
 #include "opentelemetry/trace/provider.h"
 #include "opentelemetry/trace/tracer_provider.h"
 
+#if OPENTELEMETRY_ABI_VERSION_NO >= 2
+#  include "opentelemetry/common/key_value_iterable.h"
+#endif
+
 using opentelemetry::trace::Provider;
 using opentelemetry::trace::Tracer;
 using opentelemetry::trace::TracerProvider;

examples/otlp/http_instrumented_main.cc

@@ -55,6 +55,11 @@
 #  include "metrics_foo_library/foo_library.h"
 #endif
 
+#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
+#  include <thread>
+#  include "opentelemetry/sdk/common/thread_instrumentation.h"
+#endif
+
 namespace
 {
 

examples/plugin/plugin/tracer.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <stdint.h>  // IWYU pragma: keep
 
 #include "opentelemetry/common/key_value_iterable.h"
 #include "opentelemetry/nostd/shared_ptr.h"

exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h

@@ -3,18 +3,24 @@
 
 #pragma once
 
-#include "nlohmann/json.hpp"
-#include "opentelemetry/ext/http/client/http_client_factory.h"
+#include <atomic>
+#include <chrono>
+#include <map>
+#include <string>
+
+#include "opentelemetry/ext/http/client/http_client.h"
 #include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/sdk/common/exporter_utils.h"
 #include "opentelemetry/sdk/logs/exporter.h"
 #include "opentelemetry/sdk/logs/recordable.h"
+#include "opentelemetry/version.h"
 
-#include <time.h>
-#include <atomic>
-#include <condition_variable>
-#include <cstddef>
-#include <iostream>
-#include <mutex>
+#ifdef ENABLE_ASYNC_EXPORT
+#  include <condition_variable>
+#  include <cstddef>
+#  include <mutex>
+#endif
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter

exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_recordable.h

@@ -3,15 +3,21 @@
 
 #pragma once
 
-#include <map>
-#include <sstream>
-#include <type_traits>
-#include <unordered_map>
-
+#include <stdint.h>
+#include <string>
 #include "nlohmann/json.hpp"
-#include "opentelemetry/common/macros.h"
+
+#include "opentelemetry/common/attribute_value.h"
+#include "opentelemetry/common/timestamp.h"
+#include "opentelemetry/logs/severity.h"
+#include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/sdk/common/attribute_utils.h"
+#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
 #include "opentelemetry/sdk/logs/recordable.h"
+#include "opentelemetry/sdk/resource/resource.h"
+#include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/trace/trace_flags.h"
+#include "opentelemetry/trace/trace_id.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE

exporters/elasticsearch/src/es_log_record_exporter.cc

@@ -1,13 +1,37 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include <sstream>  // std::stringstream
-
+#include <stdint.h>
+#include <atomic>
+#include <chrono>
 #include <condition_variable>
+#include <map>
+#include <memory>  // IWYU pragma: keep
 #include <mutex>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "opentelemetry/exporters/elasticsearch/es_log_record_exporter.h"
 #include "opentelemetry/exporters/elasticsearch/es_log_recordable.h"
-#include "opentelemetry/sdk_config.h"
+#include "opentelemetry/ext/http/client/http_client.h"
+#include "opentelemetry/ext/http/client/http_client_factory.h"
+#include "opentelemetry/nostd/function_ref.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/sdk/common/exporter_utils.h"
+#include "opentelemetry/sdk/common/global_log_handler.h"
+#include "opentelemetry/sdk/logs/recordable.h"
+#include "opentelemetry/version.h"
+
+#ifdef ENABLE_ASYNC_EXPORT
+#  include <cstddef>
+#  include <functional>
+#  include <ratio>
+#  include "opentelemetry/common/timestamp.h"
+#  include "opentelemetry/nostd/shared_ptr.h"
+#endif
 
 namespace nostd       = opentelemetry::nostd;
 namespace sdklogs     = opentelemetry::sdk::logs;

exporters/elasticsearch/src/es_log_recordable.cc

@@ -1,26 +1,34 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include <opentelemetry/version.h>
+#include "opentelemetry/exporters/elasticsearch/es_log_recordable.h"
+#include "opentelemetry/logs/severity.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/variant.h"
+#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
+#include "opentelemetry/sdk/logs/recordable.h"
+#include "opentelemetry/sdk/resource/resource.h"
+#include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/trace/trace_flags.h"
+#include "opentelemetry/trace/trace_id.h"
+#include "opentelemetry/version.h"
 
+#include <stdint.h>
 #include <chrono>
+#include <cstdint>
+#include <cstdio>
 #include <ctime>
 #include <nlohmann/json.hpp>
 #include <string>
+#include <type_traits>
+#include <unordered_map>
+#include <utility>
 
 #if defined(__cpp_lib_format)
 #  include <format>
 #endif
 
-#include "opentelemetry/exporters/elasticsearch/es_log_recordable.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-
 namespace nlohmann
 {
 template <class T>

exporters/elasticsearch/test/es_log_record_exporter_test.cc

@@ -12,8 +12,13 @@
 #include "opentelemetry/sdk/resource/resource.h"
 
 #include <gtest/gtest.h>
+#include <array>
 #include <chrono>
+#include <cstddef>
+#include <cstdint>
 #include <string>
+#include <utility>
+#include "nlohmann/json.hpp"
 
 namespace sdklogs       = opentelemetry::sdk::logs;
 namespace logs_api      = opentelemetry::logs;

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client.h

@@ -22,6 +22,8 @@
 // clang-format on
 
 #ifdef ENABLE_ASYNC_EXPORT
+#  include <functional>
+
 #  include "opentelemetry/sdk/common/exporter_utils.h"
 #endif /* ENABLE_ASYNC_EXPORT */
 

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h

@@ -11,6 +11,10 @@
 #include "opentelemetry/exporters/otlp/otlp_http.h"
 #include "opentelemetry/version.h"
 
+#ifdef ENABLE_ASYNC_EXPORT
+#  include <cstddef>
+#endif
+
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
 {

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h

@@ -11,6 +11,10 @@
 #include "opentelemetry/exporters/otlp/otlp_http.h"
 #include "opentelemetry/version.h"
 
+#ifdef ENABLE_ASYNC_EXPORT
+#  include <cstddef>
+#endif
+
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
 {

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h

@@ -12,6 +12,10 @@
 #include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
 #include "opentelemetry/version.h"
 
+#ifdef ENABLE_ASYNC_EXPORT
+#  include <cstddef>
+#endif
+
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
 {

exporters/otlp/src/otlp_grpc_client.cc

@@ -29,25 +29,18 @@
 // clang-format on
 
 #ifdef ENABLE_ASYNC_EXPORT
+#  include <google/protobuf/arena.h>
+#  include <algorithm>
 #  include <condition_variable>
 #  include <cstdio>
 #  include <mutex>
-#  include <thread>
+#  include <ratio>
 #  include <unordered_set>
 
 #  include "opentelemetry/common/timestamp.h"
-#  include "opentelemetry/nostd/function_ref.h"
 #  include "opentelemetry/nostd/string_view.h"
 #endif /* ENABLE_ASYNC_EXPORT */
 
-namespace google
-{
-namespace protobuf
-{
-class Arena;
-}
-}  // namespace google
-
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
 {

exporters/otlp/src/otlp_grpc_exporter.cc

@@ -32,6 +32,10 @@
 #include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
 // clang-format on
 
+#ifdef ENABLE_ASYNC_EXPORT
+#  include <functional>
+#endif
+
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
 {

exporters/otlp/src/otlp_grpc_log_record_exporter.cc

@@ -31,6 +31,10 @@
 #include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
 // clang-format on
 
+#ifdef ENABLE_ASYNC_EXPORT
+#  include <functional>
+#endif
+
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
 {

exporters/otlp/src/otlp_grpc_metric_exporter.cc

@@ -31,6 +31,10 @@
 #include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
 // clang-format on
 
+#ifdef ENABLE_ASYNC_EXPORT
+#  include <functional>
+#endif
+
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
 {

exporters/otlp/src/otlp_http_exporter.cc

@@ -31,6 +31,10 @@
 #include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
 // clang-format on
 
+#ifdef ENABLE_ASYNC_EXPORT
+#  include <functional>
+#endif
+
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
 {

exporters/otlp/src/otlp_http_log_record_exporter.cc

@@ -31,6 +31,10 @@
 #include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
 // clang-format on
 
+#ifdef ENABLE_ASYNC_EXPORT
+#  include <functional>
+#endif
+
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
 {

exporters/otlp/src/otlp_http_metric_exporter.cc

@@ -31,6 +31,10 @@
 #include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
 // clang-format on
 
+#ifdef ENABLE_ASYNC_EXPORT
+#  include <functional>
+#endif
+
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
 {

exporters/otlp/test/otlp_file_exporter_test.cc

@@ -43,6 +43,10 @@
 #include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
 // clang-format on
 
+#if OPENTELEMETRY_ABI_VERSION_NO >= 2
+#  include "opentelemetry/common/attribute_value.h"
+#endif
+
 using namespace testing;
 
 OPENTELEMETRY_BEGIN_NAMESPACE