Skip to content

Commit f97dc06

Browse files
authored
[Code health] include-what-you-use cleanup (#2692)
1 parent fad93f0 commit f97dc06

103 files changed

Lines changed: 879 additions & 394 deletions

File tree

Some content is hidden

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

.github/workflows/iwyu.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
CC="clang" CXX="clang++" cmake \
3939
-DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="include-what-you-use;-w;-Xiwyu;--mapping_file=${TOPDIR}/.iwyu.imp;" \
4040
-DBUILD_TESTING=OFF \
41+
-DWITH_DEPRECATED_SDK_FACTORY=OFF \
4142
-DBUILD_W3CTRACECONTEXT_TEST=OFF \
4243
..
4344

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ Increment the:
2424
* [API/SDK] Provider cleanup
2525
[#2664](https://github.com/open-telemetry/opentelemetry-cpp/pull/2664)
2626

27+
* [Code health] include-what-you-use cleanup
28+
[#2692](https://github.com/open-telemetry/opentelemetry-cpp/pull/2692)
29+
2730
Important changes:
2831

2932
* [API/SDK] Provider cleanup

api/include/opentelemetry/nostd/type_traits.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# include <type_traits>
1616

1717
# include "opentelemetry/config.h"
18-
# include "opentelemetry/nostd/detail/void.h"
18+
# include "opentelemetry/nostd/detail/void.h" // IWYU pragma: export
1919
# include "opentelemetry/version.h"
2020

2121
OPENTELEMETRY_BEGIN_NAMESPACE

api/include/opentelemetry/nostd/utility.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
# include <initializer_list>
1616
# include <type_traits>
1717

18-
# include "opentelemetry/nostd/detail/decay.h"
19-
# include "opentelemetry/nostd/detail/invoke.h"
18+
# include "opentelemetry/nostd/detail/decay.h" // IWYU pragma: export
19+
# include "opentelemetry/nostd/detail/invoke.h" // IWYU pragma: export
2020
# include "opentelemetry/version.h"
2121

2222
OPENTELEMETRY_BEGIN_NAMESPACE

api/include/opentelemetry/plugin/detail/dynamic_load_unix.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33

44
#pragma once
55

6+
#include <dlfcn.h>
67
#include <algorithm>
78
#include <memory>
89

9-
#include <dlfcn.h>
10-
1110
#include "opentelemetry/plugin/detail/dynamic_library_handle.h"
1211
#include "opentelemetry/plugin/detail/loader_info.h"
1312
#include "opentelemetry/plugin/detail/utility.h"

api/include/opentelemetry/plugin/dynamic_load.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
#include <string>
88

99
#ifdef _WIN32
10-
# include "opentelemetry/plugin/detail/dynamic_load_windows.h"
10+
# include "opentelemetry/plugin/detail/dynamic_load_windows.h" // IWYU pragma: export
1111
#else
12-
# include "opentelemetry/plugin/detail/dynamic_load_unix.h"
12+
# include "opentelemetry/plugin/detail/dynamic_load_unix.h" // IWYU pragma: export
1313
#endif
1414
#include "opentelemetry/version.h"
1515

api/include/opentelemetry/plugin/factory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <memory>
77
#include <string>
88

9-
#include "opentelemetry/plugin/detail/utility.h"
9+
#include "opentelemetry/plugin/detail/utility.h" // IWYU pragma: export
1010
#include "opentelemetry/plugin/tracer.h"
1111
#include "opentelemetry/version.h"
1212

api/include/opentelemetry/plugin/tracer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <memory>
77

88
#include "opentelemetry/common/key_value_iterable.h"
9-
#include "opentelemetry/plugin/detail/tracer_handle.h"
9+
#include "opentelemetry/plugin/detail/tracer_handle.h" // IWYU pragma: export
1010
#include "opentelemetry/trace/span_context_kv_iterable.h"
1111
#include "opentelemetry/trace/tracer.h"
1212
#include "opentelemetry/version.h"

examples/batch/main.cc

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,29 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4+
#include <stdint.h>
5+
#include <stdio.h>
6+
#include <chrono>
7+
#include <iostream>
8+
#include <memory>
9+
#include <string>
10+
#include <thread>
11+
#include <utility>
12+
413
#include "opentelemetry/exporters/ostream/span_exporter_factory.h"
14+
#include "opentelemetry/nostd/detail/decay.h"
15+
#include "opentelemetry/nostd/shared_ptr.h"
516
#include "opentelemetry/sdk/resource/resource.h"
617
#include "opentelemetry/sdk/trace/batch_span_processor_factory.h"
718
#include "opentelemetry/sdk/trace/batch_span_processor_options.h"
8-
#include "opentelemetry/sdk/trace/exporter.h"
919
#include "opentelemetry/sdk/trace/processor.h"
20+
#include "opentelemetry/sdk/trace/recordable.h"
21+
#include "opentelemetry/sdk/trace/tracer_provider.h"
1022
#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
1123
#include "opentelemetry/trace/provider.h"
12-
13-
#include <chrono>
14-
#include <thread>
24+
#include "opentelemetry/trace/span_id.h"
25+
#include "opentelemetry/trace/tracer.h"
26+
#include "opentelemetry/trace/tracer_provider.h"
1527

1628
constexpr int kNumSpans = 10;
1729
namespace trace_api = opentelemetry::trace;

examples/common/foo_library/foo_library.cc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4+
#include "opentelemetry/context/context_value.h"
5+
#include "opentelemetry/nostd/shared_ptr.h"
6+
#include "opentelemetry/nostd/unique_ptr.h"
47
#include "opentelemetry/sdk/version/version.h"
58
#include "opentelemetry/trace/provider.h"
9+
#include "opentelemetry/trace/scope.h"
10+
#include "opentelemetry/trace/tracer.h"
11+
#include "opentelemetry/trace/tracer_provider.h"
612

713
namespace trace = opentelemetry::trace;
814
namespace nostd = opentelemetry::nostd;

0 commit comments

Comments
 (0)