Skip to content

Commit 2eba094

Browse files
authored
[CODE HEALTH] Fix clang-tidy warnings in ext, exporters, and examples (open-telemetry#3952)
1 parent 0e64897 commit 2eba094

File tree

29 files changed

+100
-112
lines changed

29 files changed

+100
-112
lines changed

.github/workflows/clang-tidy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
matrix:
1818
include:
1919
- cmake_options: all-options-abiv1-preview
20-
warning_limit: 104
20+
warning_limit: 72
2121
- cmake_options: all-options-abiv2-preview
22-
warning_limit: 105
22+
warning_limit: 74
2323
env:
2424
CC: /usr/bin/clang-18
2525
CXX: /usr/bin/clang++-18

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ Increment the:
2424
* [CODE HEALTH] Fix more clang-tidy warnings in API
2525
[#3950](https://github.com/open-telemetry/opentelemetry-cpp/pull/3950)
2626

27+
* [CODE HEALTH] Fix clang-tidy warnings in ext, exporters, and examples
28+
[#3952](https://github.com/open-telemetry/opentelemetry-cpp/pull/3952)
29+
2730
## [1.26.0] 2026-03-19
2831

2932
* [RELEASE] Bump main branch to 1.26.0-dev

api/test/logs/logger_test.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
#if OPENTELEMETRY_ABI_VERSION_NO < 2
2828
using opentelemetry::logs::NoopEventLogger;
29-
using opentelemetry::logs::NoopEventLoggerProvider;
3029
#endif
3130

3231
using opentelemetry::logs::EventId;

examples/grpc/client.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ using grpc::Channel;
4242
using grpc::ClientContext;
4343
using grpc::Status;
4444

45-
using grpc_example::Greeter;
46-
using grpc_example::GreetRequest;
47-
using grpc_example::GreetResponse;
45+
using namespace grpc_example;
4846

4947
namespace
5048
{

examples/grpc/server.cc

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,7 @@ using grpc::ServerBuilder;
4444
using grpc::ServerContext;
4545
using grpc::Status;
4646

47-
using grpc_example::Greeter;
48-
using grpc_example::GreetRequest;
49-
using grpc_example::GreetResponse;
50-
51-
using Span = opentelemetry::trace::Span;
52-
using SpanContext = opentelemetry::trace::SpanContext;
47+
using namespace grpc_example;
5348
using namespace opentelemetry::trace;
5449

5550
namespace context = opentelemetry::context;

examples/grpc/tracer_common.h

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,12 @@
2222
#include <iostream>
2323
#include <vector>
2424

25-
using grpc::ClientContext;
26-
using grpc::ServerContext;
27-
28-
namespace
25+
namespace grpc_example
2926
{
3027
class GrpcClientCarrier : public opentelemetry::context::propagation::TextMapCarrier
3128
{
3229
public:
33-
GrpcClientCarrier(ClientContext *context) : context_(context) {}
30+
GrpcClientCarrier(grpc::ClientContext *context) : context_(context) {}
3431
GrpcClientCarrier() = default;
3532
opentelemetry::nostd::string_view Get(
3633
opentelemetry::nostd::string_view /* key */) const noexcept override
@@ -45,13 +42,13 @@ class GrpcClientCarrier : public opentelemetry::context::propagation::TextMapCar
4542
context_->AddMetadata(std::string(key), std::string(value));
4643
}
4744

48-
ClientContext *context_ = nullptr;
45+
grpc::ClientContext *context_ = nullptr;
4946
};
5047

5148
class GrpcServerCarrier : public opentelemetry::context::propagation::TextMapCarrier
5249
{
5350
public:
54-
GrpcServerCarrier(ServerContext *context) : context_(context) {}
51+
GrpcServerCarrier(grpc::ServerContext *context) : context_(context) {}
5552
GrpcServerCarrier() = default;
5653
opentelemetry::nostd::string_view Get(
5754
opentelemetry::nostd::string_view key) const noexcept override
@@ -70,10 +67,10 @@ class GrpcServerCarrier : public opentelemetry::context::propagation::TextMapCar
7067
// Not required for server
7168
}
7269

73-
ServerContext *context_ = nullptr;
70+
grpc::ServerContext *context_ = nullptr;
7471
};
7572

76-
void InitTracer()
73+
inline void InitTracer()
7774
{
7875
auto exporter = opentelemetry::exporter::trace::OStreamSpanExporterFactory::Create();
7976
auto processor =
@@ -94,17 +91,17 @@ void InitTracer()
9491
new opentelemetry::trace::propagation::HttpTraceContext()));
9592
}
9693

97-
void CleanupTracer()
94+
inline void CleanupTracer()
9895
{
9996
std::shared_ptr<opentelemetry::trace::TracerProvider> none;
10097
opentelemetry::sdk::trace::Provider::SetTracerProvider(none);
10198
}
10299

103-
opentelemetry::nostd::shared_ptr<opentelemetry::trace::Tracer> get_tracer(
100+
inline opentelemetry::nostd::shared_ptr<opentelemetry::trace::Tracer> get_tracer(
104101
const std::string &tracer_name)
105102
{
106103
auto provider = opentelemetry::trace::Provider::GetTracerProvider();
107104
return provider->GetTracer(tracer_name);
108105
}
109106

110-
} // namespace
107+
} // namespace grpc_example

examples/http/client.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
#include <type_traits>
2828
#include <utility>
2929

30+
using namespace http_example;
31+
3032
namespace
3133
{
3234

examples/http/server.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
#include <utility>
3030
#include "server.h"
3131

32+
using namespace http_example;
33+
3234
namespace
3335
{
3436

examples/http/server.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <atomic>
1010
#include <string>
1111

12-
namespace
12+
namespace http_example
1313
{
1414

1515
class HttpServer : public HTTP_SERVER_NS::HttpRequestCallback
@@ -28,6 +28,11 @@ class HttpServer : public HTTP_SERVER_NS::HttpRequestCallback
2828
server_.setKeepalive(false);
2929
}
3030

31+
HttpServer(const HttpServer &) = delete;
32+
HttpServer(HttpServer &&) = delete;
33+
HttpServer &operator=(const HttpServer &) = delete;
34+
HttpServer &operator=(HttpServer &&) = delete;
35+
3136
void AddHandler(const std::string &path, HTTP_SERVER_NS::HttpRequestCallback *request_handler)
3237
{
3338
server_.addHandler(path, *request_handler);
@@ -53,4 +58,4 @@ class HttpServer : public HTTP_SERVER_NS::HttpRequestCallback
5358
~HttpServer() override { Stop(); }
5459
};
5560

56-
} // namespace
61+
} // namespace http_example

examples/http/tracer_common.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "opentelemetry/trace/propagation/http_trace_context.h"
2323
#include "opentelemetry/trace/provider.h"
2424

25-
namespace
25+
namespace http_example
2626
{
2727

2828
template <typename T>
@@ -62,7 +62,7 @@ class HttpTextMapCarrier : public opentelemetry::context::propagation::TextMapCa
6262
T headers_;
6363
};
6464

65-
void InitTracer()
65+
inline void InitTracer()
6666
{
6767
auto exporter = opentelemetry::exporter::trace::OStreamSpanExporterFactory::Create();
6868
auto processor =
@@ -83,17 +83,17 @@ void InitTracer()
8383
new opentelemetry::trace::propagation::HttpTraceContext()));
8484
}
8585

86-
void CleanupTracer()
86+
inline void CleanupTracer()
8787
{
8888
std::shared_ptr<opentelemetry::trace::TracerProvider> none;
8989
opentelemetry::sdk::trace::Provider::SetTracerProvider(none);
9090
}
9191

92-
opentelemetry::nostd::shared_ptr<opentelemetry::trace::Tracer> get_tracer(
92+
inline opentelemetry::nostd::shared_ptr<opentelemetry::trace::Tracer> get_tracer(
9393
const std::string &tracer_name)
9494
{
9595
auto provider = opentelemetry::trace::Provider::GetTracerProvider();
9696
return provider->GetTracer(tracer_name);
9797
}
9898

99-
} // namespace
99+
} // namespace http_example

0 commit comments

Comments
 (0)