Skip to content

Commit c6d3945

Browse files
marcalffmarcalff
authored
[Code Health] include-what-you-use cleanup, part 4 (open-telemetry#3040)
1 parent c37df23 commit c6d3945

File tree

89 files changed

+912
-305
lines changed

Some content is hidden

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

89 files changed

+912
-305
lines changed

‎.iwyu.imp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,16 @@
77
# Work around for C++ STL
88
{ "include": ["<bits/chrono.h>", "private", "<chrono>", "public"] },
99

10-
# Local opentelemetry-cpp
10+
# Local opentelemetry-cpp style
1111

12+
# We prefer to include <gtest/gtest.h> for simplicity
1213
{ "include": ["<gtest/gtest-message.h>", "private", "<gtest/gtest.h>", "public"] },
1314
{ "include": ["<gtest/gtest-test-part.h>", "private", "<gtest/gtest.h>", "public"] },
15+
{ "include": ["<gtest/gtest-param-test.h>", "private", "<gtest/gtest.h>", "public"] },
1416
{ "include": ["<gtest/gtest_pred_impl.h>", "private", "<gtest/gtest.h>", "public"] },
17+
18+
# We prefer to include <gmock/gmock.h> for simplicity
19+
{ "include": ["<gmock/gmock-function-mocker.h>", "private", "<gmock/gmock.h>", "public"] },
20+
{ "include": ["<gmock/gmock-spec-builders.h>", "private", "<gmock/gmock.h>", "public"] },
1521
]
1622

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

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

44
#pragma once
55

6+
#include <stddef.h>
7+
#include <memory>
8+
#include <vector>
9+
610
#include "opentelemetry/exporters/memory/in_memory_data.h"
7-
#include "opentelemetry/sdk/trace/recordable.h"
811
#include "opentelemetry/sdk/trace/span_data.h"
9-
10-
#include <vector>
12+
#include "opentelemetry/version.h"
1113

1214
OPENTELEMETRY_BEGIN_NAMESPACE
1315
namespace exporter

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,20 @@
33

44
#pragma once
55

6+
#include <stddef.h>
67
#include <atomic>
7-
#include <mutex>
8+
#include <chrono>
9+
#include <memory>
10+
#include <ostream>
11+
#include <utility>
812

913
#include "opentelemetry/exporters/memory/in_memory_span_data.h"
14+
#include "opentelemetry/nostd/span.h"
15+
#include "opentelemetry/sdk/common/exporter_utils.h"
16+
#include "opentelemetry/sdk/common/global_log_handler.h"
1017
#include "opentelemetry/sdk/trace/exporter.h"
18+
#include "opentelemetry/sdk/trace/recordable.h"
1119
#include "opentelemetry/sdk/trace/span_data.h"
12-
#include "opentelemetry/sdk_config.h"
1320
#include "opentelemetry/version.h"
1421

1522
OPENTELEMETRY_BEGIN_NAMESPACE

‎exporters/zipkin/src/zipkin_exporter.cc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <memory>
1111
#include <ostream>
1212
#include <string>
13+
#include <utility>
1314

1415
#include "nlohmann/json.hpp"
1516

‎ext/include/opentelemetry/ext/http/common/url_parser.h‎

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

44
#pragma once
55

6+
#include <stdlib.h>
67
#include <cstdint>
78
#include <string>
8-
#include <vector>
9-
#include "opentelemetry/nostd/string_view.h"
9+
1010
#include "opentelemetry/version.h"
11+
1112
OPENTELEMETRY_BEGIN_NAMESPACE
1213
namespace ext
1314
{

‎ext/test/http/curl_http_test.cc‎

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

4-
#include "opentelemetry/ext//http/client/curl/http_client_curl.h"
5-
#include "opentelemetry/ext/http/client/http_client_factory.h"
6-
#include "opentelemetry/ext/http/server/http_server.h"
7-
8-
#include <assert.h>
4+
#include <gtest/gtest.h>
5+
#include <string.h>
96
#include <atomic>
107
#include <chrono>
118
#include <condition_variable>
129
#include <fstream>
10+
#include <map>
1311
#include <memory>
14-
#include <thread>
12+
#include <mutex>
13+
#include <string>
1514
#include <utility>
1615
#include <vector>
1716

18-
#define HTTP_PORT 19000
17+
#include "opentelemetry/ext//http/client/curl/http_client_curl.h"
18+
#include "opentelemetry/ext/http/client/curl/http_operation_curl.h"
19+
#include "opentelemetry/ext/http/client/http_client.h"
20+
#include "opentelemetry/ext/http/client/http_client_factory.h"
21+
#include "opentelemetry/ext/http/server/http_server.h"
22+
#include "opentelemetry/nostd/function_ref.h"
23+
#include "opentelemetry/nostd/string_view.h"
1924

20-
#include <gtest/gtest.h>
25+
#define HTTP_PORT 19000
2126

2227
namespace curl = opentelemetry::ext::http::client::curl;
2328
namespace http_client = opentelemetry::ext::http::client;

‎ext/test/http/url_parser_test.cc‎

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

4-
#include "opentelemetry/ext/http/common/url_parser.h"
5-
64
#include <gtest/gtest.h>
5+
#include <map>
6+
#include <string>
7+
#include <utility>
8+
9+
#include "opentelemetry/ext/http/common/url_parser.h"
710

811
namespace http_common = opentelemetry::ext::http::common;
912

‎ext/test/w3c_tracecontext_test/main.cc‎

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

4+
#include <stdint.h>
5+
#include <stdlib.h>
6+
#include <algorithm>
7+
#include <initializer_list>
8+
#include <iostream>
9+
#include <map>
10+
#include <nlohmann/json.hpp>
11+
#include <string>
12+
#include <utility>
13+
#include <vector>
14+
15+
#include "opentelemetry/context/context_value.h"
16+
#include "opentelemetry/context/propagation/text_map_propagator.h"
417
#include "opentelemetry/context/runtime_context.h"
518
#include "opentelemetry/exporters/ostream/span_exporter.h"
619
#include "opentelemetry/ext/http/client/curl/http_client_curl.h"
20+
#include "opentelemetry/ext/http/client/curl/http_operation_curl.h"
21+
#include "opentelemetry/ext/http/client/http_client.h"
722
#include "opentelemetry/ext/http/server/http_server.h"
23+
#include "opentelemetry/nostd/shared_ptr.h"
24+
#include "opentelemetry/nostd/string_view.h"
25+
#include "opentelemetry/sdk/trace/exporter.h"
26+
#include "opentelemetry/sdk/trace/processor.h"
27+
#include "opentelemetry/sdk/trace/recordable.h"
828
#include "opentelemetry/sdk/trace/simple_processor.h"
929
#include "opentelemetry/sdk/trace/tracer_context.h"
1030
#include "opentelemetry/sdk/trace/tracer_provider.h"
1131
#include "opentelemetry/trace/propagation/http_trace_context.h"
1232
#include "opentelemetry/trace/provider.h"
1333
#include "opentelemetry/trace/scope.h"
14-
15-
#include <algorithm>
16-
#include "nlohmann/json.hpp"
34+
#include "opentelemetry/trace/tracer.h"
35+
#include "opentelemetry/trace/tracer_provider.h"
1736

1837
namespace trace_api = opentelemetry::trace;
1938
namespace http_client = opentelemetry::ext::http::client;

‎sdk/include/opentelemetry/sdk/common/attribute_utils.h‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,19 @@
33

44
#pragma once
55

6+
#include <cstdint>
7+
#include <initializer_list>
68
#include <map>
79
#include <string>
810
#include <unordered_map>
11+
#include <utility>
912
#include <vector>
1013

1114
#include "opentelemetry/common/attribute_value.h"
12-
#include "opentelemetry/common/key_value_iterable_view.h"
15+
#include "opentelemetry/common/key_value_iterable.h"
16+
#include "opentelemetry/nostd/span.h"
17+
#include "opentelemetry/nostd/string_view.h"
18+
#include "opentelemetry/nostd/variant.h"
1319
#include "opentelemetry/version.h"
1420

1521
OPENTELEMETRY_BEGIN_NAMESPACE

‎sdk/include/opentelemetry/sdk/common/attributemap_hash.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,15 @@
33

44
#pragma once
55

6+
#include <stddef.h>
67
#include <functional>
8+
#include <map>
9+
#include <string>
10+
#include <utility>
11+
#include <vector>
712

13+
#include "opentelemetry/common/attribute_value.h"
14+
#include "opentelemetry/common/key_value_iterable.h"
815
#include "opentelemetry/nostd/function_ref.h"
916
#include "opentelemetry/nostd/string_view.h"
1017
#include "opentelemetry/nostd/variant.h"

0 commit comments

Comments
 (0)