Skip to content

Commit 1d41125

Browse files
authored
[Code Health] include-what-you-use cleanup, part 9 (#3492)
1 parent 9708acb commit 1d41125

File tree

59 files changed

+324
-136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+324
-136
lines changed

.github/workflows/iwyu.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
matrix:
1919
include:
2020
- cmake_options: all-options-abiv1
21-
warning_limit: 5
21+
warning_limit: 0
2222
- cmake_options: all-options-abiv1-preview
23-
warning_limit: 28
23+
warning_limit: 0
2424
- cmake_options: all-options-abiv2-preview
25-
warning_limit: 48
25+
warning_limit: 0
2626

2727
steps:
2828
- name: Harden the runner (Audit all outbound calls)

api/test/logs/logger_test.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include "opentelemetry/common/key_value_iterable.h"
1212
#include "opentelemetry/common/key_value_iterable_view.h"
1313
#include "opentelemetry/logs/event_id.h"
14-
#include "opentelemetry/logs/event_logger.h"
15-
#include "opentelemetry/logs/event_logger_provider.h"
14+
#include "opentelemetry/logs/event_logger.h" // IWYU pragma: keep
15+
#include "opentelemetry/logs/event_logger_provider.h" // IWYU pragma: keep
1616
#include "opentelemetry/logs/log_record.h"
1717
#include "opentelemetry/logs/logger.h"
1818
#include "opentelemetry/logs/logger_provider.h"

api/test/logs/provider_test.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
#include <string>
66

77
#include "opentelemetry/common/key_value_iterable.h"
8-
#include "opentelemetry/logs/event_logger.h" // IWYU pragma: keep
9-
#include "opentelemetry/logs/event_logger_provider.h"
10-
#include "opentelemetry/logs/logger.h" // IWYU pragma: keep
8+
#include "opentelemetry/logs/event_logger.h" // IWYU pragma: keep
9+
#include "opentelemetry/logs/event_logger_provider.h" // IWYU pragma: keep
10+
#include "opentelemetry/logs/logger.h" // IWYU pragma: keep
1111
#include "opentelemetry/logs/logger_provider.h"
1212
#include "opentelemetry/logs/provider.h"
1313
#include "opentelemetry/nostd/shared_ptr.h"

api/test/singleton/singleton_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
#include <gtest/gtest.h>
5-
#include <stdint.h>
5+
#include <stdint.h> // IWYU pragma: keep
66

77
#ifdef _WIN32
88
# include <windows.h>

api/test/trace/provider_test.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
#include "opentelemetry/trace/provider.h"
99
#include "opentelemetry/trace/tracer_provider.h"
1010

11+
#if OPENTELEMETRY_ABI_VERSION_NO >= 2
12+
# include "opentelemetry/common/key_value_iterable.h"
13+
#endif
14+
1115
using opentelemetry::trace::Provider;
1216
using opentelemetry::trace::Tracer;
1317
using opentelemetry::trace::TracerProvider;

examples/otlp/http_instrumented_main.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@
5555
# include "metrics_foo_library/foo_library.h"
5656
#endif
5757

58+
#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
59+
# include <thread>
60+
# include "opentelemetry/sdk/common/thread_instrumentation.h"
61+
#endif
62+
5863
namespace
5964
{
6065

examples/plugin/plugin/tracer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#pragma once
55

6-
#include <stdint.h>
6+
#include <stdint.h> // IWYU pragma: keep
77

88
#include "opentelemetry/common/key_value_iterable.h"
99
#include "opentelemetry/nostd/shared_ptr.h"

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,24 @@
33

44
#pragma once
55

6-
#include "nlohmann/json.hpp"
7-
#include "opentelemetry/ext/http/client/http_client_factory.h"
6+
#include <atomic>
7+
#include <chrono>
8+
#include <map>
9+
#include <string>
10+
11+
#include "opentelemetry/ext/http/client/http_client.h"
812
#include "opentelemetry/nostd/shared_ptr.h"
13+
#include "opentelemetry/nostd/span.h"
14+
#include "opentelemetry/sdk/common/exporter_utils.h"
915
#include "opentelemetry/sdk/logs/exporter.h"
1016
#include "opentelemetry/sdk/logs/recordable.h"
17+
#include "opentelemetry/version.h"
1118

12-
#include <time.h>
13-
#include <atomic>
14-
#include <condition_variable>
15-
#include <cstddef>
16-
#include <iostream>
17-
#include <mutex>
19+
#ifdef ENABLE_ASYNC_EXPORT
20+
# include <condition_variable>
21+
# include <cstddef>
22+
# include <mutex>
23+
#endif
1824

1925
OPENTELEMETRY_BEGIN_NAMESPACE
2026
namespace exporter

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,21 @@
33

44
#pragma once
55

6-
#include <map>
7-
#include <sstream>
8-
#include <type_traits>
9-
#include <unordered_map>
10-
6+
#include <stdint.h>
7+
#include <string>
118
#include "nlohmann/json.hpp"
12-
#include "opentelemetry/common/macros.h"
9+
10+
#include "opentelemetry/common/attribute_value.h"
11+
#include "opentelemetry/common/timestamp.h"
12+
#include "opentelemetry/logs/severity.h"
13+
#include "opentelemetry/nostd/string_view.h"
1314
#include "opentelemetry/sdk/common/attribute_utils.h"
15+
#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
1416
#include "opentelemetry/sdk/logs/recordable.h"
17+
#include "opentelemetry/sdk/resource/resource.h"
18+
#include "opentelemetry/trace/span_id.h"
19+
#include "opentelemetry/trace/trace_flags.h"
20+
#include "opentelemetry/trace/trace_id.h"
1521
#include "opentelemetry/version.h"
1622

1723
OPENTELEMETRY_BEGIN_NAMESPACE

exporters/elasticsearch/src/es_log_record_exporter.cc

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,37 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#include <sstream> // std::stringstream
5-
4+
#include <stdint.h>
5+
#include <atomic>
6+
#include <chrono>
67
#include <condition_variable>
8+
#include <map>
9+
#include <memory> // IWYU pragma: keep
710
#include <mutex>
11+
#include <sstream>
12+
#include <string>
13+
#include <utility>
14+
#include <vector>
15+
816
#include "opentelemetry/exporters/elasticsearch/es_log_record_exporter.h"
917
#include "opentelemetry/exporters/elasticsearch/es_log_recordable.h"
10-
#include "opentelemetry/sdk_config.h"
18+
#include "opentelemetry/ext/http/client/http_client.h"
19+
#include "opentelemetry/ext/http/client/http_client_factory.h"
20+
#include "opentelemetry/nostd/function_ref.h"
21+
#include "opentelemetry/nostd/span.h"
22+
#include "opentelemetry/nostd/string_view.h"
23+
#include "opentelemetry/sdk/common/exporter_utils.h"
24+
#include "opentelemetry/sdk/common/global_log_handler.h"
25+
#include "opentelemetry/sdk/logs/recordable.h"
26+
#include "opentelemetry/version.h"
27+
28+
#ifdef ENABLE_ASYNC_EXPORT
29+
# include <cstddef>
30+
# include <functional>
31+
# include <ratio>
32+
# include "opentelemetry/common/timestamp.h"
33+
# include "opentelemetry/nostd/shared_ptr.h"
34+
#endif
1135

1236
namespace nostd = opentelemetry::nostd;
1337
namespace sdklogs = opentelemetry::sdk::logs;

0 commit comments

Comments
 (0)