Fix open-telemetry#1649 (open-telemetry#1658)

Fixed some warnings reported by clang. -Wnewline-eof no newline at end of file -Wc++98-compat-extra-semi extra ';' outside of a function is incompatible with C++98 -Winconsistent-missing-destructor-override '~XXX' overrides a destructor but is not marked 'override' -Wheader-hygiene using namespace directive in global context in header -Wunused-parameter unused parameter Fixed some warnings reported by gcc. -Werror=missing-field-initializers missing initializer for member ‘opentelemetry::v1::sdk::trace::SamplingResult::trace_state’ -Werror=unused-variable unused variable -Werror=unused-parameter unused parameter
yxue · Dec 5, 2022 · 841870c · 841870c
1 parent 70b2b9a
commit 841870c
Show file tree

Hide file tree

Showing 70 changed files with 112 additions and 94 deletions.
diff --git a/api/include/opentelemetry/common/kv_properties.h b/api/include/opentelemetry/common/kv_properties.h
@@ -270,4 +270,4 @@ class KeyValueProperties
   size_t Size() const noexcept { return num_entries_; }
 };
 }  // namespace common
-OPENTELEMETRY_END_NAMESPACE
+OPENTELEMETRY_END_NAMESPACE
diff --git a/api/include/opentelemetry/context/propagation/composite_propagator.h b/api/include/opentelemetry/context/propagation/composite_propagator.h
@@ -89,4 +89,4 @@ class CompositePropagator : public TextMapPropagator
 };
 }  // namespace propagation
 }  // namespace context
-OPENTELEMETRY_END_NAMESPACE;
+OPENTELEMETRY_END_NAMESPACE
diff --git a/api/include/opentelemetry/metrics/noop.h b/api/include/opentelemetry/metrics/noop.h
@@ -58,7 +58,7 @@ class NoopUpDownCounter : public UpDownCounter<T>
                     nostd::string_view /* description */,
                     nostd::string_view /* unit */) noexcept
   {}
-  ~NoopUpDownCounter() = default;
+  ~NoopUpDownCounter() override = default;
   void Add(T /* value */) noexcept override {}
   void Add(T /* value */, const opentelemetry::context::Context & /* context */) noexcept override
   {}

diff --git a/api/include/opentelemetry/std/utility.h b/api/include/opentelemetry/std/utility.h
@@ -54,7 +54,7 @@ auto size(const C &c) noexcept(noexcept(c.size())) -> decltype(c.size())
 }
 
 template <class T, std::size_t N>
-std::size_t size(T (&array)[N]) noexcept
+std::size_t size(T (&/* array */)[N]) noexcept
 {
   return N;
 }

diff --git a/api/include/opentelemetry/std/variant.h b/api/include/opentelemetry/std/variant.h
@@ -146,58 +146,58 @@ template <std::size_t I, class... Types>
 constexpr std::variant_alternative_t<I, std::variant<Types...>> &get(std::variant<Types...> &v)
 {
   return std::get<I, Types...>(v);
-};
+}
 
 template <std::size_t I, class... Types>
 constexpr std::variant_alternative_t<I, std::variant<Types...>> &&get(std::variant<Types...> &&v)
 {
   return std::get<I, Types...>(std::forward<decltype(v)>(v));
-};
+}
 
 template <std::size_t I, class... Types>
 constexpr const std::variant_alternative_t<I, std::variant<Types...>> &get(
     const std::variant<Types...> &v)
 {
   return std::get<I, Types...>(v);
-};
+}
 
 template <std::size_t I, class... Types>
 constexpr const std::variant_alternative_t<I, std::variant<Types...>> &&get(
     const std::variant<Types...> &&v)
 {
   return std::get<I, Types...>(std::forward<decltype(v)>(v));
-};
+}
 
 template <class T, class... Types>
 constexpr T &get(std::variant<Types...> &v)
 {
   return std::get<T, Types...>(v);
-};
+}
 
 template <class T, class... Types>
 constexpr T &&get(std::variant<Types...> &&v)
 {
   return std::get<T, Types...>(std::forward<decltype(v)>(v));
-};
+}
 
 template <class T, class... Types>
 constexpr const T &get(const std::variant<Types...> &v)
 {
   return std::get<T, Types...>(v);
-};
+}
 
 template <class T, class... Types>
 constexpr const T &&get(const std::variant<Types...> &&v)
 {
   return std::get<T, Types...>(std::forward<decltype(v)>(v));
-};
+}
 
 template <class _Callable, class... _Variants>
 constexpr auto visit(_Callable &&_Obj, _Variants &&... _Args)
 {
   return std::visit<_Callable, _Variants...>(static_cast<_Callable &&>(_Obj),
                                              static_cast<_Variants &&>(_Args)...);
-};
+}
 
 #endif
 

diff --git a/api/include/opentelemetry/trace/context.h b/api/include/opentelemetry/trace/context.h
@@ -30,4 +30,4 @@ inline context::Context SetSpan(opentelemetry::context::Context &context,
 }
 
 }  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
+OPENTELEMETRY_END_NAMESPACE
diff --git a/api/include/opentelemetry/trace/span_metadata.h b/api/include/opentelemetry/trace/span_metadata.h
@@ -40,4 +40,4 @@ struct EndSpanOptions
 };
 
 }  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
+OPENTELEMETRY_END_NAMESPACE
diff --git a/api/include/opentelemetry/trace/span_startoptions.h b/api/include/opentelemetry/trace/span_startoptions.h
@@ -42,4 +42,4 @@ struct StartSpanOptions
 };
 
 }  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
+OPENTELEMETRY_END_NAMESPACE
diff --git a/api/test/metrics/noop_sync_instrument_test.cc b/api/test/metrics/noop_sync_instrument_test.cc
@@ -47,4 +47,4 @@ TEST(UpDownCountr, Record)
   counter->Add(10l, {{"k1", "1"}, {"k2", 2}}, opentelemetry::context::Context{});
 }
 
-#endif
+#endif
diff --git a/examples/common/metrics_foo_library/foo_library.cc b/examples/common/metrics_foo_library/foo_library.cc
@@ -32,7 +32,7 @@ std::map<std::string, std::string> get_random_attr()
 class MeasurementFetcher
 {
 public:
-  static void Fetcher(opentelemetry::metrics::ObserverResult observer_result, void *state)
+  static void Fetcher(opentelemetry::metrics::ObserverResult observer_result, void * /* state */)
   {
     std::map<std::string, std::string> labels = get_random_attr();
     auto labelkv = opentelemetry::common::KeyValueIterableView<decltype(labels)>{labels};

diff --git a/examples/http/server.cc b/examples/http/server.cc
@@ -29,8 +29,9 @@ class RequestHandler : public HTTP_SERVER_NS::HttpRequestCallback
     std::string span_name = request.uri;
 
     // extract context from http header
-    const HttpTextMapCarrier<std::map<std::string, std::string>> carrier(
-        (std::map<std::string, std::string> &)request.headers);
+    std::map<std::string, std::string> &request_headers =
+        const_cast<std::map<std::string, std::string> &>(request.headers);
+    const HttpTextMapCarrier<std::map<std::string, std::string>> carrier(request_headers);
     auto prop        = context::propagation::GlobalTextMapPropagator::GetGlobalPropagator();
     auto current_ctx = context::RuntimeContext::GetCurrent();
     auto new_context = prop->Extract(carrier, current_ctx);

diff --git a/examples/http/server.h b/examples/http/server.h
@@ -50,4 +50,4 @@ class HttpServer : public HTTP_SERVER_NS::HttpRequestCallback
   ~HttpServer() { Stop(); }
 };
 
-}  // namespace
+}  // namespace
diff --git a/examples/plugin/plugin/factory_impl.cc b/examples/plugin/plugin/factory_impl.cc
@@ -25,8 +25,8 @@ class FactoryImpl final : public plugin::Factory::FactoryImpl
 public:
   // opentelemetry::plugin::Factory::FactoryImpl
   nostd::unique_ptr<plugin::TracerHandle> MakeTracerHandle(
-      nostd::string_view tracer_config,
-      nostd::unique_ptr<char[]> &error_message) const noexcept override
+      nostd::string_view /* tracer_config */,
+      nostd::unique_ptr<char[]> & /* error_message */) const noexcept override
   {
     std::shared_ptr<Tracer> tracer{new (std::nothrow) Tracer{""}};
     if (tracer == nullptr)
@@ -46,4 +46,4 @@ static nostd::unique_ptr<plugin::Factory::FactoryImpl> MakeFactoryImpl(
   return nostd::unique_ptr<plugin::Factory::FactoryImpl>{new (std::nothrow) FactoryImpl{}};
 }
 
-OPENTELEMETRY_DEFINE_PLUGIN_HOOK(MakeFactoryImpl);
+OPENTELEMETRY_DEFINE_PLUGIN_HOOK(MakeFactoryImpl)
diff --git a/examples/plugin/plugin/tracer.cc b/examples/plugin/plugin/tracer.cc
@@ -27,7 +27,7 @@ class Span final : public trace::Span
     std::cout << "StartSpan: " << name << "\n";
   }
 
-  ~Span() { std::cout << "~Span\n"; }
+  ~Span() override { std::cout << "~Span\n"; }
 
   // opentelemetry::trace::Span
   void SetAttribute(nostd::string_view /*name*/,

diff --git a/exporters/jaeger/src/jaeger_exporter.cc b/exporters/jaeger/src/jaeger_exporter.cc
@@ -93,7 +93,7 @@ void JaegerExporter::InitializeEndpoint()
   assert(false);
 }
 
-bool JaegerExporter::Shutdown(std::chrono::microseconds timeout) noexcept
+bool JaegerExporter::Shutdown(std::chrono::microseconds /* timeout */) noexcept
 {
   const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(lock_);
   is_shutdown_ = true;

diff --git a/exporters/jaeger/src/recordable.cc b/exporters/jaeger/src/recordable.cc
@@ -191,7 +191,7 @@ void JaegerRecordable::SetInstrumentationScope(
 }
 
 void JaegerRecordable::AddLink(const trace::SpanContext &span_context,
-                               const common::KeyValueIterable &attributes) noexcept
+                               const common::KeyValueIterable & /* attributes */) noexcept
 {
   // Note: "The Link’s attributes cannot be represented in Jaeger explicitly."
   // -- https://opentelemetry.io/docs/reference/specification/trace/sdk_exporters/jaeger/#links

diff --git a/exporters/jaeger/src/udp_transport.h b/exporters/jaeger/src/udp_transport.h
@@ -35,7 +35,7 @@ class UDPTransport : public Transport
   static constexpr auto kUDPPacketMaxLength = 65000;
 
   UDPTransport(const std::string &addr, uint16_t port);
-  virtual ~UDPTransport();
+  ~UDPTransport() override;
 
   int EmitBatch(const thrift::Batch &batch) override;
 

diff --git a/exporters/memory/src/in_memory_span_exporter_factory.cc b/exporters/memory/src/in_memory_span_exporter_factory.cc
@@ -16,7 +16,7 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> InMemorySpanExporterFac
     std::shared_ptr<InMemorySpanData> &data)
 {
   return Create(data, MAX_BUFFER_SIZE);
-};
+}
 
 std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> InMemorySpanExporterFactory::Create(
     std::shared_ptr<InMemorySpanData> &data,

diff --git a/exporters/ostream/include/opentelemetry/exporters/ostream/common_utils.h b/exporters/ostream/include/opentelemetry/exporters/ostream/common_utils.h
@@ -78,4 +78,4 @@ inline void print_value(const opentelemetry::sdk::common::OwnedAttributeValue &v
 
 }  // namespace ostream_common
 }  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
+OPENTELEMETRY_END_NAMESPACE
diff --git a/exporters/ostream/src/span_exporter_factory.cc b/exporters/ostream/src/span_exporter_factory.cc
@@ -15,7 +15,7 @@ namespace trace
 std::unique_ptr<trace_sdk::SpanExporter> OStreamSpanExporterFactory::Create()
 {
   return Create(std::cout);
-};
+}
 
 std::unique_ptr<trace_sdk::SpanExporter> OStreamSpanExporterFactory::Create(std::ostream &sout)
 {

diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter.h
@@ -84,4 +84,4 @@ class OtlpGrpcMetricExporter : public opentelemetry::sdk::metrics::MetricExporte
 }  // namespace otlp
 }  // namespace exporter
 OPENTELEMETRY_END_NAMESPACE
-#endif
+#endif
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h
@@ -27,4 +27,4 @@ struct OtlpGrpcMetricExporterOptions : public OtlpGrpcExporterOptions
 
 }  // namespace otlp
 }  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
+OPENTELEMETRY_END_NAMESPACE
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_suffix.h b/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_suffix.h
@@ -13,4 +13,4 @@
 
 #if defined(_MSC_VER)
 #  pragma warning(pop)
-#endif
+#endif
diff --git a/exporters/otlp/src/otlp_populate_attribute_utils.cc b/exporters/otlp/src/otlp_populate_attribute_utils.cc
@@ -176,7 +176,7 @@ void OtlpPopulateAttributeUtils::PopulateAttribute(
   }
   else if (nostd::holds_alternative<std::vector<bool>>(value))
   {
-    for (const auto &val : nostd::get<std::vector<bool>>(value))
+    for (const auto val : nostd::get<std::vector<bool>>(value))
     {
       attribute->mutable_value()->mutable_array_value()->add_values()->set_bool_value(val);
     }
@@ -242,4 +242,4 @@ void OtlpPopulateAttributeUtils::PopulateAttribute(
 
 }  // namespace otlp
 }  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
+OPENTELEMETRY_END_NAMESPACE
diff --git a/exporters/otlp/src/otlp_recordable.cc b/exporters/otlp/src/otlp_recordable.cc
@@ -77,7 +77,7 @@ proto::common::v1::InstrumentationScope OtlpRecordable::GetProtoInstrumentationS
 void OtlpRecordable::SetResource(const sdk::resource::Resource &resource) noexcept
 {
   resource_ = &resource;
-};
+}
 
 void OtlpRecordable::SetAttribute(nostd::string_view key,
                                   const common::AttributeValue &value) noexcept

diff --git a/exporters/prometheus/src/exporter.cc b/exporters/prometheus/src/exporter.cc
@@ -34,7 +34,7 @@ PrometheusExporter::PrometheusExporter() : is_shutdown_(false)
 }
 
 sdk::metrics::AggregationTemporality PrometheusExporter::GetAggregationTemporality(
-    sdk::metrics::InstrumentType instrument_type) const noexcept
+    sdk::metrics::InstrumentType /* instrument_type */) const noexcept
 {
   // Prometheus exporter only support Cumulative
   return sdk::metrics::AggregationTemporality::kCumulative;
@@ -69,7 +69,7 @@ sdk::common::ExportResult PrometheusExporter::Export(
   return sdk::common::ExportResult::kSuccess;
 }
 
-bool PrometheusExporter::ForceFlush(std::chrono::microseconds timeout) noexcept
+bool PrometheusExporter::ForceFlush(std::chrono::microseconds /* timeout */) noexcept
 {
   return true;
 }
@@ -81,7 +81,7 @@ bool PrometheusExporter::ForceFlush(std::chrono::microseconds timeout) noexcept
  * collection to to client an HTTP request being sent,
  * so we flush the data.
  */
-bool PrometheusExporter::Shutdown(std::chrono::microseconds timeout) noexcept
+bool PrometheusExporter::Shutdown(std::chrono::microseconds /* timeout */) noexcept
 {
   is_shutdown_ = true;
   return true;

diff --git a/exporters/prometheus/src/exporter_utils.cc b/exporters/prometheus/src/exporter_utils.cc
@@ -230,7 +230,7 @@ void PrometheusExporterUtils::SetMetricBasic(prometheus_client::ClientMetric &me
       metric.label[i++].value = AttributeValueToString(label.second);
     }
   }
-};
+}
 
 std::string PrometheusExporterUtils::AttributeValueToString(
     const opentelemetry::sdk::common::OwnedAttributeValue &value)

diff --git a/exporters/zipkin/src/recordable.cc b/exporters/zipkin/src/recordable.cc
@@ -188,8 +188,8 @@ void Recordable::AddEvent(nostd::string_view name,
   span_["annotations"].push_back(annotation);
 }
 
-void Recordable::AddLink(const trace_api::SpanContext &span_context,
-                         const common::KeyValueIterable &attributes) noexcept
+void Recordable::AddLink(const trace_api::SpanContext & /* span_context */,
+                         const common::KeyValueIterable & /* attributes */) noexcept
 {
   // TODO: Currently not supported by specs:
   // https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/sdk_exporters/zipkin.md

diff --git a/exporters/zipkin/src/zipkin_exporter.cc b/exporters/zipkin/src/zipkin_exporter.cc
@@ -110,7 +110,7 @@ void ZipkinExporter::InitializeLocalEndpoint()
   local_end_point_["port"] = url_parser_.port_;
 }
 
-bool ZipkinExporter::Shutdown(std::chrono::microseconds timeout) noexcept
+bool ZipkinExporter::Shutdown(std::chrono::microseconds /* timeout */) noexcept
 {
   const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(lock_);
   is_shutdown_ = true;

diff --git a/ext/include/opentelemetry/ext/http/client/curl/http_client_curl.h b/ext/include/opentelemetry/ext/http/client/curl/http_client_curl.h
@@ -263,7 +263,7 @@ class HttpClientSync : public opentelemetry::ext::http::client::HttpClientSync
     return opentelemetry::ext::http::client::Result(std::move(response), session_state);
   }
 
-  ~HttpClientSync() {}
+  ~HttpClientSync() override {}
 
 private:
   nostd::shared_ptr<HttpCurlGlobalInitializer> curl_global_initializer_;
@@ -274,7 +274,7 @@ class HttpClient : public opentelemetry::ext::http::client::HttpClient
 public:
   // The call (curl_global_init) is not thread safe. Ensure this is called only once.
   HttpClient();
-  ~HttpClient();
+  ~HttpClient() override;
 
   std::shared_ptr<opentelemetry::ext::http::client::Session> CreateSession(
       nostd::string_view url) noexcept override;

diff --git a/ext/include/opentelemetry/ext/http/client/nosend/http_client_nosend.h b/ext/include/opentelemetry/ext/http/client/nosend/http_client_nosend.h
@@ -15,7 +15,6 @@
 #  include <gtest/gtest.h>
 #  include "gmock/gmock.h"
 
-using namespace testing;
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace ext
 {

diff --git a/ext/include/opentelemetry/ext/http/server/http_server.h b/ext/include/opentelemetry/ext/http/server/http_server.h
@@ -54,6 +54,7 @@ class HttpRequestCallback
 
 public:
   HttpRequestCallback() {}
+  virtual ~HttpRequestCallback() = default;
 
   HttpRequestCallback &operator=(HttpRequestCallback other)
   {
@@ -175,7 +176,7 @@ class HttpServer : private SocketTools::Reactor::SocketCallback
     addListeningPort(port);
   }
 
-  ~HttpServer()
+  ~HttpServer() override
   {
     for (auto &sock : m_listeningSockets)
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,4 +47,4 @@ TEST(UpDownCountr, Record) @@
       counter->Add(10l, {{"k1", "1"}, {"k2", 2}}, opentelemetry::context::Context{});
     }
-    #endif
+    #endif