Skip to content

Commit 6dbfdb5

Browse files
marcalffmarcalff
authored
[Code health] include-what-you-use cleanup, part 2 (#2704)
1 parent 0ff58e8 commit 6dbfdb5

File tree

86 files changed

+761
-338
lines changed

Some content is hidden

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

86 files changed

+761
-338
lines changed

‎.github/workflows/iwyu.yml

+8
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,18 @@ jobs:
3636
TOPDIR=`pwd`
3737
mkdir build && cd build
3838
CC="clang" CXX="clang++" cmake \
39+
-DCMAKE_CXX_STANDARD=14 \
40+
-DWITH_STL=CXX14 \
3941
-DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="include-what-you-use;-w;-Xiwyu;--mapping_file=${TOPDIR}/.iwyu.imp;" \
4042
-DBUILD_TESTING=OFF \
4143
-DWITH_DEPRECATED_SDK_FACTORY=OFF \
4244
-DBUILD_W3CTRACECONTEXT_TEST=OFF \
45+
-DWITH_OTLP_GRPC=OFF \
46+
-DWITH_OTLP_HTTP=ON \
47+
-DWITH_OTLP_FILE=ON \
48+
-DWITH_OTLP_HTTP_COMPRESSION=ON \
49+
-DWITH_ZIPKIN=ON \
50+
-DWITH_PROMETHEUS=OFF \
4351
..
4452
4553
- name: iwyu_tool

‎api/include/opentelemetry/std/shared_ptr.h

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

44
#pragma once
55

6-
#include <memory>
6+
// IWYU pragma: private, include "opentelemetry/nostd/shared_ptr.h"
7+
8+
#include <memory> // IWYU pragma: export
79

810
#include "opentelemetry/version.h"
911

‎api/include/opentelemetry/std/span.h

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

44
#pragma once
55

6+
// IWYU pragma: private, include "opentelemetry/nostd/span.h"
7+
68
#include "opentelemetry/version.h"
79

810
// Standard library implementation requires at least C++17 compiler.

‎api/include/opentelemetry/std/string_view.h

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

44
#pragma once
55

6+
// IWYU pragma: private, include "opentelemetry/nostd/string_view.h"
7+
68
#include <string_view>
79

810
#include "opentelemetry/version.h"

‎api/include/opentelemetry/std/type_traits.h

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

44
#pragma once
55

6+
// IWYU pragma: private, include "opentelemetry/nostd/type_traits.h"
7+
68
#include <type_traits>
79

810
#include "opentelemetry/version.h"

‎api/include/opentelemetry/std/unique_ptr.h

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

44
#pragma once
55

6-
#include <memory>
6+
// IWYU pragma: private, include "opentelemetry/nostd/unique_ptr.h"
7+
8+
#include <memory> // IWYU pragma: export
79

810
#include "opentelemetry/version.h"
911

‎api/include/opentelemetry/std/utility.h

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

44
#pragma once
55

6+
// IWYU pragma: private, include "opentelemetry/nostd/utility.h"
7+
68
#include <cstddef>
79
#include <utility>
810

‎api/include/opentelemetry/std/variant.h

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

44
#pragma once
55

6+
// IWYU pragma: private, include "opentelemetry/nostd/variant.h"
7+
68
#include "opentelemetry/version.h"
79

810
#include <cstddef>

‎cmake/opentelemetry-proto.cmake

+6
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,12 @@ add_library(
326326
${LOGS_SERVICE_PB_CPP_FILE}
327327
${METRICS_SERVICE_PB_CPP_FILE})
328328

329+
# Disable include-what-you-use on generated code.
330+
set_target_properties(
331+
opentelemetry_proto
332+
PROPERTIES CXX_INCLUDE_WHAT_YOU_USE ""
333+
)
334+
329335
if(WITH_ABSEIL)
330336
target_link_libraries(opentelemetry_proto PUBLIC absl::bad_variant_access)
331337
endif()

‎examples/batch/main.cc

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
#include <stdio.h>
66
#include <chrono>
77
#include <iostream>
8-
#include <memory>
98
#include <string>
109
#include <thread>
1110
#include <utility>
1211

1312
#include "opentelemetry/exporters/ostream/span_exporter_factory.h"
14-
#include "opentelemetry/nostd/detail/decay.h"
1513
#include "opentelemetry/nostd/shared_ptr.h"
1614
#include "opentelemetry/sdk/resource/resource.h"
1715
#include "opentelemetry/sdk/trace/batch_span_processor_factory.h"
@@ -30,7 +28,6 @@ namespace trace_api = opentelemetry::trace;
3028
namespace resource = opentelemetry::sdk::resource;
3129
namespace trace_sdk = opentelemetry::sdk::trace;
3230
namespace trace_exporter = opentelemetry::exporter::trace;
33-
namespace nostd = opentelemetry::nostd;
3431

3532
namespace
3633
{
@@ -69,7 +66,7 @@ void CleanupTracer()
6966
trace_api::Provider::SetTracerProvider(none);
7067
}
7168

72-
nostd::shared_ptr<trace_api::Tracer> get_tracer()
69+
opentelemetry::nostd::shared_ptr<trace_api::Tracer> get_tracer()
7370
{
7471
auto provider = trace_api::Provider::GetTracerProvider();
7572
return provider->GetTracer("foo_library");

‎examples/common/foo_library/foo_library.cc

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

44
#include "opentelemetry/context/context_value.h"
55
#include "opentelemetry/nostd/shared_ptr.h"
6-
#include "opentelemetry/nostd/unique_ptr.h"
76
#include "opentelemetry/sdk/version/version.h"
87
#include "opentelemetry/trace/provider.h"
98
#include "opentelemetry/trace/scope.h"

‎examples/common/logs_foo_library/foo_library.cc

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,16 @@
1616

1717
namespace logs = opentelemetry::logs;
1818
namespace trace = opentelemetry::trace;
19-
namespace nostd = opentelemetry::nostd;
2019

2120
namespace
2221
{
23-
nostd::shared_ptr<trace::Tracer> get_tracer()
22+
opentelemetry::nostd::shared_ptr<trace::Tracer> get_tracer()
2423
{
2524
auto provider = trace::Provider::GetTracerProvider();
2625
return provider->GetTracer("foo_library", OPENTELEMETRY_SDK_VERSION);
2726
}
2827

29-
nostd::shared_ptr<logs::Logger> get_logger()
28+
opentelemetry::nostd::shared_ptr<logs::Logger> get_logger()
3029
{
3130
auto provider = logs::Provider::GetLoggerProvider();
3231
return provider->GetLogger("foo_library_logger", "foo_library");

‎examples/common/metrics_foo_library/foo_library.cc

+19-17
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
#include "opentelemetry/metrics/meter_provider.h"
1818
#include "opentelemetry/metrics/observer_result.h"
1919
#include "opentelemetry/metrics/provider.h"
20+
#include "opentelemetry/metrics/sync_instruments.h"
2021
#include "opentelemetry/nostd/shared_ptr.h"
21-
#include "opentelemetry/nostd/unique_ptr.h"
2222
#include "opentelemetry/nostd/variant.h"
2323

24-
namespace nostd = opentelemetry::nostd;
2524
namespace metrics_api = opentelemetry::metrics;
2625

2726
namespace
2827
{
2928

30-
static nostd::shared_ptr<metrics_api::ObservableInstrument> double_observable_counter;
29+
static opentelemetry::nostd::shared_ptr<metrics_api::ObservableInstrument>
30+
double_observable_counter;
3131

3232
std::map<std::string, std::string> get_random_attr()
3333
{
@@ -45,13 +45,15 @@ class MeasurementFetcher
4545
public:
4646
static void Fetcher(opentelemetry::metrics::ObserverResult observer_result, void * /* state */)
4747
{
48-
if (nostd::holds_alternative<
49-
nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<double>>>(observer_result))
48+
if (opentelemetry::nostd::holds_alternative<
49+
opentelemetry::nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<double>>>(
50+
observer_result))
5051
{
5152
double random_incr = (rand() % 5) + 1.1;
5253
value_ += random_incr;
5354
std::map<std::string, std::string> labels = get_random_attr();
54-
nostd::get<nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<double>>>(
55+
opentelemetry::nostd::get<
56+
opentelemetry::nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<double>>>(
5557
observer_result)
5658
->Observe(value_, labels);
5759
}
@@ -63,10 +65,10 @@ double MeasurementFetcher::value_ = 0.0;
6365

6466
void foo_library::counter_example(const std::string &name)
6567
{
66-
std::string counter_name = name + "_counter";
67-
auto provider = metrics_api::Provider::GetMeterProvider();
68-
nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter(name, "1.2.0");
69-
auto double_counter = meter->CreateDoubleCounter(counter_name);
68+
std::string counter_name = name + "_counter";
69+
auto provider = metrics_api::Provider::GetMeterProvider();
70+
opentelemetry::nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter(name, "1.2.0");
71+
auto double_counter = meter->CreateDoubleCounter(counter_name);
7072

7173
for (uint32_t i = 0; i < 20; ++i)
7274
{
@@ -78,10 +80,10 @@ void foo_library::counter_example(const std::string &name)
7880

7981
void foo_library::observable_counter_example(const std::string &name)
8082
{
81-
std::string counter_name = name + "_observable_counter";
82-
auto provider = metrics_api::Provider::GetMeterProvider();
83-
nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter(name, "1.2.0");
84-
double_observable_counter = meter->CreateDoubleObservableCounter(counter_name);
83+
std::string counter_name = name + "_observable_counter";
84+
auto provider = metrics_api::Provider::GetMeterProvider();
85+
opentelemetry::nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter(name, "1.2.0");
86+
double_observable_counter = meter->CreateDoubleObservableCounter(counter_name);
8587
double_observable_counter->AddCallback(MeasurementFetcher::Fetcher, nullptr);
8688
for (uint32_t i = 0; i < 20; ++i)
8789
{
@@ -91,9 +93,9 @@ void foo_library::observable_counter_example(const std::string &name)
9193

9294
void foo_library::histogram_example(const std::string &name)
9395
{
94-
std::string histogram_name = name + "_histogram";
95-
auto provider = metrics_api::Provider::GetMeterProvider();
96-
nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter(name, "1.2.0");
96+
std::string histogram_name = name + "_histogram";
97+
auto provider = metrics_api::Provider::GetMeterProvider();
98+
opentelemetry::nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter(name, "1.2.0");
9799
auto histogram_counter = meter->CreateDoubleHistogram(histogram_name, "des", "unit");
98100
auto context = opentelemetry::context::Context{};
99101
for (uint32_t i = 0; i < 20; ++i)

‎examples/multithreaded/main.cc

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

44
#include <algorithm>
5-
#include <memory>
65
#include <string>
76
#include <thread>
87
#include <utility>
98
#include <vector>
109

1110
#include "opentelemetry/exporters/ostream/span_exporter_factory.h"
12-
#include "opentelemetry/nostd/detail/decay.h"
1311
#include "opentelemetry/nostd/shared_ptr.h"
1412
#include "opentelemetry/sdk/resource/resource.h"
1513
#include "opentelemetry/sdk/trace/processor.h"
@@ -25,7 +23,6 @@
2523

2624
namespace trace_api = opentelemetry::trace;
2725
namespace trace_sdk = opentelemetry::sdk::trace;
28-
namespace nostd = opentelemetry::nostd;
2926

3027
namespace
3128
{
@@ -46,7 +43,7 @@ void CleanupTracer()
4643
trace_api::Provider::SetTracerProvider(none);
4744
}
4845

49-
nostd::shared_ptr<trace_api::Tracer> get_tracer()
46+
opentelemetry::nostd::shared_ptr<trace_api::Tracer> get_tracer()
5047
{
5148
auto provider = trace_api::Provider::GetTracerProvider();
5249
return provider->GetTracer("foo_library");

‎examples/otlp/file_log_main.cc

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

4+
#include <functional>
5+
#include <iostream>
6+
#include <string>
7+
#include <utility>
8+
49
#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
510
#include "opentelemetry/exporters/otlp/otlp_file_exporter_factory.h"
611
#include "opentelemetry/exporters/otlp/otlp_file_exporter_options.h"
712
#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_factory.h"
813
#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_options.h"
14+
#include "opentelemetry/logs/log_record.h"
15+
#include "opentelemetry/logs/logger_provider.h"
916
#include "opentelemetry/logs/provider.h"
10-
#include "opentelemetry/sdk/logs/exporter.h"
17+
#include "opentelemetry/nostd/shared_ptr.h"
1118
#include "opentelemetry/sdk/logs/logger_provider.h"
1219
#include "opentelemetry/sdk/logs/logger_provider_factory.h"
13-
#include "opentelemetry/sdk/logs/processor.h"
20+
#include "opentelemetry/sdk/logs/recordable.h"
1421
#include "opentelemetry/sdk/logs/simple_log_record_processor_factory.h"
15-
#include "opentelemetry/sdk/trace/exporter.h"
1622
#include "opentelemetry/sdk/trace/processor.h"
23+
#include "opentelemetry/sdk/trace/recordable.h"
1724
#include "opentelemetry/sdk/trace/simple_processor_factory.h"
1825
#include "opentelemetry/sdk/trace/tracer_provider.h"
1926
#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
2027
#include "opentelemetry/trace/provider.h"
21-
22-
#include <iostream>
23-
#include <string>
24-
#include <utility>
28+
#include "opentelemetry/trace/span_id.h"
29+
#include "opentelemetry/trace/tracer_provider.h"
2530

2631
#ifdef BAZEL_BUILD
2732
# include "examples/common/logs_foo_library/foo_library.h"

‎examples/otlp/file_main.cc

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

4+
#include <memory>
5+
#include <string>
6+
#include <utility>
7+
8+
#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
49
#include "opentelemetry/exporters/otlp/otlp_file_exporter_factory.h"
10+
#include "opentelemetry/exporters/otlp/otlp_file_exporter_options.h"
511
#include "opentelemetry/sdk/trace/processor.h"
12+
#include "opentelemetry/sdk/trace/recordable.h"
613
#include "opentelemetry/sdk/trace/simple_processor_factory.h"
714
#include "opentelemetry/sdk/trace/tracer_provider.h"
815
#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
916
#include "opentelemetry/trace/provider.h"
10-
11-
#include <iostream>
12-
#include <string>
13-
#include <utility>
17+
#include "opentelemetry/trace/span_id.h"
18+
#include "opentelemetry/trace/tracer_provider.h"
1419

1520
#ifdef BAZEL_BUILD
1621
# include "examples/common/foo_library/foo_library.h"

‎examples/otlp/file_metric_main.cc

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

4+
#include <chrono>
5+
#include <memory>
6+
#include <string>
7+
#include <thread>
8+
#include <utility>
9+
10+
#include "opentelemetry/common/attribute_value.h"
11+
#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
412
#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_factory.h"
13+
#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_options.h"
14+
#include "opentelemetry/metrics/meter_provider.h"
515
#include "opentelemetry/metrics/provider.h"
6-
#include "opentelemetry/sdk/metrics/aggregation/default_aggregation.h"
7-
#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h"
816
#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h"
9-
#include "opentelemetry/sdk/metrics/meter.h"
17+
#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h"
18+
#include "opentelemetry/sdk/metrics/meter_context.h"
1019
#include "opentelemetry/sdk/metrics/meter_context_factory.h"
11-
#include "opentelemetry/sdk/metrics/meter_provider.h"
1220
#include "opentelemetry/sdk/metrics/meter_provider_factory.h"
13-
14-
#include <iostream>
15-
#include <memory>
16-
#include <string>
17-
#include <thread>
18-
#include <utility>
21+
#include "opentelemetry/sdk/metrics/metric_reader.h"
22+
#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
23+
#include "opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h"
1924

2025
#ifdef BAZEL_BUILD
2126
# include "examples/common/metrics_foo_library/foo_library.h"

0 commit comments

Comments
 (0)