Skip to content

Commit 9fcfe9d

Browse files
authored
[CODE HEALTH] Fix clang-tidy warnings, part 2 (#3872)
1 parent da8598c commit 9fcfe9d

Some content is hidden

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

52 files changed

+381
-30
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: 595
20+
warning_limit: 490
2121
- cmake_options: all-options-abiv2-preview
22-
warning_limit: 597
22+
warning_limit: 492
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
@@ -27,6 +27,9 @@ Increment the:
2727
* [BUILD] Revisit EventLogger deprecation
2828
[#3855](https://github.com/open-telemetry/opentelemetry-cpp/pull/3855)
2929

30+
* [CODE HEALTH] Fix clang-tidy warnings, part 2
31+
[#3872](https://github.com/open-telemetry/opentelemetry-cpp/pull/3872)
32+
3033
Important changes:
3134

3235
* [BUILD] Revisit EventLogger deprecation

ext/include/opentelemetry/ext/http/client/curl/http_client_curl.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,11 @@ class HttpClientSync : public opentelemetry::ext::http::client::HttpClientSync
242242
public:
243243
HttpClientSync() : curl_global_initializer_(HttpCurlGlobalInitializer::GetInstance()) {}
244244

245+
HttpClientSync(const HttpClientSync &) = delete;
246+
HttpClientSync(HttpClientSync &&) = delete;
247+
HttpClientSync &operator=(const HttpClientSync &) = delete;
248+
HttpClientSync &operator=(HttpClientSync &&) = delete;
249+
245250
opentelemetry::ext::http::client::Result Get(
246251
const nostd::string_view &url,
247252
const opentelemetry::ext::http::client::HttpSslOptions &ssl_options,
@@ -312,6 +317,12 @@ class HttpClient : public opentelemetry::ext::http::client::HttpClient
312317
// The call (curl_global_init) is not thread safe. Ensure this is called only once.
313318
HttpClient();
314319
HttpClient(const std::shared_ptr<sdk::common::ThreadInstrumentation> &thread_instrumentation);
320+
321+
HttpClient(const HttpClient &) = delete;
322+
HttpClient(HttpClient &&) = delete;
323+
HttpClient &operator=(const HttpClient &) = delete;
324+
HttpClient &operator=(HttpClient &&) = delete;
325+
315326
~HttpClient() override;
316327

317328
std::shared_ptr<opentelemetry::ext::http::client::Session> CreateSession(

ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ struct HttpCurlEasyResource
7373

7474
HttpCurlEasyResource(const HttpCurlEasyResource &other) = delete;
7575
HttpCurlEasyResource &operator=(const HttpCurlEasyResource &other) = delete;
76+
77+
~HttpCurlEasyResource() = default;
7678
};
7779

7880
class HttpOperation
@@ -166,6 +168,11 @@ class HttpOperation
166168
bool is_log_enabled = false,
167169
const opentelemetry::ext::http::client::RetryPolicy &retry_policy = {});
168170

171+
HttpOperation(const HttpOperation &) = delete;
172+
HttpOperation(HttpOperation &&) = delete;
173+
HttpOperation &operator=(const HttpOperation &) = delete;
174+
HttpOperation &operator=(HttpOperation &&) = delete;
175+
169176
/**
170177
* Destroy CURL instance
171178
*/

ext/include/opentelemetry/ext/http/client/http_client.h

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,13 @@ struct RetryPolicy
251251
class Request
252252
{
253253
public:
254+
Request() = default;
255+
256+
Request(const Request &) = delete;
257+
Request(Request &&) = delete;
258+
Request &operator=(const Request &) = delete;
259+
Request &operator=(Request &&) = delete;
260+
254261
virtual void SetMethod(Method method) noexcept = 0;
255262

256263
virtual void SetUri(nostd::string_view uri) noexcept = 0;
@@ -277,6 +284,13 @@ class Request
277284
class Response
278285
{
279286
public:
287+
Response() = default;
288+
289+
Response(const Response &) = delete;
290+
Response(Response &&) = delete;
291+
Response &operator=(const Response &) = delete;
292+
Response &operator=(Response &&) = delete;
293+
280294
virtual const Body &GetBody() const noexcept = 0;
281295

282296
virtual bool ForEachHeader(
@@ -344,6 +358,13 @@ class Result
344358
class EventHandler
345359
{
346360
public:
361+
EventHandler() = default;
362+
363+
EventHandler(const EventHandler &) = delete;
364+
EventHandler(EventHandler &&) = delete;
365+
EventHandler &operator=(const EventHandler &) = delete;
366+
EventHandler &operator=(EventHandler &&) = delete;
367+
347368
virtual void OnResponse(Response &) noexcept = 0;
348369

349370
virtual void OnEvent(SessionState, nostd::string_view) noexcept = 0;
@@ -354,6 +375,13 @@ class EventHandler
354375
class Session
355376
{
356377
public:
378+
Session() = default;
379+
380+
Session(const Session &) = delete;
381+
Session(Session &&) = delete;
382+
Session &operator=(const Session &) = delete;
383+
Session &operator=(Session &&) = delete;
384+
357385
virtual std::shared_ptr<Request> CreateRequest() noexcept = 0;
358386

359387
virtual void SendRequest(std::shared_ptr<EventHandler>) noexcept = 0;
@@ -370,6 +398,13 @@ class Session
370398
class HttpClient
371399
{
372400
public:
401+
HttpClient() = default;
402+
403+
HttpClient(const HttpClient &) = delete;
404+
HttpClient(HttpClient &&) = delete;
405+
HttpClient &operator=(const HttpClient &) = delete;
406+
HttpClient &operator=(HttpClient &&) = delete;
407+
373408
virtual std::shared_ptr<Session> CreateSession(nostd::string_view url) noexcept = 0;
374409

375410
virtual bool CancelAllSessions() noexcept = 0;
@@ -384,6 +419,13 @@ class HttpClient
384419
class HttpClientSync
385420
{
386421
public:
422+
HttpClientSync() = default;
423+
424+
HttpClientSync(const HttpClientSync &) = delete;
425+
HttpClientSync(HttpClientSync &&) = delete;
426+
HttpClientSync &operator=(const HttpClientSync &) = delete;
427+
HttpClientSync &operator=(HttpClientSync &&) = delete;
428+
387429
Result GetNoSsl(const nostd::string_view &url,
388430
const Headers &headers = {{}},
389431
const Compression &compression = Compression::kNone) noexcept

ext/include/opentelemetry/ext/http/server/http_server.h

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ class HttpRequestCallback
5454

5555
public:
5656
HttpRequestCallback() {}
57-
virtual ~HttpRequestCallback() = default;
5857

59-
HttpRequestCallback &operator=(HttpRequestCallback other)
60-
{
61-
callback = other.callback;
62-
return *this;
63-
}
58+
HttpRequestCallback(const HttpRequestCallback &) = delete;
59+
HttpRequestCallback(HttpRequestCallback &&) = delete;
60+
HttpRequestCallback &operator=(const HttpRequestCallback &) = delete;
61+
HttpRequestCallback &operator=(HttpRequestCallback &&) = delete;
62+
63+
virtual ~HttpRequestCallback() = default;
6464

6565
HttpRequestCallback(CallbackFunction func) : callback(func) {}
6666

@@ -176,6 +176,11 @@ class HttpServer : private SocketTools::Reactor::SocketCallback
176176
addListeningPort(port);
177177
}
178178

179+
HttpServer(const HttpServer &) = delete;
180+
HttpServer(HttpServer &&) = delete;
181+
HttpServer &operator=(const HttpServer &) = delete;
182+
HttpServer &operator=(HttpServer &&) = delete;
183+
179184
~HttpServer() override
180185
{
181186
for (auto &sock : m_listeningSockets)

ext/include/opentelemetry/ext/http/server/socket_tools.h

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,11 @@ struct Socket
272272

273273
Socket(int af, int type, int proto) : m_sock(::socket(af, type, proto)) {}
274274

275+
Socket(const Socket &) = default;
276+
Socket(Socket &&) = default;
277+
Socket &operator=(const Socket &) = default;
278+
Socket &operator=(Socket &&) = default;
279+
275280
~Socket() {}
276281

277282
operator Socket::Type() const { return m_sock; }
@@ -447,7 +452,13 @@ struct Reactor : protected common::Thread
447452
class SocketCallback
448453
{
449454
public:
450-
SocketCallback() = default;
455+
SocketCallback() = default;
456+
457+
SocketCallback(const SocketCallback &) = delete;
458+
SocketCallback(SocketCallback &&) = delete;
459+
SocketCallback &operator=(const SocketCallback &) = delete;
460+
SocketCallback &operator=(SocketCallback &&) = delete;
461+
451462
virtual ~SocketCallback() = default;
452463
virtual void onSocketReadable(Socket sock) = 0;
453464
virtual void onSocketWritable(Socket sock) = 0;
@@ -504,6 +515,11 @@ struct Reactor : protected common::Thread
504515
#endif
505516
}
506517

518+
Reactor(const Reactor &) = delete;
519+
Reactor(Reactor &&) = delete;
520+
Reactor &operator=(const Reactor &) = delete;
521+
Reactor &operator=(Reactor &&) = delete;
522+
507523
~Reactor() override
508524
{
509525
#ifdef __linux__

sdk/include/opentelemetry/sdk/common/atomic_unique_ptr.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ class AtomicUniquePtr
2222
{
2323
public:
2424
AtomicUniquePtr() noexcept {}
25+
AtomicUniquePtr(const AtomicUniquePtr &) = delete;
26+
AtomicUniquePtr(AtomicUniquePtr &&) = delete;
27+
AtomicUniquePtr &operator=(const AtomicUniquePtr &) = delete;
28+
AtomicUniquePtr &operator=(AtomicUniquePtr &&) = delete;
2529

2630
explicit AtomicUniquePtr(std::unique_ptr<T> &&other) noexcept : ptr_(other.release()) {}
2731

sdk/include/opentelemetry/sdk/common/thread_instrumentation.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,13 @@ namespace common
7171
class ThreadInstrumentation
7272
{
7373
public:
74-
ThreadInstrumentation() = default;
74+
ThreadInstrumentation() = default;
75+
76+
ThreadInstrumentation(const ThreadInstrumentation &) = delete;
77+
ThreadInstrumentation(ThreadInstrumentation &&) = delete;
78+
ThreadInstrumentation &operator=(const ThreadInstrumentation &) = delete;
79+
ThreadInstrumentation &operator=(ThreadInstrumentation &&) = delete;
80+
7581
virtual ~ThreadInstrumentation() = default;
7682

7783
/*

sdk/include/opentelemetry/sdk/instrumentationscope/instrumentation_scope.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ using InstrumentationScopeAttributes = opentelemetry::sdk::common::AttributeMap;
2626
class InstrumentationScope
2727
{
2828
public:
29-
InstrumentationScope(const InstrumentationScope &) = default;
29+
InstrumentationScope(const InstrumentationScope &) = default;
30+
InstrumentationScope(InstrumentationScope &&) = default;
31+
InstrumentationScope &operator=(const InstrumentationScope &) = default;
32+
InstrumentationScope &operator=(InstrumentationScope &&) = default;
33+
~InstrumentationScope() = default;
3034

3135
/**
3236
* Returns a newly created InstrumentationScope with the specified library name and version.

0 commit comments

Comments
 (0)