Fix build warnings (#1613)

open-telemetry · Sep 14, 2022 · c7dfc0d · c7dfc0d
1 parent 74f0ac1
commit c7dfc0d
Show file tree

Hide file tree

Showing 68 changed files with 334 additions and 345 deletions.
diff --git a/api/include/opentelemetry/baggage/baggage.h b/api/include/opentelemetry/baggage/baggage.h
@@ -28,7 +28,8 @@ class Baggage
 
   Baggage() noexcept : kv_properties_(new opentelemetry::common::KeyValueProperties()) {}
   Baggage(size_t size) noexcept
-      : kv_properties_(new opentelemetry::common::KeyValueProperties(size)){};
+      : kv_properties_(new opentelemetry::common::KeyValueProperties(size))
+  {}
 
   template <class T>
   Baggage(const T &keys_and_values) noexcept

diff --git a/api/include/opentelemetry/context/propagation/noop_propagator.h b/api/include/opentelemetry/context/propagation/noop_propagator.h
@@ -26,13 +26,15 @@ class NoOpPropagator : public TextMapPropagator
   }
 
   /** Noop inject function does nothing */
-  void Inject(TextMapCarrier & /*carrier*/, const context::Context &context) noexcept override {}
+  void Inject(TextMapCarrier & /*carrier*/,
+              const context::Context & /* context */) noexcept override
+  {}
 
-  bool Fields(nostd::function_ref<bool(nostd::string_view)> callback) const noexcept override
+  bool Fields(nostd::function_ref<bool(nostd::string_view)> /* callback */) const noexcept override
   {
     return true;
   }
 };
 }  // namespace propagation
 }  // namespace context
-OPENTELEMETRY_END_NAMESPACE
+OPENTELEMETRY_END_NAMESPACE
diff --git a/api/include/opentelemetry/context/propagation/text_map_propagator.h b/api/include/opentelemetry/context/propagation/text_map_propagator.h
@@ -26,7 +26,7 @@ class TextMapCarrier
 
   /* list of all the keys in the carrier.
    By default, it returns true without invoking callback */
-  virtual bool Keys(nostd::function_ref<bool(nostd::string_view)> callback) const noexcept
+  virtual bool Keys(nostd::function_ref<bool(nostd::string_view)> /* callback */) const noexcept
   {
     return true;
   }

diff --git a/api/include/opentelemetry/context/runtime_context.h b/api/include/opentelemetry/context/runtime_context.h
@@ -60,7 +60,7 @@ class RuntimeContextStorage
    */
   virtual bool Detach(Token &token) noexcept = 0;
 
-  virtual ~RuntimeContextStorage(){};
+  virtual ~RuntimeContextStorage() {}
 
 protected:
   nostd::unique_ptr<Token> CreateToken(const Context &context) noexcept
@@ -232,7 +232,7 @@ class ThreadLocalContextStorage : public RuntimeContextStorage
   {
     friend class ThreadLocalContextStorage;
 
-    Stack() noexcept : size_(0), capacity_(0), base_(nullptr){};
+    Stack() noexcept : size_(0), capacity_(0), base_(nullptr) {}
 
     // Pops the top Context off the stack.
     void Pop() noexcept

diff --git a/api/include/opentelemetry/logs/noop.h b/api/include/opentelemetry/logs/noop.h
@@ -41,13 +41,13 @@ class NoopLogger final : public Logger
 public:
   const nostd::string_view GetName() noexcept override { return "noop logger"; }
 
-  void Log(Severity severity,
-           nostd::string_view body,
-           const common::KeyValueIterable &attributes,
-           trace::TraceId trace_id,
-           trace::SpanId span_id,
-           trace::TraceFlags trace_flags,
-           common::SystemTimestamp timestamp) noexcept override
+  void Log(Severity /* severity */,
+           nostd::string_view /* body */,
+           const common::KeyValueIterable & /* attributes */,
+           trace::TraceId /* trace_id */,
+           trace::SpanId /* span_id */,
+           trace::TraceFlags /* trace_flags */,
+           common::SystemTimestamp /* timestamp */) noexcept override
   {}
 };
 
@@ -62,20 +62,20 @@ class NoopLoggerProvider final : public opentelemetry::logs::LoggerProvider
             nostd::shared_ptr<opentelemetry::logs::NoopLogger>(new opentelemetry::logs::NoopLogger)}
   {}
 
-  nostd::shared_ptr<Logger> GetLogger(nostd::string_view logger_name,
-                                      nostd::string_view options,
-                                      nostd::string_view library_name,
-                                      nostd::string_view library_version = "",
-                                      nostd::string_view schema_url      = "") override
+  nostd::shared_ptr<Logger> GetLogger(nostd::string_view /* logger_name */,
+                                      nostd::string_view /* options */,
+                                      nostd::string_view /* library_name */,
+                                      nostd::string_view /* library_version */,
+                                      nostd::string_view /* schema_url */) override
   {
     return logger_;
   }
 
-  nostd::shared_ptr<Logger> GetLogger(nostd::string_view logger_name,
-                                      nostd::span<nostd::string_view> args,
-                                      nostd::string_view library_name,
-                                      nostd::string_view library_version = "",
-                                      nostd::string_view schema_url      = "") override
+  nostd::shared_ptr<Logger> GetLogger(nostd::string_view /* logger_name */,
+                                      nostd::span<nostd::string_view> /* args */,
+                                      nostd::string_view /* library_name */,
+                                      nostd::string_view /* library_version */,
+                                      nostd::string_view /* schema_url */) override
   {
     return logger_;
   }

diff --git a/api/include/opentelemetry/metrics/noop.h b/api/include/opentelemetry/metrics/noop.h
@@ -19,61 +19,65 @@ template <class T>
 class NoopCounter : public Counter<T>
 {
 public:
-  NoopCounter(nostd::string_view name,
-              nostd::string_view description,
-              nostd::string_view unit) noexcept
+  NoopCounter(nostd::string_view /* name */,
+              nostd::string_view /* description */,
+              nostd::string_view /* unit */) noexcept
   {}
-  void Add(T value) noexcept override {}
-  void Add(T value, const opentelemetry::context::Context &context) noexcept override {}
-  void Add(T value, const common::KeyValueIterable &attributes) noexcept override {}
-  void Add(T value,
-           const common::KeyValueIterable &attributes,
-           const opentelemetry::context::Context &context) noexcept override
+  void Add(T /* value */) noexcept override {}
+  void Add(T /* value */, const opentelemetry::context::Context & /* context */) noexcept override
+  {}
+  void Add(T /* value */, const common::KeyValueIterable & /* attributes */) noexcept override {}
+  void Add(T /* value */,
+           const common::KeyValueIterable & /* attributes */,
+           const opentelemetry::context::Context & /* context */) noexcept override
   {}
 };
 
 template <class T>
 class NoopHistogram : public Histogram<T>
 {
 public:
-  NoopHistogram(nostd::string_view name,
-                nostd::string_view description,
-                nostd::string_view unit) noexcept
+  NoopHistogram(nostd::string_view /* name */,
+                nostd::string_view /* description */,
+                nostd::string_view /* unit */) noexcept
+  {}
+  void Record(T /* value */,
+              const opentelemetry::context::Context & /* context */) noexcept override
   {}
-  void Record(T value, const opentelemetry::context::Context &context) noexcept override {}
-  void Record(T value,
-              const common::KeyValueIterable &attributes,
-              const opentelemetry::context::Context &context) noexcept override
+  void Record(T /* value */,
+              const common::KeyValueIterable & /* attributes */,
+              const opentelemetry::context::Context & /* context */) noexcept override
   {}
 };
 
 template <class T>
 class NoopUpDownCounter : public UpDownCounter<T>
 {
 public:
-  NoopUpDownCounter(nostd::string_view name,
-                    nostd::string_view description,
-                    nostd::string_view unit) noexcept
+  NoopUpDownCounter(nostd::string_view /* name */,
+                    nostd::string_view /* description */,
+                    nostd::string_view /* unit */) noexcept
+  {}
+  void Add(T /* value */) noexcept override {}
+  void Add(T /* value */, const opentelemetry::context::Context & /* context */) noexcept override
   {}
-  void Add(T value) noexcept override {}
-  void Add(T value, const opentelemetry::context::Context &context) noexcept override {}
-  void Add(T value, const common::KeyValueIterable &attributes) noexcept override {}
-  void Add(T value,
-           const common::KeyValueIterable &attributes,
-           const opentelemetry::context::Context &context) noexcept override
+  void Add(T /* value */, const common::KeyValueIterable & /* attributes */) noexcept override {}
+  void Add(T /* value */,
+           const common::KeyValueIterable & /* attributes */,
+           const opentelemetry::context::Context & /* context */) noexcept override
   {}
 };
 
 class NoopObservableInstrument : public ObservableInstrument
 {
 public:
-  NoopObservableInstrument(nostd::string_view name,
-                           nostd::string_view description,
-                           nostd::string_view unit) noexcept
+  NoopObservableInstrument(nostd::string_view /* name */,
+                           nostd::string_view /* description */,
+                           nostd::string_view /* unit */) noexcept
   {}
 
-  void AddCallback(ObservableCallbackPtr, void *state) noexcept override {}
-  void RemoveCallback(ObservableCallbackPtr, void *state) noexcept override {}
+  void AddCallback(ObservableCallbackPtr, void * /* state */) noexcept override {}
+  void RemoveCallback(ObservableCallbackPtr, void * /* state */) noexcept override {}
 };
 
 /**
@@ -194,9 +198,9 @@ class NoopMeterProvider final : public MeterProvider
 public:
   NoopMeterProvider() : meter_{nostd::shared_ptr<Meter>(new NoopMeter)} {}
 
-  nostd::shared_ptr<Meter> GetMeter(nostd::string_view library_name,
-                                    nostd::string_view library_version,
-                                    nostd::string_view schema_url) noexcept override
+  nostd::shared_ptr<Meter> GetMeter(nostd::string_view /* library_name */,
+                                    nostd::string_view /* library_version */,
+                                    nostd::string_view /* schema_url */) noexcept override
   {
     return meter_;
   }
@@ -206,4 +210,4 @@ class NoopMeterProvider final : public MeterProvider
 };
 }  // namespace metrics
 OPENTELEMETRY_END_NAMESPACE
-#endif
+#endif
diff --git a/api/include/opentelemetry/nostd/string_view.h b/api/include/opentelemetry/nostd/string_view.h
@@ -81,12 +81,12 @@ class string_view
     if (result == 0)
       result = size() == v.size() ? 0 : (size() < v.size() ? -1 : 1);
     return result;
-  };
+  }
 
   int compare(size_type pos1, size_type count1, string_view v) const
   {
     return substr(pos1, count1).compare(v);
-  };
+  }
 
   int compare(size_type pos1,
               size_type count1,
@@ -95,19 +95,19 @@ class string_view
               size_type count2) const
   {
     return substr(pos1, count1).compare(v.substr(pos2, count2));
-  };
+  }
 
-  int compare(const char *s) const { return compare(string_view(s)); };
+  int compare(const char *s) const { return compare(string_view(s)); }
 
   int compare(size_type pos1, size_type count1, const char *s) const
   {
     return substr(pos1, count1).compare(string_view(s));
-  };
+  }
 
   int compare(size_type pos1, size_type count1, const char *s, size_type count2) const
   {
     return substr(pos1, count1).compare(string_view(s, count2));
-  };
+  }
 
   size_type find(char ch, size_type pos = 0) const noexcept
   {
@@ -138,9 +138,13 @@ class string_view
 inline bool operator==(string_view lhs, string_view rhs) noexcept
 {
   return lhs.length() == rhs.length() &&
-#  if _MSC_VER == 1900
+#  if defined(_MSC_VER)
+#    if _MSC_VER == 1900
          // Avoid SCL error in Visual Studio 2015
          (std::memcmp(lhs.data(), rhs.data(), lhs.length()) == 0);
+#    else
+         std::equal(lhs.data(), lhs.data() + lhs.length(), rhs.data());
+#    endif
 #  else
          std::equal(lhs.data(), lhs.data() + lhs.length(), rhs.data());
 #  endif

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

diff --git a/api/include/opentelemetry/trace/noop.h b/api/include/opentelemetry/trace/noop.h
@@ -106,9 +106,9 @@ class NoopTracerProvider final : public opentelemetry::trace::TracerProvider
   {}
 
   nostd::shared_ptr<opentelemetry::trace::Tracer> GetTracer(
-      nostd::string_view library_name,
-      nostd::string_view library_version,
-      nostd::string_view schema_url) noexcept override
+      nostd::string_view /* library_name */,
+      nostd::string_view /* library_version */,
+      nostd::string_view /* schema_url */) noexcept override
   {
     return tracer_;
   }

diff --git a/api/include/opentelemetry/trace/span_context_kv_iterable.h b/api/include/opentelemetry/trace/span_context_kv_iterable.h
@@ -47,7 +47,7 @@ class NullSpanContext : public SpanContextKeyValueIterable
     return true;
   }
 
-  size_t size() const noexcept override { return 0; };
+  size_t size() const noexcept override { return 0; }
 };
 
 }  // namespace trace

diff --git a/api/include/opentelemetry/trace/trace_state.h b/api/include/opentelemetry/trace/trace_state.h
@@ -233,8 +233,8 @@ class TraceState
   }
 
 private:
-  TraceState() : kv_properties_(new opentelemetry::common::KeyValueProperties()){};
-  TraceState(size_t size) : kv_properties_(new opentelemetry::common::KeyValueProperties(size)){};
+  TraceState() : kv_properties_(new opentelemetry::common::KeyValueProperties()) {}
+  TraceState(size_t size) : kv_properties_(new opentelemetry::common::KeyValueProperties(size)) {}
 
   static nostd::string_view TrimString(nostd::string_view str, size_t left, size_t right)
   {

diff --git a/api/test/baggage/baggage_benchmark.cc b/api/test/baggage/baggage_benchmark.cc
@@ -46,7 +46,8 @@ void BM_ExtractBaggageHavingTenEntries(benchmark::State &state)
   auto baggage = Baggage::FromHeader(header_with_custom_entries(kNumEntries));
   while (state.KeepRunning())
   {
-    baggage->GetAllEntries([](nostd::string_view key, nostd::string_view value) { return true; });
+    baggage->GetAllEntries(
+        [](nostd::string_view /* key */, nostd::string_view /* value */) { return true; });
   }
 }
 BENCHMARK(BM_ExtractBaggageHavingTenEntries);
@@ -66,7 +67,8 @@ void BM_ExtractBaggageWith180Entries(benchmark::State &state)
   auto baggage = Baggage::FromHeader(header_with_custom_entries(Baggage::kMaxKeyValuePairs));
   while (state.KeepRunning())
   {
-    baggage->GetAllEntries([](nostd::string_view key, nostd::string_view value) { return true; });
+    baggage->GetAllEntries(
+        [](nostd::string_view /* key */, nostd::string_view /* value */) { return true; });
   }
 }
 BENCHMARK(BM_ExtractBaggageWith180Entries);

diff --git a/api/test/logs/logger_test.cc b/api/test/logs/logger_test.cc
@@ -117,33 +117,33 @@ class TestLogger : public Logger
 {
   const nostd::string_view GetName() noexcept override { return "test logger"; }
 
-  void Log(Severity severity,
-           string_view body,
-           const common::KeyValueIterable &attributes,
-           trace::TraceId trace_id,
-           trace::SpanId span_id,
-           trace::TraceFlags trace_flags,
-           common::SystemTimestamp timestamp) noexcept override
+  void Log(Severity /* severity */,
+           string_view /* body */,
+           const common::KeyValueIterable & /* attributes */,
+           trace::TraceId /* trace_id */,
+           trace::SpanId /* span_id */,
+           trace::TraceFlags /* trace_flags */,
+           common::SystemTimestamp /* timestamp */) noexcept override
   {}
 };
 
 // Define a basic LoggerProvider class that returns an instance of the logger class defined above
 class TestProvider : public LoggerProvider
 {
-  nostd::shared_ptr<Logger> GetLogger(nostd::string_view logger_name,
-                                      nostd::string_view options,
-                                      nostd::string_view library_name,
-                                      nostd::string_view library_version = "",
-                                      nostd::string_view schema_url      = "") override
+  nostd::shared_ptr<Logger> GetLogger(nostd::string_view /* logger_name */,
+                                      nostd::string_view /* options */,
+                                      nostd::string_view /* library_name */,
+                                      nostd::string_view /* library_version */,
+                                      nostd::string_view /* schema_url */) override
   {
     return shared_ptr<Logger>(new TestLogger());
   }
 
-  nostd::shared_ptr<Logger> GetLogger(nostd::string_view logger_name,
-                                      nostd::span<nostd::string_view> args,
-                                      nostd::string_view library_name,
-                                      nostd::string_view library_version = "",
-                                      nostd::string_view schema_url      = "") override
+  nostd::shared_ptr<Logger> GetLogger(nostd::string_view /* logger_name */,
+                                      nostd::span<nostd::string_view> /* args */,
+                                      nostd::string_view /* library_name */,
+                                      nostd::string_view /* library_version */,
+                                      nostd::string_view /* schema_url */) override
   {
     return shared_ptr<Logger>(new TestLogger());
   }