Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/include/opentelemetry/nostd/variant.h
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
12 changes: 6 additions & 6 deletions examples/grpc/tracer_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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()});
Expand All @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion examples/http/server.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class HttpServer : public HTTP_SERVER_NS::HttpRequestCallback
}
}

~HttpServer() { Stop(); }
~HttpServer() override { Stop(); }
};

} // namespace
6 changes: 3 additions & 3 deletions examples/http/tracer_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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, std::string>(std::string(key), std::string(value)));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions ext/include/opentelemetry/ext/http/server/http_server.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) !=
Expand All @@ -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!
Expand Down Expand Up @@ -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);

Expand All @@ -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) ==
Expand Down
2 changes: 1 addition & 1 deletion ext/include/opentelemetry/ext/http/server/socket_tools.h
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ struct Reactor : protected common::Thread
/// <summary>
/// Thread Loop for async events processing
/// </summary>
virtual void onThread() override
void onThread() override
{
LOG_INFO("Reactor: Thread started");
while (!shouldTerminate())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,37 +30,35 @@ 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_)
{
s->RecordLong(value, context);
}
}

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_)
{
s->RecordLong(value, attributes, context);
}
}

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_)
{
s->RecordDouble(value, context);
}
}

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_)
{
Expand Down
6 changes: 3 additions & 3 deletions sdk/include/opentelemetry/sdk/trace/multi_span_processor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<MultiRecordable *>(&span);
ProcessorNode *node = head_;
Expand All @@ -90,7 +90,7 @@ class MultiSpanProcessor : public SpanProcessor
}
}

virtual void OnEnd(std::unique_ptr<Recordable> &&span) noexcept override
void OnEnd(std::unique_ptr<Recordable> &&span) noexcept override
{
auto multi_recordable = static_cast<MultiRecordable *>(span.release());
ProcessorNode *node = head_;
Expand Down
Loading