diff --git a/api/include/opentelemetry/nostd/variant.h b/api/include/opentelemetry/nostd/variant.h index 4abac7766a..d465f1ad41 100644 --- a/api/include/opentelemetry/nostd/variant.h +++ b/api/include/opentelemetry/nostd/variant.h @@ -27,7 +27,7 @@ namespace nostd class bad_variant_access : public std::exception { public: - virtual const char *what() const noexcept override { return "bad_variant_access"; } + const char *what() const noexcept override { return "bad_variant_access"; } }; [[noreturn]] inline void throw_bad_variant_access() diff --git a/examples/grpc/tracer_common.h b/examples/grpc/tracer_common.h index cb9940a715..0bbbe49124 100644 --- a/examples/grpc/tracer_common.h +++ b/examples/grpc/tracer_common.h @@ -32,14 +32,14 @@ class GrpcClientCarrier : public opentelemetry::context::propagation::TextMapCar public: GrpcClientCarrier(ClientContext *context) : context_(context) {} GrpcClientCarrier() = default; - virtual opentelemetry::nostd::string_view Get( + opentelemetry::nostd::string_view Get( opentelemetry::nostd::string_view /* key */) const noexcept override { return ""; } - virtual void Set(opentelemetry::nostd::string_view key, - opentelemetry::nostd::string_view value) noexcept override + void Set(opentelemetry::nostd::string_view key, + opentelemetry::nostd::string_view value) noexcept override { std::cout << " Client ::: Adding " << key << " " << value << "\n"; context_->AddMetadata(std::string(key), std::string(value)); @@ -53,7 +53,7 @@ class GrpcServerCarrier : public opentelemetry::context::propagation::TextMapCar public: GrpcServerCarrier(ServerContext *context) : context_(context) {} GrpcServerCarrier() = default; - virtual opentelemetry::nostd::string_view Get( + opentelemetry::nostd::string_view Get( opentelemetry::nostd::string_view key) const noexcept override { auto it = context_->client_metadata().find({key.data(), key.size()}); @@ -64,8 +64,8 @@ class GrpcServerCarrier : public opentelemetry::context::propagation::TextMapCar return ""; } - virtual void Set(opentelemetry::nostd::string_view /* key */, - opentelemetry::nostd::string_view /* value */) noexcept override + void Set(opentelemetry::nostd::string_view /* key */, + opentelemetry::nostd::string_view /* value */) noexcept override { // Not required for server } diff --git a/examples/http/server.h b/examples/http/server.h index 9e0cfbfdce..df74994310 100644 --- a/examples/http/server.h +++ b/examples/http/server.h @@ -50,7 +50,7 @@ class HttpServer : public HTTP_SERVER_NS::HttpRequestCallback } } - ~HttpServer() { Stop(); } + ~HttpServer() override { Stop(); } }; } // namespace diff --git a/examples/http/tracer_common.h b/examples/http/tracer_common.h index d94a754d57..edc56742bb 100644 --- a/examples/http/tracer_common.h +++ b/examples/http/tracer_common.h @@ -31,7 +31,7 @@ class HttpTextMapCarrier : public opentelemetry::context::propagation::TextMapCa public: HttpTextMapCarrier(T &headers) : headers_(headers) {} HttpTextMapCarrier() = default; - virtual opentelemetry::nostd::string_view Get( + opentelemetry::nostd::string_view Get( opentelemetry::nostd::string_view key) const noexcept override { std::string key_to_compare = key.data(); @@ -53,8 +53,8 @@ class HttpTextMapCarrier : public opentelemetry::context::propagation::TextMapCa return ""; } - virtual void Set(opentelemetry::nostd::string_view key, - opentelemetry::nostd::string_view value) noexcept override + void Set(opentelemetry::nostd::string_view key, + opentelemetry::nostd::string_view value) noexcept override { headers_.insert(std::pair(std::string(key), std::string(value))); } diff --git a/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter.h b/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter.h index dd4fc11d05..21192170d4 100644 --- a/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter.h +++ b/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter.h @@ -75,10 +75,7 @@ class InMemorySpanExporter final : public opentelemetry::sdk::trace::SpanExporte return sdk::common::ExportResult::kSuccess; } - virtual bool ForceFlush(std::chrono::microseconds /* timeout */) noexcept override - { - return true; - } + bool ForceFlush(std::chrono::microseconds /* timeout */) noexcept override { return true; } /** * Attempt to shut down the in-memory span exporter. diff --git a/ext/include/opentelemetry/ext/http/server/http_server.h b/ext/include/opentelemetry/ext/http/server/http_server.h index 0b30282752..16a5b9879d 100644 --- a/ext/include/opentelemetry/ext/http/server/http_server.h +++ b/ext/include/opentelemetry/ext/http/server/http_server.h @@ -238,7 +238,7 @@ class HttpServer : private SocketTools::Reactor::SocketCallback void stop() { m_reactor.stop(); } protected: - virtual void onSocketAcceptable(SocketTools::Socket socket) override + void onSocketAcceptable(SocketTools::Socket socket) override { LOG_TRACE("HttpServer: accepting socket fd=0x%llx", socket.m_sock); assert(std::find(m_listeningSockets.begin(), m_listeningSockets.end(), socket) != @@ -258,7 +258,7 @@ class HttpServer : private SocketTools::Reactor::SocketCallback } } - virtual void onSocketReadable(SocketTools::Socket socket) override + void onSocketReadable(SocketTools::Socket socket) override { LOG_TRACE("HttpServer: reading socket fd=0x%llx", socket.m_sock); // No thread-safety here! @@ -286,7 +286,7 @@ class HttpServer : private SocketTools::Reactor::SocketCallback handleConnection(conn); } - virtual void onSocketWritable(SocketTools::Socket socket) override + void onSocketWritable(SocketTools::Socket socket) override { LOG_TRACE("HttpServer: writing socket fd=0x%llx", socket.m_sock); @@ -308,7 +308,7 @@ class HttpServer : private SocketTools::Reactor::SocketCallback } } - virtual void onSocketClosed(SocketTools::Socket socket) override + void onSocketClosed(SocketTools::Socket socket) override { LOG_TRACE("HttpServer: closing socket fd=0x%llx", socket.m_sock); assert(std::find(m_listeningSockets.begin(), m_listeningSockets.end(), socket) == diff --git a/ext/include/opentelemetry/ext/http/server/socket_tools.h b/ext/include/opentelemetry/ext/http/server/socket_tools.h index 6a568eef94..e2cbcaff71 100644 --- a/ext/include/opentelemetry/ext/http/server/socket_tools.h +++ b/ext/include/opentelemetry/ext/http/server/socket_tools.h @@ -700,7 +700,7 @@ struct Reactor : protected common::Thread /// /// Thread Loop for async events processing /// - virtual void onThread() override + void onThread() override { LOG_INFO("Reactor: Thread started"); while (!shouldTerminate()) diff --git a/sdk/include/opentelemetry/sdk/metrics/state/multi_metric_storage.h b/sdk/include/opentelemetry/sdk/metrics/state/multi_metric_storage.h index 2a77b2f856..2424daa153 100644 --- a/sdk/include/opentelemetry/sdk/metrics/state/multi_metric_storage.h +++ b/sdk/include/opentelemetry/sdk/metrics/state/multi_metric_storage.h @@ -30,8 +30,7 @@ class SyncMultiMetricStorage : public SyncWritableMetricStorage storages_.push_back(storage); } - virtual void RecordLong(int64_t value, - const opentelemetry::context::Context &context) noexcept override + void RecordLong(int64_t value, const opentelemetry::context::Context &context) noexcept override { for (auto &s : storages_) { @@ -39,9 +38,9 @@ class SyncMultiMetricStorage : public SyncWritableMetricStorage } } - virtual void RecordLong(int64_t value, - const opentelemetry::common::KeyValueIterable &attributes, - const opentelemetry::context::Context &context) noexcept override + void RecordLong(int64_t value, + const opentelemetry::common::KeyValueIterable &attributes, + const opentelemetry::context::Context &context) noexcept override { for (auto &s : storages_) { @@ -49,8 +48,7 @@ class SyncMultiMetricStorage : public SyncWritableMetricStorage } } - virtual void RecordDouble(double value, - const opentelemetry::context::Context &context) noexcept override + void RecordDouble(double value, const opentelemetry::context::Context &context) noexcept override { for (auto &s : storages_) { @@ -58,9 +56,9 @@ class SyncMultiMetricStorage : public SyncWritableMetricStorage } } - virtual void RecordDouble(double value, - const opentelemetry::common::KeyValueIterable &attributes, - const opentelemetry::context::Context &context) noexcept override + void RecordDouble(double value, + const opentelemetry::common::KeyValueIterable &attributes, + const opentelemetry::context::Context &context) noexcept override { for (auto &s : storages_) { diff --git a/sdk/include/opentelemetry/sdk/trace/multi_span_processor.h b/sdk/include/opentelemetry/sdk/trace/multi_span_processor.h index 4f732df5a4..83b200f02a 100644 --- a/sdk/include/opentelemetry/sdk/trace/multi_span_processor.h +++ b/sdk/include/opentelemetry/sdk/trace/multi_span_processor.h @@ -73,8 +73,8 @@ class MultiSpanProcessor : public SpanProcessor return recordable; } - virtual void OnStart(Recordable &span, - const opentelemetry::trace::SpanContext &parent_context) noexcept override + void OnStart(Recordable &span, + const opentelemetry::trace::SpanContext &parent_context) noexcept override { auto multi_recordable = static_cast(&span); ProcessorNode *node = head_; @@ -90,7 +90,7 @@ class MultiSpanProcessor : public SpanProcessor } } - virtual void OnEnd(std::unique_ptr &&span) noexcept override + void OnEnd(std::unique_ptr &&span) noexcept override { auto multi_recordable = static_cast(span.release()); ProcessorNode *node = head_;