Merge branch 'main' into proto_std_should_follow_pb

ThomsonTan · web-flow · commit ed30cbbb0e18 · 2026-02-03T17:13:45.000-08:00
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -37,10 +37,10 @@ jobs:
       run: |
         sudo -E ./ci/setup_ci_environment.sh
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+      uses: github/codeql-action/init@6bc82e05fd0ea64601dd4b465378bbcf57de0314 # v4.32.1
       with:
        languages: cpp
     - name: Autobuild
-      uses: github/codeql-action/autobuild@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+      uses: github/codeql-action/autobuild@6bc82e05fd0ea64601dd4b465378bbcf57de0314 # v4.32.1
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+      uses: github/codeql-action/analyze@6bc82e05fd0ea64601dd4b465378bbcf57de0314 # v4.32.1
diff --git a/.github/workflows/ossf-scorecard.yml b/.github/workflows/ossf-scorecard.yml
@@ -47,6 +47,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+        uses: github/codeql-action/upload-sarif@6bc82e05fd0ea64601dd4b465378bbcf57de0314 # v4.32.1
         with:
           sarif_file: results.sarif
diff --git 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
@@ -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
@@ -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
@@ -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, std::string>(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
@@ -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
@@ -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
@@ -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())
diff --git a/sdk/include/opentelemetry/sdk/metrics/state/multi_metric_storage.h b/sdk/include/opentelemetry/sdk/metrics/state/multi_metric_storage.h
@@ -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_)
     {
diff --git 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<MultiRecordable *>(&span);
     ProcessorNode *node   = head_;
@@ -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_;

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ namespace nostd`
`27`	`27`	`class bad_variant_access : public std::exception`
`28`	`28`	`{`
`29`	`29`	`public:`
`30`		`- virtual const char *what() const noexcept override { return "bad_variant_access"; }`
	`30`	`+ const char *what() const noexcept override { return "bad_variant_access"; }`
`31`	`31`	`};`
`32`	`32`
`33`	`33`	`[[noreturn]] inline void throw_bad_variant_access()`
Original file line number	Diff line number	Diff line change
`@@ -32,14 +32,14 @@ class GrpcClientCarrier : public opentelemetry::context::propagation::TextMapCar`
`32`	`32`	`public:`
`33`	`33`	`GrpcClientCarrier(ClientContext *context) : context_(context) {}`
`34`	`34`	`GrpcClientCarrier() = default;`
`35`		`- virtual opentelemetry::nostd::string_view Get(`
	`35`	`+ opentelemetry::nostd::string_view Get(`
`36`	`36`	`opentelemetry::nostd::string_view /* key */) const noexcept override`
`37`	`37`	`{`
`38`	`38`	`return "";`
`39`	`39`	`}`
`40`	`40`
`41`		`- virtual void Set(opentelemetry::nostd::string_view key,`
`42`		`- opentelemetry::nostd::string_view value) noexcept override`
	`41`	`+ void Set(opentelemetry::nostd::string_view key,`
	`42`	`+ opentelemetry::nostd::string_view value) noexcept override`
`43`	`43`	`{`
`44`	`44`	`std::cout << " Client ::: Adding " << key << " " << value << "\n";`
`45`	`45`	`context_->AddMetadata(std::string(key), std::string(value));`
`@@ -53,7 +53,7 @@ class GrpcServerCarrier : public opentelemetry::context::propagation::TextMapCar`
`53`	`53`	`public:`
`54`	`54`	`GrpcServerCarrier(ServerContext *context) : context_(context) {}`
`55`	`55`	`GrpcServerCarrier() = default;`
`56`		`- virtual opentelemetry::nostd::string_view Get(`
	`56`	`+ opentelemetry::nostd::string_view Get(`
`57`	`57`	`opentelemetry::nostd::string_view key) const noexcept override`
`58`	`58`	`{`
`59`	`59`	`auto it = context_->client_metadata().find({key.data(), key.size()});`
`@@ -64,8 +64,8 @@ class GrpcServerCarrier : public opentelemetry::context::propagation::TextMapCar`
`64`	`64`	`return "";`
`65`	`65`	`}`
`66`	`66`
`67`		`- virtual void Set(opentelemetry::nostd::string_view /* key */,`
`68`		`- opentelemetry::nostd::string_view /* value */) noexcept override`
	`67`	`+ void Set(opentelemetry::nostd::string_view /* key */,`
	`68`	`+ opentelemetry::nostd::string_view /* value */) noexcept override`
`69`	`69`	`{`
`70`	`70`	`// Not required for server`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class HttpServer : public HTTP_SERVER_NS::HttpRequestCallback`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`- ~HttpServer() { Stop(); }`
	`53`	`+ ~HttpServer() override { Stop(); }`
`54`	`54`	`};`
`55`	`55`
`56`	`56`	`} // namespace`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class HttpTextMapCarrier : public opentelemetry::context::propagation::TextMapCa`
`31`	`31`	`public:`
`32`	`32`	`HttpTextMapCarrier(T &headers) : headers_(headers) {}`
`33`	`33`	`HttpTextMapCarrier() = default;`
`34`		`- virtual opentelemetry::nostd::string_view Get(`
	`34`	`+ opentelemetry::nostd::string_view Get(`
`35`	`35`	`opentelemetry::nostd::string_view key) const noexcept override`
`36`	`36`	`{`
`37`	`37`	`std::string key_to_compare = key.data();`
`@@ -53,8 +53,8 @@ class HttpTextMapCarrier : public opentelemetry::context::propagation::TextMapCa`
`53`	`53`	`return "";`
`54`	`54`	`}`
`55`	`55`
`56`		`- virtual void Set(opentelemetry::nostd::string_view key,`
`57`		`- opentelemetry::nostd::string_view value) noexcept override`
	`56`	`+ void Set(opentelemetry::nostd::string_view key,`
	`57`	`+ opentelemetry::nostd::string_view value) noexcept override`
`58`	`58`	`{`
`59`	`59`	`headers_.insert(std::pair<std::string, std::string>(std::string(key), std::string(value)));`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ class HttpServer : private SocketTools::Reactor::SocketCallback`
`238`	`238`	`void stop() { m_reactor.stop(); }`
`239`	`239`
`240`	`240`	`protected:`
`241`		`- virtual void onSocketAcceptable(SocketTools::Socket socket) override`
	`241`	`+ void onSocketAcceptable(SocketTools::Socket socket) override`
`242`	`242`	`{`
`243`	`243`	`LOG_TRACE("HttpServer: accepting socket fd=0x%llx", socket.m_sock);`
`244`	`244`	`assert(std::find(m_listeningSockets.begin(), m_listeningSockets.end(), socket) !=`
`@@ -258,7 +258,7 @@ class HttpServer : private SocketTools::Reactor::SocketCallback`
`258`	`258`	`}`
`259`	`259`	`}`
`260`	`260`
`261`		`- virtual void onSocketReadable(SocketTools::Socket socket) override`
	`261`	`+ void onSocketReadable(SocketTools::Socket socket) override`
`262`	`262`	`{`
`263`	`263`	`LOG_TRACE("HttpServer: reading socket fd=0x%llx", socket.m_sock);`
`264`	`264`	`// No thread-safety here!`
`@@ -286,7 +286,7 @@ class HttpServer : private SocketTools::Reactor::SocketCallback`
`286`	`286`	`handleConnection(conn);`
`287`	`287`	`}`
`288`	`288`
`289`		`- virtual void onSocketWritable(SocketTools::Socket socket) override`
	`289`	`+ void onSocketWritable(SocketTools::Socket socket) override`
`290`	`290`	`{`
`291`	`291`	`LOG_TRACE("HttpServer: writing socket fd=0x%llx", socket.m_sock);`
`292`	`292`
`@@ -308,7 +308,7 @@ class HttpServer : private SocketTools::Reactor::SocketCallback`
`308`	`308`	`}`
`309`	`309`	`}`
`310`	`310`
`311`		`- virtual void onSocketClosed(SocketTools::Socket socket) override`
	`311`	`+ void onSocketClosed(SocketTools::Socket socket) override`
`312`	`312`	`{`
`313`	`313`	`LOG_TRACE("HttpServer: closing socket fd=0x%llx", socket.m_sock);`
`314`	`314`	`assert(std::find(m_listeningSockets.begin(), m_listeningSockets.end(), socket) ==`
Original file line number	Diff line number	Diff line change
`@@ -700,7 +700,7 @@ struct Reactor : protected common::Thread`
`700`	`700`	`/// <summary>`
`701`	`701`	`/// Thread Loop for async events processing`
`702`	`702`	`/// </summary>`
`703`		`- virtual void onThread() override`
	`703`	`+ void onThread() override`
`704`	`704`	`{`
`705`	`705`	`LOG_INFO("Reactor: Thread started");`
`706`	`706`	`while (!shouldTerminate())`
Original file line number	Diff line number	Diff line change
`@@ -30,37 +30,35 @@ class SyncMultiMetricStorage : public SyncWritableMetricStorage`
`30`	`30`	`storages_.push_back(storage);`
`31`	`31`	`}`
`32`	`32`
`33`		`- virtual void RecordLong(int64_t value,`
`34`		`- const opentelemetry::context::Context &context) noexcept override`
	`33`	`+ void RecordLong(int64_t value, const opentelemetry::context::Context &context) noexcept override`
`35`	`34`	`{`
`36`	`35`	`for (auto &s : storages_)`
`37`	`36`	`{`
`38`	`37`	`s->RecordLong(value, context);`
`39`	`38`	`}`
`40`	`39`	`}`
`41`	`40`
`42`		`- virtual void RecordLong(int64_t value,`
`43`		`- const opentelemetry::common::KeyValueIterable &attributes,`
`44`		`- const opentelemetry::context::Context &context) noexcept override`
	`41`	`+ void RecordLong(int64_t value,`
	`42`	`+ const opentelemetry::common::KeyValueIterable &attributes,`
	`43`	`+ const opentelemetry::context::Context &context) noexcept override`
`45`	`44`	`{`
`46`	`45`	`for (auto &s : storages_)`
`47`	`46`	`{`
`48`	`47`	`s->RecordLong(value, attributes, context);`
`49`	`48`	`}`
`50`	`49`	`}`
`51`	`50`
`52`		`- virtual void RecordDouble(double value,`
`53`		`- const opentelemetry::context::Context &context) noexcept override`
	`51`	`+ void RecordDouble(double value, const opentelemetry::context::Context &context) noexcept override`
`54`	`52`	`{`
`55`	`53`	`for (auto &s : storages_)`
`56`	`54`	`{`
`57`	`55`	`s->RecordDouble(value, context);`
`58`	`56`	`}`
`59`	`57`	`}`
`60`	`58`
`61`		`- virtual void RecordDouble(double value,`
`62`		`- const opentelemetry::common::KeyValueIterable &attributes,`
`63`		`- const opentelemetry::context::Context &context) noexcept override`
	`59`	`+ void RecordDouble(double value,`
	`60`	`+ const opentelemetry::common::KeyValueIterable &attributes,`
	`61`	`+ const opentelemetry::context::Context &context) noexcept override`
`64`	`62`	`{`
`65`	`63`	`for (auto &s : storages_)`
`66`	`64`	`{`