Fix some C++ warnings (open-telemetry#619)

api/include/opentelemetry/trace/span_context.h

@@ -102,8 +102,8 @@ class SpanContext final
   trace_api::TraceId trace_id_;
   trace_api::SpanId span_id_;
   trace_api::TraceFlags trace_flags_;
+  bool is_remote_;
   nostd::shared_ptr<trace_api::TraceState> trace_state_;
-  bool is_remote_ = false;
 };
 }  // namespace trace
 OPENTELEMETRY_END_NAMESPACE

api/include/opentelemetry/trace/trace_state.h

@@ -126,7 +126,6 @@ class TraceState
 
     std::size_t begin{0};
     std::size_t end{0};
-    bool invalid_header = false;
     while (begin < header.size() && ts->num_entries_ < kMaxKeyValuePairs)
     {
       // find list-member

exporters/ostream/test/ostream_log_test.cc

@@ -274,7 +274,6 @@ TEST(OStreamLogExporter, IntegrationTest)
       "  span_id       : 0000000000000000\n"
       "  trace_flags   : 00\n"
       "}\n";
-  "}\n";
 
   ASSERT_EQ(stdcoutOutput.str(), expectedOutput);
 }

ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h

@@ -76,21 +76,22 @@ class HttpOperation
                 // Default connectivity and response size options
                 bool is_raw_response                        = false,
                 std::chrono::milliseconds http_conn_timeout = default_http_conn_timeout)
-      : method_(method),
-        url_(url),
-        callback_(callback),
-        request_mode_(request_mode),
-        // Local vars
-        request_headers_(request_headers),
-        request_body_(request_body),
+      : is_aborted_(false),
+        is_finished_(false),
         // Optional connection params
         is_raw_response_(is_raw_response),
         http_conn_timeout_(http_conn_timeout),
+        request_mode_(request_mode),
+        curl_(nullptr),
         // Result
         res_(CURLE_OK),
+        callback_(callback),
+        method_(method),
+        url_(url),
+        // Local vars
+        request_headers_(request_headers),
+        request_body_(request_body),
         sockfd_(0),
-        is_aborted_(false),
-        is_finished_(false),
         nread_(0)
   {
     /* get a curl handle */
@@ -406,7 +407,7 @@ class HttpOperation
   CURL *curl_;    // Local curl instance
   CURLcode res_;  // Curl result OR HTTP status code if successful
 
-  http_client::EventHandler *callback_ = nullptr;
+  http_client::EventHandler *callback_;
 
   // Request values
   http_client::Method method_;

sdk/include/opentelemetry/sdk/logs/logger.h

@@ -70,12 +70,12 @@ class Logger final : public opentelemetry::logs::Logger
            core::SystemTimestamp timestamp) noexcept override;
 
 private:
+  // The name of this logger
+  std::string logger_name_;
+
   // The logger provider of this Logger. Uses a weak_ptr to avoid cyclic dependency issues the with
   // logger provider
   std::weak_ptr<LoggerProvider> logger_provider_;
-
-  // The name of this logger
-  std::string logger_name_;
 };
 
 }  // namespace logs

sdk/include/opentelemetry/sdk/logs/recordable.h

@@ -4,7 +4,6 @@
 #include "opentelemetry/common/key_value_iterable.h"
 #include "opentelemetry/core/timestamp.h"
 #include "opentelemetry/logs/severity.h"
-#include "opentelemetry/sdk/common/empty_attributes.h"
 #include "opentelemetry/trace/span.h"
 #include "opentelemetry/trace/span_context.h"
 #include "opentelemetry/trace/span_id.h"

sdk/test/logs/batch_log_processor_test.cc

@@ -252,7 +252,7 @@ TEST_F(BatchLogProcessorTest, TestScheduledDelayMillis)
   auto batch_processor = GetMockProcessor(logs_received, is_shutdown, is_export_completed,
                                           export_delay, scheduled_delay_millis);
 
-  for (int i = 0; i < max_export_batch_size; ++i)
+  for (std::size_t i = 0; i < max_export_batch_size; ++i)
   {
     auto log = batch_processor->MakeRecordable();
     log->SetName("Log" + std::to_string(i));

sdk/test/resource/resource_test.cc

@@ -70,6 +70,7 @@ TEST(ResourceTest, create_with_servicename)
   {
     EXPECT_TRUE(expected_attributes.find(e.first) != expected_attributes.end());
     if (expected_attributes.find(e.first) != expected_attributes.end())
+    {
       if (e.first == "version")
         EXPECT_EQ(opentelemetry::nostd::get<uint32_t>(expected_attributes.find(e.first)->second),
                   opentelemetry::nostd::get<uint32_t>(e.second));
@@ -79,6 +80,7 @@ TEST(ResourceTest, create_with_servicename)
       else
         EXPECT_EQ(opentelemetry::nostd::get<std::string>(expected_attributes.find(e.first)->second),
                   opentelemetry::nostd::get<std::string>(e.second));
+    }
   }
   EXPECT_EQ(received_attributes.size(), expected_attributes.size());  // for missing service.name
 }
@@ -118,8 +120,10 @@ TEST(ResourceTest, Merge)
   {
     EXPECT_TRUE(expected_attributes.find(e.first) != expected_attributes.end());
     if (expected_attributes.find(e.first) != expected_attributes.end())
+    {
       EXPECT_EQ(expected_attributes.find(e.first)->second,
                 opentelemetry::nostd::get<std::string>(e.second));
+    }
   }
   EXPECT_EQ(received_attributes.size(), expected_attributes.size());
 }
@@ -138,8 +142,10 @@ TEST(ResourceTest, MergeEmptyString)
   {
     EXPECT_TRUE(expected_attributes.find(e.first) != expected_attributes.end());
     if (expected_attributes.find(e.first) != expected_attributes.end())
+    {
       EXPECT_EQ(expected_attributes.find(e.first)->second,
                 opentelemetry::nostd::get<std::string>(e.second));
+    }
   }
   EXPECT_EQ(received_attributes.size(), expected_attributes.size());
 }
@@ -161,8 +167,10 @@ TEST(ResourceTest, OtelResourceDetector)
   {
     EXPECT_TRUE(expected_attributes.find(e.first) != expected_attributes.end());
     if (expected_attributes.find(e.first) != expected_attributes.end())
+    {
       EXPECT_EQ(expected_attributes.find(e.first)->second,
                 opentelemetry::nostd::get<std::string>(e.second));
+    }
   }
   EXPECT_EQ(received_attributes.size(), expected_attributes.size());
   unsetenv("OTEL_RESOURCE_ATTRIBUTES");
@@ -179,8 +187,10 @@ TEST(ResourceTest, OtelResourceDetectorEmptyEnv)
   {
     EXPECT_TRUE(expected_attributes.find(e.first) != expected_attributes.end());
     if (expected_attributes.find(e.first) != expected_attributes.end())
+    {
       EXPECT_EQ(expected_attributes.find(e.first)->second,
                 opentelemetry::nostd::get<std::string>(e.second));
+    }
   }
   EXPECT_EQ(received_attributes.size(), expected_attributes.size());
 }