From 6100a6b1151a7621cf4af3537abafc1c50aaccf2 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Sat, 21 Jun 2025 20:48:09 +0200 Subject: [PATCH 1/8] [Code Health] include-what-you-use cleanup, part 9 --- .../elasticsearch/es_log_record_exporter.h | 17 +++++----- .../src/es_log_record_exporter.cc | 22 +++++++++++-- .../elasticsearch/src/es_log_recordable.cc | 33 +++++++++++++------ .../exporters/otlp/otlp_grpc_client.h | 1 + ext/src/http/client/curl/http_client_curl.cc | 3 -- ext/test/http/curl_http_test.cc | 1 - .../metrics/exemplar/no_exemplar_reservoir.h | 15 +++------ .../sdk/metrics/exemplar/reservoir_cell.h | 14 ++++---- sdk/src/logs/batch_log_record_processor.cc | 4 +++ sdk/src/metrics/exemplar/reservoir.cc | 4 +++ .../periodic_exporting_metric_reader.cc | 4 +++ sdk/src/metrics/meter.cc | 1 + sdk/src/metrics/meter_context.cc | 4 +++ sdk/src/metrics/meter_provider.cc | 4 +++ sdk/src/trace/batch_span_processor.cc | 4 +++ ...istogram_bucket_exemplar_reservoir_test.cc | 12 ++++++- 16 files changed, 100 insertions(+), 43 deletions(-) diff --git a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h index a8b23dc088..02b3a5aec2 100644 --- a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h +++ b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h @@ -3,18 +3,19 @@ #pragma once +#include +#include +#include +#include #include "nlohmann/json.hpp" -#include "opentelemetry/ext/http/client/http_client_factory.h" + +#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 -#include -#include -#include -#include -#include +#include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE namespace exporter diff --git a/exporters/elasticsearch/src/es_log_record_exporter.cc b/exporters/elasticsearch/src/es_log_record_exporter.cc index d20453b9d2..1f0fe7295e 100644 --- a/exporters/elasticsearch/src/es_log_record_exporter.cc +++ b/exporters/elasticsearch/src/es_log_record_exporter.cc @@ -1,13 +1,29 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -#include // std::stringstream - +#include +#include +#include #include +#include +#include #include +#include +#include +#include +#include + #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" namespace nostd = opentelemetry::nostd; namespace sdklogs = opentelemetry::sdk::logs; diff --git a/exporters/elasticsearch/src/es_log_recordable.cc b/exporters/elasticsearch/src/es_log_recordable.cc index 1b6fe3f0e3..54f1bada5d 100644 --- a/exporters/elasticsearch/src/es_log_recordable.cc +++ b/exporters/elasticsearch/src/es_log_recordable.cc @@ -1,26 +1,39 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -#include +#include "opentelemetry/exporters/elasticsearch/es_log_recordable.h" +#include "opentelemetry/ext/http/client/http_client.h" +#include "opentelemetry/ext/http/client/http_client_factory.h" +#include "opentelemetry/logs/severity.h" +#include "opentelemetry/nostd/function_ref.h" +#include "opentelemetry/nostd/span.h" +#include "opentelemetry/nostd/string_view.h" +#include "opentelemetry/nostd/variant.h" +#include "opentelemetry/sdk/common/exporter_utils.h" +#include "opentelemetry/sdk/common/global_log_handler.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 +#include #include #include +#include +#include #include #include +#include +#include #if defined(__cpp_lib_format) # include #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 diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client.h index 20f10a9711..65b7da4436 100644 --- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client.h +++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client.h @@ -7,6 +7,7 @@ #include #include #include +#include #include #include diff --git a/ext/src/http/client/curl/http_client_curl.cc b/ext/src/http/client/curl/http_client_curl.cc index 597f0c7a28..b4f7c946c2 100644 --- a/ext/src/http/client/curl/http_client_curl.cc +++ b/ext/src/http/client/curl/http_client_curl.cc @@ -3,8 +3,6 @@ #include #include -#include -#include #include #include #include @@ -25,7 +23,6 @@ #include "opentelemetry/ext/http/common/url_parser.h" #include "opentelemetry/nostd/shared_ptr.h" #include "opentelemetry/nostd/string_view.h" -#include "opentelemetry/nostd/type_traits.h" #include "opentelemetry/sdk/common/thread_instrumentation.h" #include "opentelemetry/version.h" diff --git a/ext/test/http/curl_http_test.cc b/ext/test/http/curl_http_test.cc index c0e8749aa7..0582f6c156 100644 --- a/ext/test/http/curl_http_test.cc +++ b/ext/test/http/curl_http_test.cc @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/sdk/include/opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h b/sdk/include/opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h index 66486f0cd4..f41e78fb59 100644 --- a/sdk/include/opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h +++ b/sdk/include/opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h @@ -5,29 +5,22 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW +# include # include # include +# include "opentelemetry/common/timestamp.h" +# include "opentelemetry/context/context.h" +# include "opentelemetry/sdk/metrics/data/exemplar_data.h" # include "opentelemetry/sdk/metrics/exemplar/filter_type.h" # include "opentelemetry/sdk/metrics/exemplar/reservoir.h" # include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE -namespace common -{ -class SystemTimestamp; -} // namespace common - -namespace context -{ -class Context; -} // namespace context - namespace sdk { namespace metrics { -class ExemplarData; class NoExemplarReservoir final : public ExemplarReservoir { diff --git a/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell.h b/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell.h index cc315b7131..0ed8aab251 100644 --- a/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell.h +++ b/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell.h @@ -5,22 +5,24 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -# include +# include +# include +# include # include +# include # include "opentelemetry/common/timestamp.h" +# include "opentelemetry/context/context.h" # include "opentelemetry/nostd/variant.h" # include "opentelemetry/sdk/metrics/data/exemplar_data.h" +# include "opentelemetry/sdk/metrics/data/metric_data.h" # include "opentelemetry/sdk/metrics/exemplar/filter_type.h" # include "opentelemetry/trace/context.h" +# include "opentelemetry/trace/span.h" +# include "opentelemetry/trace/span_context.h" # include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE -namespace context -{ -class Context; -} // namespace context - namespace sdk { namespace metrics diff --git a/sdk/src/logs/batch_log_record_processor.cc b/sdk/src/logs/batch_log_record_processor.cc index c65fba76c1..c07a6992fb 100644 --- a/sdk/src/logs/batch_log_record_processor.cc +++ b/sdk/src/logs/batch_log_record_processor.cc @@ -25,6 +25,10 @@ #include "opentelemetry/sdk/logs/recordable.h" #include "opentelemetry/version.h" +#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW +# include "opentelemetry/sdk/common/thread_instrumentation.h" +#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */ + using opentelemetry::sdk::common::AtomicUniquePtr; using opentelemetry::sdk::common::CircularBufferRange; diff --git a/sdk/src/metrics/exemplar/reservoir.cc b/sdk/src/metrics/exemplar/reservoir.cc index 264a000828..2d8be1ec43 100644 --- a/sdk/src/metrics/exemplar/reservoir.cc +++ b/sdk/src/metrics/exemplar/reservoir.cc @@ -3,13 +3,17 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW +# include # include +# include "opentelemetry/nostd/shared_ptr.h" # include "opentelemetry/sdk/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir.h" # include "opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h" # include "opentelemetry/sdk/metrics/exemplar/reservoir.h" # include "opentelemetry/sdk/metrics/exemplar/reservoir_cell.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir_cell_selector.h" # include "opentelemetry/sdk/metrics/exemplar/simple_fixed_size_exemplar_reservoir.h" +# include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE namespace sdk diff --git a/sdk/src/metrics/export/periodic_exporting_metric_reader.cc b/sdk/src/metrics/export/periodic_exporting_metric_reader.cc index 0fbde50bc8..099b9ac122 100644 --- a/sdk/src/metrics/export/periodic_exporting_metric_reader.cc +++ b/sdk/src/metrics/export/periodic_exporting_metric_reader.cc @@ -23,6 +23,10 @@ #include "opentelemetry/sdk/metrics/push_metric_exporter.h" #include "opentelemetry/version.h" +#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW +# include "opentelemetry/sdk/common/thread_instrumentation.h" +#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */ + #if OPENTELEMETRY_HAVE_EXCEPTIONS # include #endif diff --git a/sdk/src/metrics/meter.cc b/sdk/src/metrics/meter.cc index 210b27793a..d7974d7590 100644 --- a/sdk/src/metrics/meter.cc +++ b/sdk/src/metrics/meter.cc @@ -40,6 +40,7 @@ #include "opentelemetry/version.h" #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" # include "opentelemetry/sdk/metrics/exemplar/reservoir_utils.h" #endif diff --git a/sdk/src/metrics/meter_context.cc b/sdk/src/metrics/meter_context.cc index 8cf13c5232..863ef21839 100644 --- a/sdk/src/metrics/meter_context.cc +++ b/sdk/src/metrics/meter_context.cc @@ -30,6 +30,10 @@ #include "opentelemetry/sdk/resource/resource.h" #include "opentelemetry/version.h" +#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +#endif // ENABLE_METRICS_EXEMPLAR_PREVIEW + OPENTELEMETRY_BEGIN_NAMESPACE namespace sdk { diff --git a/sdk/src/metrics/meter_provider.cc b/sdk/src/metrics/meter_provider.cc index 57a2fbaced..92a6b033bc 100644 --- a/sdk/src/metrics/meter_provider.cc +++ b/sdk/src/metrics/meter_provider.cc @@ -26,6 +26,10 @@ #include "opentelemetry/sdk/resource/resource.h" #include "opentelemetry/version.h" +#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +#endif // ENABLE_METRICS_EXEMPLAR_PREVIEW + OPENTELEMETRY_BEGIN_NAMESPACE namespace sdk { diff --git a/sdk/src/trace/batch_span_processor.cc b/sdk/src/trace/batch_span_processor.cc index 3c32043d07..5ec2376656 100644 --- a/sdk/src/trace/batch_span_processor.cc +++ b/sdk/src/trace/batch_span_processor.cc @@ -27,6 +27,10 @@ #include "opentelemetry/sdk/trace/recordable.h" #include "opentelemetry/version.h" +#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW +# include "opentelemetry/sdk/common/thread_instrumentation.h" +#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */ + using opentelemetry::sdk::common::AtomicUniquePtr; using opentelemetry::sdk::common::CircularBufferRange; using opentelemetry::trace::SpanContext; diff --git a/sdk/test/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir_test.cc b/sdk/test/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir_test.cc index 487a0414a0..26107fd17f 100644 --- a/sdk/test/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir_test.cc +++ b/sdk/test/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir_test.cc @@ -3,10 +3,20 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW +# include +# include +# include +# include +# include # include -# include +# include "opentelemetry/common/timestamp.h" +# include "opentelemetry/context/context.h" # include "opentelemetry/sdk/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir_cell.h" +# include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE namespace sdk From a6103969e0f5daecfed2cd36e0def6cbcd60762e Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Sat, 21 Jun 2025 21:35:13 +0200 Subject: [PATCH 2/8] cleanup --- .../elasticsearch/es_log_record_exporter.h | 1 - .../elasticsearch/es_log_recordable.h | 18 ++++++++++++------ .../exporters/otlp/otlp_grpc_client.h | 1 - exporters/otlp/src/otlp_grpc_client.cc | 13 +++---------- exporters/otlp/src/otlp_grpc_exporter.cc | 1 + .../otlp/src/otlp_grpc_log_record_exporter.cc | 1 + .../otlp/src/otlp_grpc_metric_exporter.cc | 1 + sdk/test/metrics/cardinality_limit_test.cc | 1 + .../exemplar/no_exemplar_reservoir_test.cc | 5 ++++- .../metrics/exemplar/reservoir_cell_test.cc | 5 ++++- sdk/test/metrics/multi_metric_storage_test.cc | 4 ---- ...sync_metric_storage_up_down_counter_test.cc | 1 + 12 files changed, 28 insertions(+), 24 deletions(-) diff --git a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h index 02b3a5aec2..17fc43b745 100644 --- a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h +++ b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h @@ -7,7 +7,6 @@ #include #include #include -#include "nlohmann/json.hpp" #include "opentelemetry/ext/http/client/http_client.h" #include "opentelemetry/nostd/shared_ptr.h" diff --git a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_recordable.h b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_recordable.h index 9baf9ef7bd..56a1906508 100644 --- a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_recordable.h +++ b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_recordable.h @@ -3,15 +3,21 @@ #pragma once -#include -#include -#include -#include - +#include +#include #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 diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client.h index 65b7da4436..20f10a9711 100644 --- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client.h +++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client.h @@ -7,7 +7,6 @@ #include #include #include -#include #include #include diff --git a/exporters/otlp/src/otlp_grpc_client.cc b/exporters/otlp/src/otlp_grpc_client.cc index a8bc9438f0..b6360090c3 100644 --- a/exporters/otlp/src/otlp_grpc_client.cc +++ b/exporters/otlp/src/otlp_grpc_client.cc @@ -3,17 +3,20 @@ #include "opentelemetry/exporters/otlp/otlp_grpc_client.h" +#include #include #include #include #include #include +#include #include #include #include #include #include #include +#include #include #include @@ -32,22 +35,12 @@ # include # include # include -# include # include # 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 { diff --git a/exporters/otlp/src/otlp_grpc_exporter.cc b/exporters/otlp/src/otlp_grpc_exporter.cc index 24edc1c1de..2a288fd164 100644 --- a/exporters/otlp/src/otlp_grpc_exporter.cc +++ b/exporters/otlp/src/otlp_grpc_exporter.cc @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/exporters/otlp/src/otlp_grpc_log_record_exporter.cc b/exporters/otlp/src/otlp_grpc_log_record_exporter.cc index a97ab5c9ae..9a18f56e01 100644 --- a/exporters/otlp/src/otlp_grpc_log_record_exporter.cc +++ b/exporters/otlp/src/otlp_grpc_log_record_exporter.cc @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/exporters/otlp/src/otlp_grpc_metric_exporter.cc b/exporters/otlp/src/otlp_grpc_metric_exporter.cc index 6b348cd9b7..b7f4417166 100644 --- a/exporters/otlp/src/otlp_grpc_metric_exporter.cc +++ b/exporters/otlp/src/otlp_grpc_metric_exporter.cc @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/sdk/test/metrics/cardinality_limit_test.cc b/sdk/test/metrics/cardinality_limit_test.cc index 00c74d1b92..45e15200c3 100644 --- a/sdk/test/metrics/cardinality_limit_test.cc +++ b/sdk/test/metrics/cardinality_limit_test.cc @@ -32,6 +32,7 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW # include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir.h" #endif using namespace opentelemetry::sdk::metrics; diff --git a/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc b/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc index 6739152b05..6aa157ccad 100644 --- a/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc +++ b/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc @@ -3,8 +3,11 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -# include "opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h" # include +# include +# include + +# include "opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h" using namespace opentelemetry::sdk::metrics; diff --git a/sdk/test/metrics/exemplar/reservoir_cell_test.cc b/sdk/test/metrics/exemplar/reservoir_cell_test.cc index 2ce00ff3ba..077310bceb 100644 --- a/sdk/test/metrics/exemplar/reservoir_cell_test.cc +++ b/sdk/test/metrics/exemplar/reservoir_cell_test.cc @@ -3,8 +3,11 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -# include "opentelemetry/sdk/metrics/exemplar/reservoir_cell.h" # include +# include + +# include "opentelemetry/sdk/metrics/exemplar/reservoir_cell.h" +# include "opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h" OPENTELEMETRY_BEGIN_NAMESPACE namespace sdk diff --git a/sdk/test/metrics/multi_metric_storage_test.cc b/sdk/test/metrics/multi_metric_storage_test.cc index 0999f93218..c438a38ee5 100644 --- a/sdk/test/metrics/multi_metric_storage_test.cc +++ b/sdk/test/metrics/multi_metric_storage_test.cc @@ -11,10 +11,6 @@ #include "opentelemetry/sdk/metrics/state/metric_storage.h" #include "opentelemetry/sdk/metrics/state/multi_metric_storage.h" -#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -# include "opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h" -#endif // ENABLE_METRICS_EXEMPLAR_PREVIEW - using namespace opentelemetry; using namespace opentelemetry::sdk::metrics; diff --git a/sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc b/sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc index 501e8aac3b..0d4f947a1d 100644 --- a/sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc +++ b/sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc @@ -27,6 +27,7 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW # include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir.h" #endif using namespace opentelemetry::sdk::metrics; From 438f298b53d8c3d6c18be4bc61c9e946aa0ee169 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Sat, 21 Jun 2025 22:09:55 +0200 Subject: [PATCH 3/8] cleanup --- .../elasticsearch/src/es_log_recordable.cc | 13 ++++--------- .../test/es_log_record_exporter_test.cc | 5 +++++ .../exporters/otlp/otlp_grpc_client.h | 2 ++ exporters/otlp/src/otlp_grpc_client.cc | 6 +++--- exporters/otlp/src/otlp_grpc_exporter.cc | 5 ++++- .../otlp/src/otlp_grpc_log_record_exporter.cc | 5 ++++- .../otlp/src/otlp_grpc_metric_exporter.cc | 5 ++++- .../exemplar/no_exemplar_reservoir_test.cc | 8 +++++++- .../metrics/exemplar/reservoir_cell_test.cc | 8 ++++++++ sdk/test/metrics/meter_test.cc | 19 +++++++++---------- 10 files changed, 50 insertions(+), 26 deletions(-) diff --git a/exporters/elasticsearch/src/es_log_recordable.cc b/exporters/elasticsearch/src/es_log_recordable.cc index 54f1bada5d..652050e3b8 100644 --- a/exporters/elasticsearch/src/es_log_recordable.cc +++ b/exporters/elasticsearch/src/es_log_recordable.cc @@ -2,15 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 #include "opentelemetry/exporters/elasticsearch/es_log_recordable.h" -#include "opentelemetry/ext/http/client/http_client.h" -#include "opentelemetry/ext/http/client/http_client_factory.h" #include "opentelemetry/logs/severity.h" -#include "opentelemetry/nostd/function_ref.h" #include "opentelemetry/nostd/span.h" #include "opentelemetry/nostd/string_view.h" #include "opentelemetry/nostd/variant.h" -#include "opentelemetry/sdk/common/exporter_utils.h" -#include "opentelemetry/sdk/common/global_log_handler.h" #include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h" #include "opentelemetry/sdk/logs/recordable.h" #include "opentelemetry/sdk/resource/resource.h" @@ -20,15 +15,15 @@ #include "opentelemetry/version.h" #include -#include #include +#include +#include #include -#include -#include #include #include +#include +#include #include -#include #if defined(__cpp_lib_format) # include diff --git a/exporters/elasticsearch/test/es_log_record_exporter_test.cc b/exporters/elasticsearch/test/es_log_record_exporter_test.cc index 6bdd5248a5..c0ee47299e 100644 --- a/exporters/elasticsearch/test/es_log_record_exporter_test.cc +++ b/exporters/elasticsearch/test/es_log_record_exporter_test.cc @@ -12,8 +12,13 @@ #include "opentelemetry/sdk/resource/resource.h" #include +#include #include +#include +#include #include +#include +#include "nlohmann/json.hpp" namespace sdklogs = opentelemetry::sdk::logs; namespace logs_api = opentelemetry::logs; diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client.h index 20f10a9711..159ac0227d 100644 --- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client.h +++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client.h @@ -22,6 +22,8 @@ // clang-format on #ifdef ENABLE_ASYNC_EXPORT +# include + # include "opentelemetry/sdk/common/exporter_utils.h" #endif /* ENABLE_ASYNC_EXPORT */ diff --git a/exporters/otlp/src/otlp_grpc_client.cc b/exporters/otlp/src/otlp_grpc_client.cc index b6360090c3..b386b5912f 100644 --- a/exporters/otlp/src/otlp_grpc_client.cc +++ b/exporters/otlp/src/otlp_grpc_client.cc @@ -3,20 +3,17 @@ #include "opentelemetry/exporters/otlp/otlp_grpc_client.h" -#include #include #include #include #include #include -#include #include #include #include #include #include #include -#include #include #include @@ -32,9 +29,12 @@ // clang-format on #ifdef ENABLE_ASYNC_EXPORT +# include +# include # include # include # include +# include # include # include "opentelemetry/common/timestamp.h" diff --git a/exporters/otlp/src/otlp_grpc_exporter.cc b/exporters/otlp/src/otlp_grpc_exporter.cc index 2a288fd164..0760658582 100644 --- a/exporters/otlp/src/otlp_grpc_exporter.cc +++ b/exporters/otlp/src/otlp_grpc_exporter.cc @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -33,6 +32,10 @@ #include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep // clang-format on +#ifdef ENABLE_ASYNC_EXPORT +# include +#endif + OPENTELEMETRY_BEGIN_NAMESPACE namespace exporter { diff --git a/exporters/otlp/src/otlp_grpc_log_record_exporter.cc b/exporters/otlp/src/otlp_grpc_log_record_exporter.cc index 9a18f56e01..9725a3697d 100644 --- a/exporters/otlp/src/otlp_grpc_log_record_exporter.cc +++ b/exporters/otlp/src/otlp_grpc_log_record_exporter.cc @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -32,6 +31,10 @@ #include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep // clang-format on +#ifdef ENABLE_ASYNC_EXPORT +# include +#endif + OPENTELEMETRY_BEGIN_NAMESPACE namespace exporter { diff --git a/exporters/otlp/src/otlp_grpc_metric_exporter.cc b/exporters/otlp/src/otlp_grpc_metric_exporter.cc index b7f4417166..6387e86f4a 100644 --- a/exporters/otlp/src/otlp_grpc_metric_exporter.cc +++ b/exporters/otlp/src/otlp_grpc_metric_exporter.cc @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -32,6 +31,10 @@ #include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep // clang-format on +#ifdef ENABLE_ASYNC_EXPORT +# include +#endif + OPENTELEMETRY_BEGIN_NAMESPACE namespace exporter { diff --git a/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc b/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc index 6aa157ccad..69d8e35eda 100644 --- a/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc +++ b/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc @@ -4,10 +4,16 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW # include +# include # include +# include # include +# include -# include "opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h" +# include "opentelemetry/common/timestamp.h" +# include "opentelemetry/context/context.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir.h" using namespace opentelemetry::sdk::metrics; diff --git a/sdk/test/metrics/exemplar/reservoir_cell_test.cc b/sdk/test/metrics/exemplar/reservoir_cell_test.cc index 077310bceb..68c1054ab2 100644 --- a/sdk/test/metrics/exemplar/reservoir_cell_test.cc +++ b/sdk/test/metrics/exemplar/reservoir_cell_test.cc @@ -4,10 +4,18 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW # include +# include +# include # include +# include +# include "opentelemetry/common/timestamp.h" +# include "opentelemetry/context/context.h" +# include "opentelemetry/nostd/variant.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" # include "opentelemetry/sdk/metrics/exemplar/reservoir_cell.h" # include "opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h" +# include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE namespace sdk diff --git a/sdk/test/metrics/meter_test.cc b/sdk/test/metrics/meter_test.cc index ce925fb0d7..0941be1258 100644 --- a/sdk/test/metrics/meter_test.cc +++ b/sdk/test/metrics/meter_test.cc @@ -20,16 +20,6 @@ #include "opentelemetry/context/context.h" #include "opentelemetry/metrics/async_instruments.h" #include "opentelemetry/metrics/meter.h" -#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h" -#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h" -#include "opentelemetry/sdk/metrics/instruments.h" -#include "opentelemetry/sdk/metrics/meter_config.h" -#include "opentelemetry/sdk/metrics/view/attributes_processor.h" -#include "opentelemetry/sdk/metrics/view/view_registry.h" -#include "opentelemetry/sdk/resource/resource.h" - -#include - #include "opentelemetry/metrics/meter_provider.h" #include "opentelemetry/metrics/observer_result.h" #include "opentelemetry/metrics/sync_instruments.h" // IWYU pragma: keep @@ -39,14 +29,23 @@ #include "opentelemetry/nostd/variant.h" #include "opentelemetry/sdk/common/attribute_utils.h" #include "opentelemetry/sdk/common/global_log_handler.h" +#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h" +#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h" +#include "opentelemetry/sdk/metrics/data/exemplar_data.h" #include "opentelemetry/sdk/metrics/data/metric_data.h" #include "opentelemetry/sdk/metrics/data/point_data.h" #include "opentelemetry/sdk/metrics/export/metric_producer.h" +#include "opentelemetry/sdk/metrics/instruments.h" +#include "opentelemetry/sdk/metrics/meter_config.h" #include "opentelemetry/sdk/metrics/meter_provider.h" #include "opentelemetry/sdk/metrics/metric_reader.h" +#include "opentelemetry/sdk/metrics/view/attributes_processor.h" #include "opentelemetry/sdk/metrics/view/instrument_selector.h" #include "opentelemetry/sdk/metrics/view/meter_selector.h" #include "opentelemetry/sdk/metrics/view/view.h" +#include "opentelemetry/sdk/metrics/view/view_registry.h" +#include "opentelemetry/sdk/metrics/view/view_registry_factory.h" +#include "opentelemetry/sdk/resource/resource.h" using namespace opentelemetry; using namespace opentelemetry::sdk::instrumentationscope; From cf4738d469f24d4e32db30f24e2452c7e5ec5906 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Sat, 21 Jun 2025 22:49:11 +0200 Subject: [PATCH 4/8] cleanup --- api/test/logs/logger_test.cc | 4 ++-- api/test/logs/provider_test.cc | 6 +++--- api/test/singleton/singleton_test.cc | 2 +- api/test/trace/provider_test.cc | 4 ++++ examples/plugin/plugin/tracer.h | 2 +- ext/src/http/client/curl/http_client_curl.cc | 4 ++++ .../sdk/logs/event_logger_provider.h | 13 +++++++----- .../sdk/logs/event_logger_provider_factory.h | 7 +++++-- sdk/src/logs/event_logger.cc | 21 +++++++++++-------- sdk/test/logs/logger_provider_sdk_test.cc | 4 ++-- sdk/test/logs/logger_provider_set_test.cc | 6 ------ sdk/test/logs/logger_sdk_test.cc | 6 +++--- .../exemplar/no_exemplar_reservoir_test.cc | 2 +- .../metrics/exemplar/reservoir_cell_test.cc | 2 +- sdk/test/metrics/meter_test.cc | 2 +- 15 files changed, 48 insertions(+), 37 deletions(-) diff --git a/api/test/logs/logger_test.cc b/api/test/logs/logger_test.cc index 6265705308..52436815fb 100644 --- a/api/test/logs/logger_test.cc +++ b/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" diff --git a/api/test/logs/provider_test.cc b/api/test/logs/provider_test.cc index 4a2dd23255..33f77279ad 100644 --- a/api/test/logs/provider_test.cc +++ b/api/test/logs/provider_test.cc @@ -5,9 +5,9 @@ #include #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" diff --git a/api/test/singleton/singleton_test.cc b/api/test/singleton/singleton_test.cc index 1616f6bc89..36101df86f 100644 --- a/api/test/singleton/singleton_test.cc +++ b/api/test/singleton/singleton_test.cc @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 #include -#include +#include // IWYU pragma: keep #ifdef _WIN32 # include diff --git a/api/test/trace/provider_test.cc b/api/test/trace/provider_test.cc index d8736f9cbc..eb21d0ff5e 100644 --- a/api/test/trace/provider_test.cc +++ b/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; diff --git a/examples/plugin/plugin/tracer.h b/examples/plugin/plugin/tracer.h index 92012fa4a5..4751456a54 100644 --- a/examples/plugin/plugin/tracer.h +++ b/examples/plugin/plugin/tracer.h @@ -3,7 +3,7 @@ #pragma once -#include +#include // IWYU pragma: keep #include "opentelemetry/common/key_value_iterable.h" #include "opentelemetry/nostd/shared_ptr.h" diff --git a/ext/src/http/client/curl/http_client_curl.cc b/ext/src/http/client/curl/http_client_curl.cc index b4f7c946c2..71f5454d33 100644 --- a/ext/src/http/client/curl/http_client_curl.cc +++ b/ext/src/http/client/curl/http_client_curl.cc @@ -29,6 +29,10 @@ #ifdef ENABLE_OTLP_COMPRESSION_PREVIEW # include # include +# include +# include + +# include "opentelemetry/nostd/type_traits.h" #else # include "opentelemetry/sdk/common/global_log_handler.h" #endif diff --git a/sdk/include/opentelemetry/sdk/logs/event_logger_provider.h b/sdk/include/opentelemetry/sdk/logs/event_logger_provider.h index 351985c331..6c7fafab54 100644 --- a/sdk/include/opentelemetry/sdk/logs/event_logger_provider.h +++ b/sdk/include/opentelemetry/sdk/logs/event_logger_provider.h @@ -3,11 +3,14 @@ #pragma once -#include "opentelemetry/logs/event_logger.h" -#include "opentelemetry/logs/event_logger_provider.h" -#include "opentelemetry/logs/logger.h" -#include "opentelemetry/nostd/shared_ptr.h" -#include "opentelemetry/nostd/string_view.h" +#if OPENTELEMETRY_ABI_VERSION_NO < 2 +# include "opentelemetry/logs/event_logger.h" +# include "opentelemetry/logs/event_logger_provider.h" +# include "opentelemetry/logs/logger.h" +# include "opentelemetry/nostd/shared_ptr.h" +# include "opentelemetry/nostd/string_view.h" +#endif + #include "opentelemetry/version.h" // Define the maximum number of loggers that are allowed to be registered to the loggerprovider. diff --git a/sdk/include/opentelemetry/sdk/logs/event_logger_provider_factory.h b/sdk/include/opentelemetry/sdk/logs/event_logger_provider_factory.h index a57112d769..febc772f12 100644 --- a/sdk/include/opentelemetry/sdk/logs/event_logger_provider_factory.h +++ b/sdk/include/opentelemetry/sdk/logs/event_logger_provider_factory.h @@ -3,9 +3,12 @@ #pragma once -#include +#if OPENTELEMETRY_ABI_VERSION_NO < 2 +# include + +# include "opentelemetry/sdk/logs/event_logger_provider.h" +#endif -#include "opentelemetry/sdk/logs/event_logger_provider.h" #include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE diff --git a/sdk/src/logs/event_logger.cc b/sdk/src/logs/event_logger.cc index 4a8c7d1c0f..a95624f2cf 100644 --- a/sdk/src/logs/event_logger.cc +++ b/sdk/src/logs/event_logger.cc @@ -1,15 +1,18 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -#include -#include - -#include "opentelemetry/logs/log_record.h" -#include "opentelemetry/logs/logger.h" -#include "opentelemetry/nostd/shared_ptr.h" -#include "opentelemetry/nostd/string_view.h" -#include "opentelemetry/nostd/unique_ptr.h" -#include "opentelemetry/sdk/logs/event_logger.h" +#if OPENTELEMETRY_ABI_VERSION_NO < 2 +# include +# include + +# include "opentelemetry/logs/log_record.h" +# include "opentelemetry/logs/logger.h" +# include "opentelemetry/nostd/shared_ptr.h" +# include "opentelemetry/nostd/string_view.h" +# include "opentelemetry/nostd/unique_ptr.h" +# include "opentelemetry/sdk/logs/event_logger.h" +#endif + #include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE diff --git a/sdk/test/logs/logger_provider_sdk_test.cc b/sdk/test/logs/logger_provider_sdk_test.cc index 9a20fb13d1..8483e5c55f 100644 --- a/sdk/test/logs/logger_provider_sdk_test.cc +++ b/sdk/test/logs/logger_provider_sdk_test.cc @@ -18,8 +18,8 @@ #include "opentelemetry/nostd/string_view.h" #include "opentelemetry/nostd/variant.h" #include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h" -#include "opentelemetry/sdk/logs/event_logger_provider.h" -#include "opentelemetry/sdk/logs/event_logger_provider_factory.h" +#include "opentelemetry/sdk/logs/event_logger_provider.h" // IWYU pragma: keep +#include "opentelemetry/sdk/logs/event_logger_provider_factory.h" // IWYU pragma: keep #include "opentelemetry/sdk/logs/exporter.h" #include "opentelemetry/sdk/logs/logger.h" #include "opentelemetry/sdk/logs/logger_context.h" diff --git a/sdk/test/logs/logger_provider_set_test.cc b/sdk/test/logs/logger_provider_set_test.cc index 01ac0ee0e5..b3f812a582 100644 --- a/sdk/test/logs/logger_provider_set_test.cc +++ b/sdk/test/logs/logger_provider_set_test.cc @@ -5,8 +5,6 @@ #include #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/logger_provider.h" #include "opentelemetry/logs/provider.h" @@ -20,10 +18,6 @@ using opentelemetry::sdk::common::setenv; using opentelemetry::sdk::common::unsetenv; #endif -#if OPENTELEMETRY_ABI_VERSION_NO < 2 -using opentelemetry::logs::EventLogger; -using opentelemetry::logs::EventLoggerProvider; -#endif using opentelemetry::logs::Logger; using opentelemetry::logs::LoggerProvider; using opentelemetry::logs::Provider; diff --git a/sdk/test/logs/logger_sdk_test.cc b/sdk/test/logs/logger_sdk_test.cc index 9f1bec280e..04c14fc8a0 100644 --- a/sdk/test/logs/logger_sdk_test.cc +++ b/sdk/test/logs/logger_sdk_test.cc @@ -12,8 +12,8 @@ #include "opentelemetry/common/attribute_value.h" #include "opentelemetry/common/timestamp.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" @@ -25,7 +25,7 @@ #include "opentelemetry/nostd/variant.h" #include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h" #include "opentelemetry/sdk/instrumentationscope/scope_configurator.h" -#include "opentelemetry/sdk/logs/event_logger_provider.h" +#include "opentelemetry/sdk/logs/event_logger_provider.h" // IWYU pragma: keep #include "opentelemetry/sdk/logs/logger.h" #include "opentelemetry/sdk/logs/logger_config.h" #include "opentelemetry/sdk/logs/logger_provider.h" diff --git a/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc b/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc index 69d8e35eda..3e8e81f3d9 100644 --- a/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc +++ b/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc @@ -12,7 +12,7 @@ # include "opentelemetry/common/timestamp.h" # include "opentelemetry/context/context.h" -# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/data/exemplar_data.h" # include "opentelemetry/sdk/metrics/exemplar/reservoir.h" using namespace opentelemetry::sdk::metrics; diff --git a/sdk/test/metrics/exemplar/reservoir_cell_test.cc b/sdk/test/metrics/exemplar/reservoir_cell_test.cc index 68c1054ab2..978cee6e19 100644 --- a/sdk/test/metrics/exemplar/reservoir_cell_test.cc +++ b/sdk/test/metrics/exemplar/reservoir_cell_test.cc @@ -12,7 +12,7 @@ # include "opentelemetry/common/timestamp.h" # include "opentelemetry/context/context.h" # include "opentelemetry/nostd/variant.h" -# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/data/exemplar_data.h" # include "opentelemetry/sdk/metrics/exemplar/reservoir_cell.h" # include "opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h" # include "opentelemetry/version.h" diff --git a/sdk/test/metrics/meter_test.cc b/sdk/test/metrics/meter_test.cc index 0941be1258..42babf55ce 100644 --- a/sdk/test/metrics/meter_test.cc +++ b/sdk/test/metrics/meter_test.cc @@ -31,9 +31,9 @@ #include "opentelemetry/sdk/common/global_log_handler.h" #include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h" #include "opentelemetry/sdk/instrumentationscope/scope_configurator.h" -#include "opentelemetry/sdk/metrics/data/exemplar_data.h" #include "opentelemetry/sdk/metrics/data/metric_data.h" #include "opentelemetry/sdk/metrics/data/point_data.h" +#include "opentelemetry/sdk/metrics/exemplar/filter_type.h" #include "opentelemetry/sdk/metrics/export/metric_producer.h" #include "opentelemetry/sdk/metrics/instruments.h" #include "opentelemetry/sdk/metrics/meter_config.h" From a7fff5409901d976076b8d7fb6e0d368b50bac96 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Sat, 21 Jun 2025 23:33:59 +0200 Subject: [PATCH 5/8] cleanup --- examples/otlp/http_instrumented_main.cc | 5 +++++ .../exporters/elasticsearch/es_log_record_exporter.h | 5 +++++ exporters/elasticsearch/src/es_log_record_exporter.cc | 10 +++++++++- .../exporters/otlp/otlp_http_exporter_options.h | 4 ++++ .../otlp/otlp_http_log_record_exporter_options.h | 4 ++++ .../exporters/otlp/otlp_http_metric_exporter_options.h | 4 ++++ exporters/otlp/src/otlp_http_exporter.cc | 4 ++++ exporters/otlp/src/otlp_http_log_record_exporter.cc | 4 ++++ exporters/otlp/src/otlp_http_metric_exporter.cc | 4 ++++ ext/test/http/curl_http_test.cc | 4 ++++ sdk/test/logs/logger_provider_set_test.cc | 8 +++++++- .../metrics/exemplar/no_exemplar_reservoir_test.cc | 2 +- sdk/test/metrics/exemplar/reservoir_cell_test.cc | 2 +- sdk/test/metrics/meter_test.cc | 1 - 14 files changed, 56 insertions(+), 5 deletions(-) diff --git a/examples/otlp/http_instrumented_main.cc b/examples/otlp/http_instrumented_main.cc index 5084a6a5f6..17a381930c 100644 --- a/examples/otlp/http_instrumented_main.cc +++ b/examples/otlp/http_instrumented_main.cc @@ -55,6 +55,11 @@ # include "metrics_foo_library/foo_library.h" #endif +#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW +# include +# include "opentelemetry/sdk/common/thread_instrumentation.h" +#endif + namespace { diff --git a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h index 17fc43b745..df9dcfe4d9 100644 --- a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h +++ b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h @@ -16,6 +16,11 @@ #include "opentelemetry/sdk/logs/recordable.h" #include "opentelemetry/version.h" +#ifdef ENABLE_ASYNC_EXPORT +# include +# include +#endif + OPENTELEMETRY_BEGIN_NAMESPACE namespace exporter { diff --git a/exporters/elasticsearch/src/es_log_record_exporter.cc b/exporters/elasticsearch/src/es_log_record_exporter.cc index 1f0fe7295e..3a0b0b6715 100644 --- a/exporters/elasticsearch/src/es_log_record_exporter.cc +++ b/exporters/elasticsearch/src/es_log_record_exporter.cc @@ -6,7 +6,7 @@ #include #include #include -#include +#include // IWYU pragma: keep #include #include #include @@ -25,6 +25,14 @@ #include "opentelemetry/sdk/logs/recordable.h" #include "opentelemetry/version.h" +#ifdef ENABLE_ASYNC_EXPORT +# include +# include +# include +# include "opentelemetry/common/timestamp.h" +# include "opentelemetry/nostd/shared_ptr.h" +#endif + namespace nostd = opentelemetry::nostd; namespace sdklogs = opentelemetry::sdk::logs; namespace http_client = opentelemetry::ext::http::client; diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h index 314854f292..52f2208575 100644 --- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h +++ b/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 +#endif + OPENTELEMETRY_BEGIN_NAMESPACE namespace exporter { diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h index e7c47a5564..78160deeb0 100644 --- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h +++ b/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 +#endif + OPENTELEMETRY_BEGIN_NAMESPACE namespace exporter { diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h index 5ff1b28321..255491a39f 100644 --- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h +++ b/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 +#endif + OPENTELEMETRY_BEGIN_NAMESPACE namespace exporter { diff --git a/exporters/otlp/src/otlp_http_exporter.cc b/exporters/otlp/src/otlp_http_exporter.cc index 2ebb487afd..6eaf1eed22 100644 --- a/exporters/otlp/src/otlp_http_exporter.cc +++ b/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 +#endif + OPENTELEMETRY_BEGIN_NAMESPACE namespace exporter { diff --git a/exporters/otlp/src/otlp_http_log_record_exporter.cc b/exporters/otlp/src/otlp_http_log_record_exporter.cc index cd9852e05a..b787ae3a46 100644 --- a/exporters/otlp/src/otlp_http_log_record_exporter.cc +++ b/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 +#endif + OPENTELEMETRY_BEGIN_NAMESPACE namespace exporter { diff --git a/exporters/otlp/src/otlp_http_metric_exporter.cc b/exporters/otlp/src/otlp_http_metric_exporter.cc index 5c2bc76834..40b3f04230 100644 --- a/exporters/otlp/src/otlp_http_metric_exporter.cc +++ b/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 +#endif + OPENTELEMETRY_BEGIN_NAMESPACE namespace exporter { diff --git a/ext/test/http/curl_http_test.cc b/ext/test/http/curl_http_test.cc index 0582f6c156..f178332e8b 100644 --- a/ext/test/http/curl_http_test.cc +++ b/ext/test/http/curl_http_test.cc @@ -9,6 +9,10 @@ # include "gmock/gmock.h" #endif // ENABLE_OTLP_RETRY_PREVIEW +#ifdef ENABLE_OTLP_COMPRESSION_PREVIEW +# include +#endif // ENABLE_OTLP_COMPRESSION_PREVIEW + #include #include #include diff --git a/sdk/test/logs/logger_provider_set_test.cc b/sdk/test/logs/logger_provider_set_test.cc index b3f812a582..57f0547c87 100644 --- a/sdk/test/logs/logger_provider_set_test.cc +++ b/sdk/test/logs/logger_provider_set_test.cc @@ -5,7 +5,9 @@ #include #include "opentelemetry/common/key_value_iterable.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" @@ -18,6 +20,10 @@ using opentelemetry::sdk::common::setenv; using opentelemetry::sdk::common::unsetenv; #endif +#if OPENTELEMETRY_ABI_VERSION_NO < 2 +using opentelemetry::logs::EventLogger; +using opentelemetry::logs::EventLoggerProvider; +#endif using opentelemetry::logs::Logger; using opentelemetry::logs::LoggerProvider; using opentelemetry::logs::Provider; diff --git a/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc b/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc index 3e8e81f3d9..69d8e35eda 100644 --- a/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc +++ b/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc @@ -12,7 +12,7 @@ # include "opentelemetry/common/timestamp.h" # include "opentelemetry/context/context.h" -# include "opentelemetry/sdk/metrics/data/exemplar_data.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" # include "opentelemetry/sdk/metrics/exemplar/reservoir.h" using namespace opentelemetry::sdk::metrics; diff --git a/sdk/test/metrics/exemplar/reservoir_cell_test.cc b/sdk/test/metrics/exemplar/reservoir_cell_test.cc index 978cee6e19..68c1054ab2 100644 --- a/sdk/test/metrics/exemplar/reservoir_cell_test.cc +++ b/sdk/test/metrics/exemplar/reservoir_cell_test.cc @@ -12,7 +12,7 @@ # include "opentelemetry/common/timestamp.h" # include "opentelemetry/context/context.h" # include "opentelemetry/nostd/variant.h" -# include "opentelemetry/sdk/metrics/data/exemplar_data.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" # include "opentelemetry/sdk/metrics/exemplar/reservoir_cell.h" # include "opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h" # include "opentelemetry/version.h" diff --git a/sdk/test/metrics/meter_test.cc b/sdk/test/metrics/meter_test.cc index 42babf55ce..c9191afd9e 100644 --- a/sdk/test/metrics/meter_test.cc +++ b/sdk/test/metrics/meter_test.cc @@ -33,7 +33,6 @@ #include "opentelemetry/sdk/instrumentationscope/scope_configurator.h" #include "opentelemetry/sdk/metrics/data/metric_data.h" #include "opentelemetry/sdk/metrics/data/point_data.h" -#include "opentelemetry/sdk/metrics/exemplar/filter_type.h" #include "opentelemetry/sdk/metrics/export/metric_producer.h" #include "opentelemetry/sdk/metrics/instruments.h" #include "opentelemetry/sdk/metrics/meter_config.h" From 1fee14df70eafab28d6c3c0ae0b1a3f88e8aa04d Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Sun, 22 Jun 2025 00:32:43 +0200 Subject: [PATCH 6/8] cleanup --- .../elasticsearch/es_log_record_exporter.h | 1 + exporters/otlp/test/otlp_file_exporter_test.cc | 4 ++++ .../sdk/metrics/exemplar/filter_type.h | 14 -------------- sdk/src/logs/event_logger_provider.cc | 10 +++++++--- sdk/src/logs/event_logger_provider_factory.cc | 6 +++++- .../metrics/exemplar/no_exemplar_reservoir_test.cc | 2 +- sdk/test/metrics/exemplar/reservoir_cell_test.cc | 2 +- sdk/test/metrics/meter_provider_sdk_test.cc | 11 +++++++++++ sdk/test/metrics/sync_metric_storage_gauge_test.cc | 14 ++++++++++++++ sdk/test/trace/tracer_provider_set_test.cc | 4 ++++ sdk/test/trace/tracer_provider_test.cc | 10 ++++++++++ 11 files changed, 58 insertions(+), 20 deletions(-) diff --git a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h index df9dcfe4d9..bf07bd1bc6 100644 --- a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h +++ b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h @@ -18,6 +18,7 @@ #ifdef ENABLE_ASYNC_EXPORT # include +# include # include #endif diff --git a/exporters/otlp/test/otlp_file_exporter_test.cc b/exporters/otlp/test/otlp_file_exporter_test.cc index 0a7c4a770c..cf3abc52e5 100644 --- a/exporters/otlp/test/otlp_file_exporter_test.cc +++ b/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 diff --git a/sdk/include/opentelemetry/sdk/metrics/exemplar/filter_type.h b/sdk/include/opentelemetry/sdk/metrics/exemplar/filter_type.h index 83cf7531fb..f1df520d6a 100644 --- a/sdk/include/opentelemetry/sdk/metrics/exemplar/filter_type.h +++ b/sdk/include/opentelemetry/sdk/metrics/exemplar/filter_type.h @@ -5,27 +5,13 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -# include - -# include "opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h" # include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE -namespace context -{ -class Context; -} // namespace context - namespace sdk { -namespace common -{ -class OrderedAttributeMap; -} // namespace common - namespace metrics { -using MetricAttributes = opentelemetry::sdk::metrics::FilteredOrderedAttributeMap; /** * Exemplar filter type is used to pre-filter measurements before attempting to store them in a diff --git a/sdk/src/logs/event_logger_provider.cc b/sdk/src/logs/event_logger_provider.cc index 04e4216584..f1c1243f5b 100644 --- a/sdk/src/logs/event_logger_provider.cc +++ b/sdk/src/logs/event_logger_provider.cc @@ -2,9 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 #include "opentelemetry/sdk/logs/event_logger_provider.h" -#include "opentelemetry/nostd/shared_ptr.h" -#include "opentelemetry/sdk/common/global_log_handler.h" -#include "opentelemetry/sdk/logs/event_logger.h" + +#if OPENTELEMETRY_ABI_VERSION_NO < 2 +# include "opentelemetry/nostd/shared_ptr.h" +# include "opentelemetry/sdk/common/global_log_handler.h" +# include "opentelemetry/sdk/logs/event_logger.h" +#endif + #include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE diff --git a/sdk/src/logs/event_logger_provider_factory.cc b/sdk/src/logs/event_logger_provider_factory.cc index e1c7284e3e..aaebd26129 100644 --- a/sdk/src/logs/event_logger_provider_factory.cc +++ b/sdk/src/logs/event_logger_provider_factory.cc @@ -2,7 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 #include "opentelemetry/sdk/logs/event_logger_provider_factory.h" -#include "opentelemetry/sdk/logs/event_logger_provider.h" + +#if OPENTELEMETRY_ABI_VERSION_NO < 2 +# include "opentelemetry/sdk/logs/event_logger_provider.h" +#endif + #include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE diff --git a/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc b/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc index 69d8e35eda..3e8e81f3d9 100644 --- a/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc +++ b/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc @@ -12,7 +12,7 @@ # include "opentelemetry/common/timestamp.h" # include "opentelemetry/context/context.h" -# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/data/exemplar_data.h" # include "opentelemetry/sdk/metrics/exemplar/reservoir.h" using namespace opentelemetry::sdk::metrics; diff --git a/sdk/test/metrics/exemplar/reservoir_cell_test.cc b/sdk/test/metrics/exemplar/reservoir_cell_test.cc index 68c1054ab2..978cee6e19 100644 --- a/sdk/test/metrics/exemplar/reservoir_cell_test.cc +++ b/sdk/test/metrics/exemplar/reservoir_cell_test.cc @@ -12,7 +12,7 @@ # include "opentelemetry/common/timestamp.h" # include "opentelemetry/context/context.h" # include "opentelemetry/nostd/variant.h" -# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/data/exemplar_data.h" # include "opentelemetry/sdk/metrics/exemplar/reservoir_cell.h" # include "opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h" # include "opentelemetry/version.h" diff --git a/sdk/test/metrics/meter_provider_sdk_test.cc b/sdk/test/metrics/meter_provider_sdk_test.cc index 13c46e5dbc..0c1f4d7de1 100644 --- a/sdk/test/metrics/meter_provider_sdk_test.cc +++ b/sdk/test/metrics/meter_provider_sdk_test.cc @@ -20,6 +20,17 @@ #include "opentelemetry/sdk/metrics/view/meter_selector.h" #include "opentelemetry/sdk/metrics/view/view.h" +#if OPENTELEMETRY_ABI_VERSION_NO >= 2 +# include +# include +# include +# include + +# include "opentelemetry/common/attribute_value.h" +# include "opentelemetry/nostd/variant.h" +# include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h" +#endif /* OPENTELEMETRY_ABI_VERSION_NO >= 2 */ + using namespace opentelemetry::sdk::metrics; TEST(MeterProvider, GetMeter) diff --git a/sdk/test/metrics/sync_metric_storage_gauge_test.cc b/sdk/test/metrics/sync_metric_storage_gauge_test.cc index 183dab6e4c..3befc74ef8 100644 --- a/sdk/test/metrics/sync_metric_storage_gauge_test.cc +++ b/sdk/test/metrics/sync_metric_storage_gauge_test.cc @@ -9,13 +9,27 @@ #include "opentelemetry/sdk/metrics/instruments.h" #if OPENTELEMETRY_ABI_VERSION_NO >= 2 +# include +# include +# include # include # include +# include +# include # include "common.h" # include "opentelemetry/common/key_value_iterable_view.h" +# include "opentelemetry/common/timestamp.h" +# include "opentelemetry/context/context.h" +# include "opentelemetry/nostd/function_ref.h" # include "opentelemetry/nostd/shared_ptr.h" +# include "opentelemetry/nostd/span.h" +# include "opentelemetry/nostd/variant.h" +# include "opentelemetry/sdk/metrics/data/metric_data.h" # include "opentelemetry/sdk/metrics/data/point_data.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir.h" +# include "opentelemetry/sdk/metrics/state/metric_collector.h" # include "opentelemetry/sdk/metrics/state/sync_metric_storage.h" # include "opentelemetry/sdk/metrics/view/attributes_processor.h" #endif diff --git a/sdk/test/trace/tracer_provider_set_test.cc b/sdk/test/trace/tracer_provider_set_test.cc index d8aebe7085..eb8d912eb9 100644 --- a/sdk/test/trace/tracer_provider_set_test.cc +++ b/sdk/test/trace/tracer_provider_set_test.cc @@ -17,6 +17,10 @@ using opentelemetry::sdk::common::setenv; using opentelemetry::sdk::common::unsetenv; #endif +#if OPENTELEMETRY_ABI_VERSION_NO >= 2 +# include "opentelemetry/common/key_value_iterable.h" +#endif + using opentelemetry::trace::Tracer; using opentelemetry::trace::TracerProvider; diff --git a/sdk/test/trace/tracer_provider_test.cc b/sdk/test/trace/tracer_provider_test.cc index ca8b0c9ca4..a3434afdd1 100644 --- a/sdk/test/trace/tracer_provider_test.cc +++ b/sdk/test/trace/tracer_provider_test.cc @@ -25,6 +25,16 @@ #include "opentelemetry/sdk/trace/tracer_provider_factory.h" #include "opentelemetry/trace/tracer.h" +#if OPENTELEMETRY_ABI_VERSION_NO >= 2 +# include +# include +# include +# include + +# include "opentelemetry/common/attribute_value.h" +# include "opentelemetry/nostd/variant.h" +#endif /* OPENTELEMETRY_ABI_VERSION_NO >= 2 */ + using namespace opentelemetry::sdk::trace; using namespace opentelemetry::sdk::resource; From ea292233afbfbce394432e3a20fd3276af493830 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Sun, 22 Jun 2025 01:18:07 +0200 Subject: [PATCH 7/8] cleanup --- .../aligned_histogram_bucket_exemplar_reservoir_test.cc | 2 +- sdk/test/metrics/histogram_aggregation_benchmark.cc | 3 ++- sdk/test/metrics/histogram_aggregation_test.cc | 2 +- sdk/test/metrics/histogram_test.cc | 2 +- sdk/test/metrics/meter_test.cc | 3 ++- sdk/test/metrics/metric_test_stress.cc | 5 +++-- sdk/test/metrics/sync_metric_storage_gauge_test.cc | 5 ++--- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/sdk/test/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir_test.cc b/sdk/test/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir_test.cc index 26107fd17f..ee1eb72cce 100644 --- a/sdk/test/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir_test.cc +++ b/sdk/test/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir_test.cc @@ -12,8 +12,8 @@ # include "opentelemetry/common/timestamp.h" # include "opentelemetry/context/context.h" +# include "opentelemetry/sdk/metrics/data/exemplar_data.h" # include "opentelemetry/sdk/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir.h" -# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" # include "opentelemetry/sdk/metrics/exemplar/reservoir.h" # include "opentelemetry/sdk/metrics/exemplar/reservoir_cell.h" # include "opentelemetry/version.h" diff --git a/sdk/test/metrics/histogram_aggregation_benchmark.cc b/sdk/test/metrics/histogram_aggregation_benchmark.cc index aeb690f5e4..45fcb5b1a4 100644 --- a/sdk/test/metrics/histogram_aggregation_benchmark.cc +++ b/sdk/test/metrics/histogram_aggregation_benchmark.cc @@ -5,6 +5,7 @@ #include #include #include +#include // IWYU pragma: keep #include #include #include @@ -12,7 +13,7 @@ #include #include "common.h" -#include "opentelemetry/context/context.h" +#include "opentelemetry/context/context.h" // IWYU pragma: keep #include "opentelemetry/metrics/meter.h" #include "opentelemetry/metrics/sync_instruments.h" #include "opentelemetry/nostd/shared_ptr.h" diff --git a/sdk/test/metrics/histogram_aggregation_test.cc b/sdk/test/metrics/histogram_aggregation_test.cc index 1ea4ed5390..25640209d1 100644 --- a/sdk/test/metrics/histogram_aggregation_test.cc +++ b/sdk/test/metrics/histogram_aggregation_test.cc @@ -9,7 +9,7 @@ #include "common.h" #include "opentelemetry/common/macros.h" -#include "opentelemetry/context/context.h" +#include "opentelemetry/context/context.h" // IWYU pragma: keep #include "opentelemetry/metrics/meter.h" #include "opentelemetry/metrics/sync_instruments.h" #include "opentelemetry/nostd/function_ref.h" diff --git a/sdk/test/metrics/histogram_test.cc b/sdk/test/metrics/histogram_test.cc index 77ce373780..a75b4f3f13 100644 --- a/sdk/test/metrics/histogram_test.cc +++ b/sdk/test/metrics/histogram_test.cc @@ -10,7 +10,7 @@ #include "common.h" #include "opentelemetry/common/macros.h" -#include "opentelemetry/context/context.h" +#include "opentelemetry/context/context.h" // IWYU pragma: keep #include "opentelemetry/metrics/meter.h" #include "opentelemetry/metrics/sync_instruments.h" #include "opentelemetry/nostd/function_ref.h" diff --git a/sdk/test/metrics/meter_test.cc b/sdk/test/metrics/meter_test.cc index c9191afd9e..b821880bf0 100644 --- a/sdk/test/metrics/meter_test.cc +++ b/sdk/test/metrics/meter_test.cc @@ -17,7 +17,7 @@ #include #include "opentelemetry/common/key_value_iterable.h" -#include "opentelemetry/context/context.h" +#include "opentelemetry/context/context.h" // IWYU pragma: keep #include "opentelemetry/metrics/async_instruments.h" #include "opentelemetry/metrics/meter.h" #include "opentelemetry/metrics/meter_provider.h" @@ -31,6 +31,7 @@ #include "opentelemetry/sdk/common/global_log_handler.h" #include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h" #include "opentelemetry/sdk/instrumentationscope/scope_configurator.h" +#include "opentelemetry/sdk/metrics/data/exemplar_data.h" // IWYU pragma: keep #include "opentelemetry/sdk/metrics/data/metric_data.h" #include "opentelemetry/sdk/metrics/data/point_data.h" #include "opentelemetry/sdk/metrics/export/metric_producer.h" diff --git a/sdk/test/metrics/metric_test_stress.cc b/sdk/test/metrics/metric_test_stress.cc index 7b22f2d76d..a3e21b3fb4 100644 --- a/sdk/test/metrics/metric_test_stress.cc +++ b/sdk/test/metrics/metric_test_stress.cc @@ -6,13 +6,14 @@ #include #include #include +#include // IWYU pragma: keep #include #include #include #include - #include "common.h" -#include "opentelemetry/context/context.h" + +#include "opentelemetry/context/context.h" // IWYU pragma: keep #include "opentelemetry/metrics/meter.h" #include "opentelemetry/metrics/sync_instruments.h" #include "opentelemetry/nostd/function_ref.h" diff --git a/sdk/test/metrics/sync_metric_storage_gauge_test.cc b/sdk/test/metrics/sync_metric_storage_gauge_test.cc index 3befc74ef8..60a4f86d1a 100644 --- a/sdk/test/metrics/sync_metric_storage_gauge_test.cc +++ b/sdk/test/metrics/sync_metric_storage_gauge_test.cc @@ -4,8 +4,8 @@ #include #include -#include "opentelemetry/common/attribute_value.h" -#include "opentelemetry/nostd/utility.h" +#include "opentelemetry/common/attribute_value.h" // IWYU pragma: keep +#include "opentelemetry/nostd/utility.h" // IWYU pragma: keep #include "opentelemetry/sdk/metrics/instruments.h" #if OPENTELEMETRY_ABI_VERSION_NO >= 2 @@ -22,7 +22,6 @@ # include "opentelemetry/common/timestamp.h" # include "opentelemetry/context/context.h" # include "opentelemetry/nostd/function_ref.h" -# include "opentelemetry/nostd/shared_ptr.h" # include "opentelemetry/nostd/span.h" # include "opentelemetry/nostd/variant.h" # include "opentelemetry/sdk/metrics/data/metric_data.h" From e2e77911bb95ff34189df4bd18b9685a807d8c31 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Sun, 22 Jun 2025 01:45:26 +0200 Subject: [PATCH 8/8] cleanup --- .github/workflows/iwyu.yml | 6 +++--- sdk/test/metrics/meter_test.cc | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml index 823813ea65..4112b456fd 100644 --- a/.github/workflows/iwyu.yml +++ b/.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) diff --git a/sdk/test/metrics/meter_test.cc b/sdk/test/metrics/meter_test.cc index b821880bf0..427889d907 100644 --- a/sdk/test/metrics/meter_test.cc +++ b/sdk/test/metrics/meter_test.cc @@ -7,6 +7,7 @@ #include #include #include +#include // IWYU pragma: keep #include #include #include