Skip to content

Commit 5173c79

Browse files
marcalffmarcalff
committed
cleanup
1 parent f23610e commit 5173c79

File tree

15 files changed

+116
-45
lines changed

15 files changed

+116
-45
lines changed

‎CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,11 +365,16 @@ if(WITH_PROMETHEUS)
365365
if(EXISTS ${PROJECT_SOURCE_DIR}/third_party/prometheus-cpp/.git)
366366
set(SAVED_ENABLE_TESTING ${ENABLE_TESTING})
367367
set(SAVED_CMAKE_CXX_CLANG_TIDY ${CMAKE_CXX_CLANG_TIDY})
368+
set(SAVED_CMAKE_CXX_INCLUDE_WHAT_YOU_USE
369+
${CMAKE_CXX_INCLUDE_WHAT_YOU_USE})
368370
set(ENABLE_TESTING OFF)
369371
set(CMAKE_CXX_CLANG_TIDY "")
372+
set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE "")
370373
add_subdirectory(third_party/prometheus-cpp)
371374
set(ENABLE_TESTING ${SAVED_ENABLE_TESTING})
372375
set(CMAKE_CXX_CLANG_TIDY ${SAVED_CMAKE_CXX_CLANG_TIDY})
376+
set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE
377+
${SAVED_CMAKE_CXX_INCLUDE_WHAT_YOU_USE})
373378
else()
374379
message(
375380
FATAL_ERROR

‎cmake/opentelemetry-proto.cmake‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,9 @@ if(WITH_OTLP_GRPC)
342342
${LOGS_SERVICE_GRPC_PB_CPP_FILE} ${METRICS_SERVICE_GRPC_PB_CPP_FILE})
343343
set_target_version(opentelemetry_proto_grpc)
344344

345+
# Disable include-what-you-use on generated code.
346+
set_target_properties(opentelemetry_proto_grpc PROPERTIES CXX_INCLUDE_WHAT_YOU_USE "")
347+
345348
list(APPEND OPENTELEMETRY_PROTO_TARGETS opentelemetry_proto_grpc)
346349
target_link_libraries(opentelemetry_proto_grpc PUBLIC opentelemetry_proto)
347350

‎examples/grpc/CMakeLists.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ add_library(example_grpc_proto ${example_grpc_srcs} ${example_grpc_hdrs}
2525

2626
patch_protobuf_targets(example_grpc_proto)
2727

28+
# Disable include-what-you-use on generated code.
29+
set_target_properties(example_grpc_proto PROPERTIES CXX_INCLUDE_WHAT_YOU_USE "")
30+
2831
include_directories(
2932
${CMAKE_SOURCE_DIR}/exporters/ostream/include ${CMAKE_SOURCE_DIR}/ext/include
3033
${CMAKE_SOURCE_DIR}/api/include/ ${CMAKE_SOURCE_DIR/})

‎examples/grpc/client.cc‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,30 @@
55
// ambiguity with `nostd::variant` if compiled with Visual Studio 2015. Other
66
// modern compilers are unaffected.
77
#include <grpcpp/grpcpp.h>
8+
9+
#include <stdint.h>
10+
#include <stdlib.h>
11+
#include <iostream>
12+
#include <string>
13+
#include <utility>
14+
#include "opentelemetry/context/propagation/global_propagator.h"
15+
#include "opentelemetry/context/propagation/text_map_propagator.h"
16+
#include "opentelemetry/context/runtime_context.h"
17+
#include "opentelemetry/nostd/shared_ptr.h"
18+
#include "opentelemetry/trace/propagation/http_trace_context.h"
19+
#include "opentelemetry/trace/span.h"
20+
#include "opentelemetry/trace/span_metadata.h"
21+
#include "opentelemetry/trace/span_startoptions.h"
22+
#include "opentelemetry/trace/tracer.h"
23+
824
#ifdef BAZEL_BUILD
925
# include "examples/grpc/protos/messages.grpc.pb.h"
26+
# include "examples/grpc/protos/messages.pb.h"
1027
#else
1128
# include "messages.grpc.pb.h"
29+
# include "messages.pb.h"
1230
#endif
1331

14-
#include <iostream>
15-
#include <memory>
16-
#include <string>
17-
1832
#include "opentelemetry/semconv/incubating/rpc_attributes.h"
1933
#include "opentelemetry/semconv/network_attributes.h"
2034
#include "tracer_common.h"

‎examples/grpc/server.cc‎

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

4-
#ifdef BAZEL_BUILD
5-
# include "examples/grpc/protos/messages.grpc.pb.h"
6-
#else
7-
# include "messages.grpc.pb.h"
8-
#endif
9-
10-
#include "opentelemetry/semconv/incubating/rpc_attributes.h"
11-
#include "opentelemetry/trace/context.h"
12-
#include "opentelemetry/trace/span_context_kv_iterable_view.h"
13-
#include "tracer_common.h"
14-
154
#include <grpcpp/grpcpp.h>
5+
#include <grpcpp/security/server_credentials.h>
166
#include <grpcpp/server.h>
177
#include <grpcpp/server_builder.h>
188
#include <grpcpp/server_context.h>
19-
20-
#include <chrono>
21-
#include <fstream>
9+
#include <grpcpp/support/status.h>
10+
#include <grpcpp/support/string_ref.h>
11+
#include <stdint.h>
12+
#include <stdlib.h>
13+
#include <iostream>
2214
#include <map>
23-
#include <sstream>
2415
#include <string>
25-
#include <thread>
16+
#include <utility>
17+
18+
#include "opentelemetry/context/propagation/global_propagator.h"
19+
#include "opentelemetry/context/propagation/text_map_propagator.h"
20+
#include "opentelemetry/context/runtime_context.h"
21+
#include "opentelemetry/nostd/shared_ptr.h"
22+
#include "opentelemetry/nostd/variant.h"
23+
#include "opentelemetry/semconv/incubating/rpc_attributes.h"
24+
#include "opentelemetry/trace/context.h"
25+
#include "opentelemetry/trace/span.h"
26+
#include "opentelemetry/trace/span_context_kv_iterable_view.h"
27+
#include "opentelemetry/trace/span_metadata.h"
28+
#include "opentelemetry/trace/span_startoptions.h"
29+
#include "opentelemetry/trace/tracer.h"
30+
#include "tracer_common.h"
31+
32+
#ifdef BAZEL_BUILD
33+
# include "examples/grpc/protos/messages.grpc.pb.h"
34+
# include "examples/grpc/protos/messages.pb.h"
35+
#else
36+
# include "messages.grpc.pb.h"
37+
# include "messages.pb.h"
38+
#endif
2639

2740
using grpc::Server;
2841
using grpc::ServerBuilder;

‎examples/prometheus/main.cc‎

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

4+
#include <cstdio>
45
#include <memory>
6+
#include <string>
57
#include <thread>
8+
#include <utility>
69

10+
#include "opentelemetry/common/attribute_value.h"
711
#include "opentelemetry/exporters/prometheus/exporter_factory.h"
812
#include "opentelemetry/exporters/prometheus/exporter_options.h"
13+
#include "opentelemetry/metrics/meter_provider.h"
914
#include "opentelemetry/metrics/provider.h"
10-
#include "opentelemetry/sdk/metrics/aggregation/default_aggregation.h"
11-
#include "opentelemetry/sdk/metrics/aggregation/histogram_aggregation.h"
12-
#include "opentelemetry/sdk/metrics/meter.h"
15+
#include "opentelemetry/sdk/metrics/instruments.h"
1316
#include "opentelemetry/sdk/metrics/meter_provider.h"
1417
#include "opentelemetry/sdk/metrics/meter_provider_factory.h"
18+
#include "opentelemetry/sdk/metrics/metric_reader.h"
19+
#include "opentelemetry/sdk/metrics/view/instrument_selector.h"
1520
#include "opentelemetry/sdk/metrics/view/instrument_selector_factory.h"
21+
#include "opentelemetry/sdk/metrics/view/meter_selector.h"
1622
#include "opentelemetry/sdk/metrics/view/meter_selector_factory.h"
23+
#include "opentelemetry/sdk/metrics/view/view.h"
1724
#include "opentelemetry/sdk/metrics/view/view_factory.h"
1825

1926
#ifdef BAZEL_BUILD

‎exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_utils.h‎

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

66
#include <grpcpp/grpcpp.h>
77

8-
#include "opentelemetry/sdk/version/version.h"
8+
#include "opentelemetry/version.h"
99

1010
OPENTELEMETRY_BEGIN_NAMESPACE
1111

‎exporters/otlp/src/otlp_file_client.cc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
#include <utility>
2121
#include <vector>
2222

23+
// IWYU pragma: no_include <features.h>
24+
2325
#if defined(HAVE_GSL)
2426
# include <gsl/gsl>
2527
#else
@@ -60,6 +62,7 @@
6062

6163
# include <fcntl.h>
6264
# include <sys/stat.h>
65+
# include <sys/types.h>
6366
# include <unistd.h>
6467

6568
# define FS_ACCESS(x) access(x, F_OK)

‎exporters/otlp/test/otlp_file_client_test.cc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#include <utility>
1717
#include <vector>
1818

19+
// IWYU pragma: no_include <features.h>
20+
1921
#include "opentelemetry/common/timestamp.h"
2022
#include "opentelemetry/exporters/otlp/otlp_file_client.h"
2123
#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"

‎exporters/prometheus/include/opentelemetry/exporters/prometheus/collector.h‎

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

44
#pragma once
55

6-
#include <memory>
6+
#include <prometheus/collectable.h>
7+
#include <prometheus/metric_family.h>
78
#include <mutex>
89
#include <vector>
910

10-
#include <prometheus/collectable.h>
11-
#include <prometheus/metric_family.h>
1211
#include "opentelemetry/exporters/prometheus/exporter_utils.h"
1312
#include "opentelemetry/sdk/metrics/metric_reader.h"
13+
#include "opentelemetry/version.h"
1414

1515
namespace prometheus_client = ::prometheus;
1616

0 commit comments

Comments
 (0)