Skip to content

Commit e5a1a15

Browse files
authored
[Code Health] Include what you use, part 6 (open-telemetry#3216)
1 parent c33f800 commit e5a1a15

File tree

168 files changed

+169
-228
lines changed

Some content is hidden

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

168 files changed

+169
-228
lines changed

.iwyu.imp

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
{ "include": ["<gtest/gtest-param-test.h>", "private", "<gtest/gtest.h>", "public"] },
2020
{ "include": ["<gtest/gtest_pred_impl.h>", "private", "<gtest/gtest.h>", "public"] },
2121
{ "include": ["<gtest/gtest-typed-test.h>", "private", "<gtest/gtest.h>", "public"] },
22+
{ "include": ["<gtest/gtest-assertion-result.h>", "private", "<gtest/gtest.h>", "public"] },
2223

2324
# We prefer to include <gmock/gmock.h> for simplicity
2425
{ "include": ["<gmock/gmock-function-mocker.h>", "private", "<gmock/gmock.h>", "public"] },

api/test/baggage/baggage_benchmark.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
#include <benchmark/benchmark.h>
55
#include <stddef.h>
6-
#include <memory>
76
#include <string>
87

98
#include "opentelemetry/baggage/baggage.h"
9+
#include "opentelemetry/nostd/function_ref.h"
10+
#include "opentelemetry/nostd/shared_ptr.h"
1011
#include "opentelemetry/nostd/string_view.h"
11-
#include "opentelemetry/nostd/utility.h"
1212

1313
using namespace opentelemetry::baggage;
1414
namespace nostd = opentelemetry::nostd;

api/test/baggage/baggage_test.cc

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#include "opentelemetry/baggage/baggage.h"
1111
#include "opentelemetry/common/kv_properties.h"
12+
#include "opentelemetry/nostd/function_ref.h"
1213
#include "opentelemetry/nostd/shared_ptr.h"
1314
#include "opentelemetry/nostd/string_view.h"
1415

api/test/baggage/propagation/baggage_propagator_test.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// SPDX-License-Identifier: Apache-2.0
44

55
#include <gtest/gtest.h>
6+
#include <initializer_list>
67
#include <map>
7-
#include <memory>
88
#include <string>
99
#include <utility>
1010
#include <vector>
@@ -14,8 +14,9 @@
1414
#include "opentelemetry/baggage/propagation/baggage_propagator.h"
1515
#include "opentelemetry/context/context.h"
1616
#include "opentelemetry/context/propagation/text_map_propagator.h"
17+
#include "opentelemetry/nostd/function_ref.h"
18+
#include "opentelemetry/nostd/shared_ptr.h"
1719
#include "opentelemetry/nostd/string_view.h"
18-
#include "opentelemetry/nostd/utility.h"
1920

2021
using namespace opentelemetry;
2122
using namespace opentelemetry::baggage::propagation;

api/test/common/kv_properties_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#include <vector>
1010

1111
#include <opentelemetry/common/kv_properties.h>
12+
#include "opentelemetry/nostd/function_ref.h"
1213
#include "opentelemetry/nostd/string_view.h"
13-
#include "opentelemetry/nostd/utility.h"
1414

1515
// ------------------------- Entry class tests ---------------------------------
1616

api/test/common/spinlock_benchmark.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
#include <benchmark/benchmark.h>
5-
#include <stdint.h>
65
#include <algorithm>
76
#include <atomic>
7+
#include <cstdint>
88
#include <thread>
99
#include <vector>
1010

api/test/context/context_test.cc

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
#include "opentelemetry/context/context.h"
1010
#include "opentelemetry/context/context_value.h"
11-
#include "opentelemetry/nostd/shared_ptr.h"
1211
#include "opentelemetry/nostd/string_view.h"
1312
#include "opentelemetry/nostd/variant.h"
1413

api/test/context/propagation/composite_propagator_test.cc

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "opentelemetry/context/propagation/composite_propagator.h"
1414
#include "opentelemetry/context/propagation/text_map_propagator.h"
1515
#include "opentelemetry/context/runtime_context.h"
16+
#include "opentelemetry/nostd/function_ref.h"
1617
#include "opentelemetry/nostd/shared_ptr.h"
1718
#include "opentelemetry/nostd/span.h"
1819
#include "opentelemetry/nostd/string_view.h"

api/test/context/runtime_context_test.cc

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "opentelemetry/context/context.h"
1414
#include "opentelemetry/context/context_value.h"
1515
#include "opentelemetry/context/runtime_context.h"
16-
#include "opentelemetry/nostd/shared_ptr.h"
1716
#include "opentelemetry/nostd/string_view.h"
1817
#include "opentelemetry/nostd/unique_ptr.h"
1918
#include "opentelemetry/nostd/variant.h"

api/test/core/timestamp_test.cc

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <gtest/gtest.h>
55
#include <stdlib.h>
66
#include <chrono>
7+
#include <string>
78

89
#include "opentelemetry/common/timestamp.h"
910

api/test/logs/logger_benchmark.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <functional>
1010
#include <mutex>
1111
#include <thread>
12+
#include <utility>
1213
#include <vector>
1314

1415
#include "opentelemetry/common/key_value_iterable_view.h"
@@ -18,7 +19,6 @@
1819
#include "opentelemetry/logs/provider.h"
1920
#include "opentelemetry/logs/severity.h"
2021
#include "opentelemetry/nostd/shared_ptr.h"
21-
#include "opentelemetry/nostd/span.h"
2222
#include "opentelemetry/nostd/string_view.h"
2323

2424
using opentelemetry::logs::EventId;

api/test/logs/logger_test.cc

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "opentelemetry/nostd/span.h"
2323
#include "opentelemetry/nostd/string_view.h"
2424
#include "opentelemetry/nostd/unique_ptr.h"
25-
#include "opentelemetry/nostd/utility.h"
2625

2726
using opentelemetry::logs::EventId;
2827
using opentelemetry::logs::Logger;

api/test/logs/provider_test.cc

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
#include <string>
66

77
#include "opentelemetry/common/key_value_iterable.h"
8-
#include "opentelemetry/logs/event_logger.h"
8+
#include "opentelemetry/logs/event_logger.h" // IWYU pragma: keep
99
#include "opentelemetry/logs/event_logger_provider.h"
10-
#include "opentelemetry/logs/logger.h"
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"
1414
#include "opentelemetry/nostd/string_view.h"
15-
#include "opentelemetry/nostd/utility.h"
1615

1716
using opentelemetry::logs::EventLogger;
1817
using opentelemetry::logs::EventLoggerProvider;

api/test/metrics/meter_provider_test.cc

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#include <gtest/gtest.h>
55

6-
#include "opentelemetry/metrics/meter_provider.h"
76
#include "opentelemetry/metrics/noop.h"
87
#include "opentelemetry/metrics/provider.h"
98
#include "opentelemetry/nostd/shared_ptr.h"

api/test/metrics/noop_sync_instrument_test.cc

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <map>
77
#include <memory>
88
#include <string>
9+
#include <utility>
910

1011
#include "opentelemetry/context/context.h"
1112
#include "opentelemetry/metrics/noop.h"

api/test/nostd/function_ref_test.cc

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4+
#include <gtest/gtest.h>
5+
#include <string>
6+
47
#include "opentelemetry/nostd/function_ref.h"
58

6-
#include <gtest/gtest.h>
79
using namespace opentelemetry::nostd;
810

911
int Call(function_ref<int()> f)

api/test/nostd/shared_ptr_test.cc

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <gtest/gtest.h>
55
#include <stddef.h>
66
#include <algorithm>
7+
#include <string>
78
#include <utility>
89
#include <vector>
910

api/test/nostd/span_test.cc

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <array>
88
#include <iterator>
99
#include <list>
10+
#include <string>
1011
#include <type_traits>
1112
#include <vector>
1213

api/test/nostd/unique_ptr_test.cc

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
#include <gtest/gtest.h>
5+
#include <string>
56
#include <type_traits>
67
#include <utility>
78

api/test/nostd/utility_test.cc

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include <gtest/gtest.h>
55
#include <initializer_list>
6+
#include <string>
67
#include <tuple>
78
#include <type_traits>
89
#include <vector>

api/test/nostd/variant_test.cc

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33

44
#include "opentelemetry/nostd/variant.h"
55

6-
#include <string>
7-
#include <type_traits>
8-
96
#include <gtest/gtest.h>
7+
#include <string>
108

119
namespace nostd = opentelemetry::nostd;
1210

api/test/plugin/dynamic_load_test.cc

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <string>
66

77
#include "opentelemetry/plugin/dynamic_load.h"
8+
#include "opentelemetry/plugin/factory.h"
89

910
TEST(LoadFactoryTest, FailureTest)
1011
{

api/test/singleton/component_a.cc

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#include "opentelemetry/context/context_value.h"
54
#include "opentelemetry/nostd/shared_ptr.h"
65
#include "opentelemetry/trace/provider.h"
76
#include "opentelemetry/trace/scope.h"

api/test/singleton/component_b.cc

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#include "opentelemetry/context/context_value.h"
54
#include "opentelemetry/nostd/shared_ptr.h"
65
#include "opentelemetry/trace/provider.h"
76
#include "opentelemetry/trace/scope.h"

api/test/singleton/component_c.cc

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#include "opentelemetry/context/context_value.h"
54
#include "opentelemetry/nostd/shared_ptr.h"
65
#include "opentelemetry/trace/provider.h"
76
#include "opentelemetry/trace/scope.h"

api/test/singleton/component_d.cc

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#include "opentelemetry/context/context_value.h"
54
#include "opentelemetry/nostd/shared_ptr.h"
65
#include "opentelemetry/trace/provider.h"
76
#include "opentelemetry/trace/scope.h"

api/test/singleton/component_e.cc

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#include "opentelemetry/context/context_value.h"
54
#include "opentelemetry/nostd/shared_ptr.h"
65
#include "opentelemetry/trace/provider.h"
76
#include "opentelemetry/trace/scope.h"

api/test/singleton/component_f.cc

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#include "opentelemetry/context/context_value.h"
54
#include "opentelemetry/nostd/shared_ptr.h"
65
#include "opentelemetry/trace/provider.h"
76
#include "opentelemetry/trace/scope.h"

api/test/singleton/component_g.cc

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#include "opentelemetry/context/context_value.h"
54
#include "opentelemetry/nostd/shared_ptr.h"
65
#include "opentelemetry/trace/provider.h"
76
#include "opentelemetry/trace/scope.h"

api/test/singleton/component_h.cc

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#include "opentelemetry/context/context_value.h"
54
#include "opentelemetry/nostd/shared_ptr.h"
65
#include "opentelemetry/trace/provider.h"
76
#include "opentelemetry/trace/scope.h"

api/test/singleton/singleton_test.cc

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "opentelemetry/common/key_value_iterable.h"
2121
#include "opentelemetry/nostd/shared_ptr.h"
2222
#include "opentelemetry/nostd/string_view.h"
23-
#include "opentelemetry/nostd/utility.h"
2423
#include "opentelemetry/trace/default_span.h"
2524
#include "opentelemetry/trace/noop.h"
2625
#include "opentelemetry/trace/provider.h"

api/test/trace/key_value_iterable_view_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
#include "opentelemetry/common/attribute_value.h"
1111
#include "opentelemetry/common/key_value_iterable.h"
1212
#include "opentelemetry/common/key_value_iterable_view.h"
13+
#include "opentelemetry/nostd/function_ref.h"
1314
#include "opentelemetry/nostd/string_view.h"
1415
#include "opentelemetry/nostd/type_traits.h"
15-
#include "opentelemetry/nostd/utility.h"
1616

1717
using namespace opentelemetry;
1818

api/test/trace/noop_test.cc

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <vector>
1111

1212
#include "opentelemetry/common/timestamp.h"
13-
#include "opentelemetry/context/context_value.h"
1413
#include "opentelemetry/nostd/shared_ptr.h"
1514
#include "opentelemetry/nostd/span.h"
1615
#include "opentelemetry/nostd/unique_ptr.h"

api/test/trace/propagation/b3_propagation_test.cc

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "util.h"
1010

1111
#include "opentelemetry/context/context.h"
12-
#include "opentelemetry/context/context_value.h"
1312
#include "opentelemetry/context/propagation/text_map_propagator.h"
1413
#include "opentelemetry/context/runtime_context.h"
1514
#include "opentelemetry/nostd/shared_ptr.h"

api/test/trace/propagation/detail/hex_test.cc

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include <stdint.h>
66
#include <string>
77

8-
#include "opentelemetry/nostd/string_view.h"
98
#include "opentelemetry/trace/propagation/detail/hex.h"
109

1110
using namespace opentelemetry;

api/test/trace/propagation/http_text_format_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
#include "util.h"
1212

1313
#include "opentelemetry/context/context.h"
14-
#include "opentelemetry/context/context_value.h"
1514
#include "opentelemetry/context/propagation/global_propagator.h"
1615
#include "opentelemetry/context/propagation/text_map_propagator.h"
1716
#include "opentelemetry/context/runtime_context.h"
17+
#include "opentelemetry/nostd/function_ref.h"
1818
#include "opentelemetry/nostd/shared_ptr.h"
1919
#include "opentelemetry/nostd/span.h"
2020
#include "opentelemetry/nostd/string_view.h"

api/test/trace/propagation/jaeger_propagation_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
#include "util.h"
1212

1313
#include "opentelemetry/context/context.h"
14-
#include "opentelemetry/context/context_value.h"
1514
#include "opentelemetry/context/propagation/text_map_propagator.h"
1615
#include "opentelemetry/context/runtime_context.h"
16+
#include "opentelemetry/nostd/function_ref.h"
1717
#include "opentelemetry/nostd/shared_ptr.h"
1818
#include "opentelemetry/nostd/span.h"
1919
#include "opentelemetry/nostd/string_view.h"

api/test/trace/provider_test.cc

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include "opentelemetry/nostd/shared_ptr.h"
77
#include "opentelemetry/nostd/string_view.h"
88
#include "opentelemetry/trace/provider.h"
9-
#include "opentelemetry/trace/tracer.h"
109
#include "opentelemetry/trace/tracer_provider.h"
1110

1211
using opentelemetry::trace::Provider;

api/test/trace/scope_test.cc

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
#include <gtest/gtest.h>
5+
#include <string>
56

67
#include "opentelemetry/context/context_value.h"
78
#include "opentelemetry/context/runtime_context.h"

api/test/trace/span_benchmark.cc

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include <benchmark/benchmark.h>
55
#include <cstdint>
66

7-
#include "opentelemetry/context/context_value.h"
87
#include "opentelemetry/context/runtime_context.h"
98
#include "opentelemetry/nostd/shared_ptr.h"
109
#include "opentelemetry/nostd/span.h"

api/test/trace/span_context_test.cc

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "opentelemetry/trace/trace_id.h"
77

88
#include <gtest/gtest.h>
9+
#include <string>
910

1011
using opentelemetry::trace::SpanContext;
1112
namespace trace_api = opentelemetry::trace;

0 commit comments

Comments
 (0)