Skip to content

Commit ca12736

Browse files
marcalffmarcalff
committed
cleanup
1 parent 3902886 commit ca12736

17 files changed

+71
-43
lines changed

‎.iwyu.imp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
[
77
# Work around for C++ STL
88
{ "include": ["<bits/chrono.h>", "private", "<chrono>", "public"] },
9+
{ "include": ["<bits/std_abs.h>", "private", "<cstdlib>", "public"] },
10+
{ "include": ["<ext/alloc_traits.h>", "private", "<memory>", "public"] },
11+
{ "include": ["<bits/types/struct_tm.h>", "private", "<time.h>", "public"] },
12+
{ "include": ["<bits/types/struct_FILE.h>", "private", "<stdio.h>", "public"] },
913

1014
# Local opentelemetry-cpp style
1115

‎exporters/memory/include/opentelemetry/exporters/memory/in_memory_metric_data.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <tuple>
1111

1212
#include "opentelemetry/exporters/memory/in_memory_data.h"
13-
#include "opentelemetry/nostd/variant.h"
1413
#include "opentelemetry/sdk/metrics/data/metric_data.h"
1514
#include "opentelemetry/sdk/metrics/export/metric_producer.h"
1615
#include "opentelemetry/version.h"

‎exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
#include <chrono>
99
#include <memory>
1010
#include <ostream>
11-
#include <type_traits>
1211
#include <utility>
13-
#include <vector>
1412

1513
#include "opentelemetry/exporters/memory/in_memory_span_data.h"
1614
#include "opentelemetry/nostd/span.h"

‎exporters/memory/src/in_memory_metric_data.cc‎

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

4+
#include <utility>
5+
#include <vector>
6+
47
#include "opentelemetry/exporters/memory/in_memory_metric_data.h"
58
#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
69
#include "opentelemetry/sdk/metrics/export/metric_producer.h"
10+
#include "opentelemetry/sdk/metrics/instruments.h"
711

812
OPENTELEMETRY_BEGIN_NAMESPACE
913
namespace exporter

‎exporters/memory/src/in_memory_metric_exporter_factory.cc‎

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

4-
#include "opentelemetry/exporters/memory/in_memory_metric_exporter_factory.h"
4+
#include <atomic>
5+
#include <chrono>
6+
57
#include "opentelemetry/exporters/memory/in_memory_metric_data.h"
8+
#include "opentelemetry/exporters/memory/in_memory_metric_exporter_factory.h"
9+
#include "opentelemetry/sdk/common/exporter_utils.h"
610
#include "opentelemetry/sdk/common/global_log_handler.h"
711
#include "opentelemetry/sdk/metrics/export/metric_producer.h"
812
#include "opentelemetry/sdk/metrics/push_metric_exporter.h"

‎exporters/memory/test/in_memory_span_data_test.cc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
#include <gtest/gtest.h>
5+
#include <memory>
56
#include <utility>
7+
#include <vector>
68

79
#include "opentelemetry/exporters/memory/in_memory_span_data.h"
810
#include "opentelemetry/sdk/trace/span_data.h"

‎exporters/otlp/src/otlp_log_recordable.cc‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include "opentelemetry/logs/severity.h"
1111
#include "opentelemetry/nostd/span.h"
1212
#include "opentelemetry/nostd/string_view.h"
13-
#include "opentelemetry/proto/logs/v1/logs.pb.h"
1413
#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
1514
#include "opentelemetry/sdk/logs/readable_log_record.h"
1615
#include "opentelemetry/sdk/resource/resource.h"
@@ -19,6 +18,12 @@
1918
#include "opentelemetry/trace/trace_id.h"
2019
#include "opentelemetry/version.h"
2120

21+
// clang-format off
22+
#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
23+
#include "opentelemetry/proto/logs/v1/logs.pb.h"
24+
#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
25+
// clang-format on
26+
2227
OPENTELEMETRY_BEGIN_NAMESPACE
2328
namespace exporter
2429
{

‎exporters/otlp/test/otlp_file_client_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "opentelemetry/nostd/span.h"
2828
#include "opentelemetry/nostd/unique_ptr.h"
2929
#include "opentelemetry/nostd/variant.h"
30-
#include "opentelemetry/proto/trace/v1/trace.pb.h"
3130
#include "opentelemetry/sdk/common/exporter_utils.h"
3231
#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
3332
#include "opentelemetry/sdk/resource/resource.h"
@@ -43,6 +42,7 @@
4342
// clang-format off
4443
#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
4544
#include "opentelemetry/proto/collector/trace/v1/trace_service.pb.h"
45+
#include "opentelemetry/proto/trace/v1/trace.pb.h"
4646
#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
4747
// clang-format on
4848

‎exporters/otlp/test/otlp_file_exporter_test.cc‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#include <gtest/gtest.h>
55
#include <stddef.h>
6-
#include <algorithm>
76
#include <chrono>
87
#include <cstdint>
98
#include <functional>
@@ -39,10 +38,9 @@
3938
#include "opentelemetry/version.h"
4039

4140
// clang-format off
42-
#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
41+
#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
4342
#include "google/protobuf/message_lite.h"
44-
#include "opentelemetry/proto/collector/trace/v1/trace_service.pb.h"
45-
#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
43+
#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
4644
// clang-format on
4745

4846
using namespace testing;

‎exporters/otlp/test/otlp_file_log_record_exporter_test.cc‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_factory.h"
2121
#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_options.h"
2222
#include "opentelemetry/logs/logger.h"
23-
#include "opentelemetry/logs/provider.h"
2423
#include "opentelemetry/logs/severity.h"
2524
#include "opentelemetry/nostd/shared_ptr.h"
2625
#include "opentelemetry/nostd/span.h"
@@ -31,16 +30,15 @@
3130
#include "opentelemetry/sdk/logs/logger_provider.h"
3231
#include "opentelemetry/sdk/logs/processor.h"
3332
#include "opentelemetry/sdk/logs/recordable.h"
34-
#include "opentelemetry/sdk/resource/resource.h"
3533
#include "opentelemetry/trace/span_id.h"
3634
#include "opentelemetry/trace/trace_flags.h"
3735
#include "opentelemetry/trace/trace_id.h"
3836
#include "opentelemetry/version.h"
3937

4038
// clang-format off
41-
#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
42-
#include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h"
43-
#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
39+
#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
40+
#include <google/protobuf/message_lite.h>
41+
#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
4442
// clang-format on
4543

4644
using namespace testing;

0 commit comments

Comments
 (0)