Addressed reviews

open-telemetry · Jul 26, 2020 · 381d435 · 381d435
1 parent 1f0bc9c
commit 381d435
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h b/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h
@@ -4,6 +4,7 @@
 #include "opentelemetry/sdk/trace/processor.h"
 #include <thread>
 #include <condition_variable>
+#include <atomic>
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
@@ -140,7 +141,9 @@ class BatchSpanProcessor : public SpanProcessor
     std::unique_ptr<common::CircularBuffer<Recordable>> buffer_;
 
     /* Important boolean flags to handle the workflow of the processor */
-    bool is_shutdown_{false}, is_force_flush_{false}, is_force_flush_notified_{false};
+    bool is_shutdown_{false}; 
+    bool is_force_flush_{false}; 
+    bool is_force_flush_notified_{false};
 };   
 
 } // trace

diff --git a/sdk/src/trace/batch_span_processor.cc b/sdk/src/trace/batch_span_processor.cc
@@ -80,7 +80,7 @@ void BatchSpanProcessor::ForceFlush(std::chrono::microseconds timeout) noexcept
     while(is_force_flush_ == true && timeout_left.count() > 0) {
         auto start = std::chrono::steady_clock::now();
         cv_.notify_one();
-        std::this_thread::sleep_for(std::chrono::nanoseconds(50));
+        // std::this_thread::sleep_for(std::chrono::nanoseconds(50));
         auto end = std::chrono::steady_clock::now();
         timeout_left -= std::chrono::duration_cast<std::chrono::microseconds>(end-start);
     }

diff --git a/sdk/test/trace/batch_span_processor_test.cc b/sdk/test/trace/batch_span_processor_test.cc
@@ -107,7 +107,7 @@ class BatchSpanProcessorTestPeer : public testing::Test
         for(int i = 0; i < num_spans; ++i)
         {
             test_spans->push_back(processor->MakeRecordable());
-            static_cast<sdk::trace::SpanData*>(test_spans->at(i).get())->SetName("Span " + i);
+            static_cast<sdk::trace::SpanData*>(test_spans->at(i).get())->SetName("Span " + std::to_string(i));
         }   
 
         return test_spans;
@@ -150,7 +150,7 @@ TEST_F(BatchSpanProcessorTestPeer, TestShutdown)
     EXPECT_EQ(num_spans, spans_received->size());
     for(int i = 0; i < num_spans; ++i)
     {
-        EXPECT_EQ("Span " + i, spans_received->at(i)->GetName());
+        EXPECT_EQ("Span " + std::to_string(i), spans_received->at(i)->GetName());
     }
 
     EXPECT_TRUE(*is_shutdown);
@@ -177,7 +177,7 @@ TEST_F(BatchSpanProcessorTestPeer, TestForceFlush)
     EXPECT_EQ(num_spans, spans_received->size());
     for(int i = 0; i < num_spans; ++i)
     {
-        EXPECT_EQ("Span " + i, spans_received->at(i)->GetName());
+        EXPECT_EQ("Span " + std::to_string(i), spans_received->at(i)->GetName());
     } 
 
     // Create some more spans to make sure that the processor still works
@@ -191,7 +191,7 @@ TEST_F(BatchSpanProcessorTestPeer, TestForceFlush)
     EXPECT_EQ(num_spans*2, spans_received->size());
     for(int i = 0; i < num_spans; ++i)
     {
-        EXPECT_EQ("Span " + i%num_spans, spans_received->at(i)->GetName());
+        EXPECT_EQ("Span " + std::to_string(i%num_spans), spans_received->at(i)->GetName());
     } 
 }
 
@@ -268,7 +268,7 @@ TEST_F(BatchSpanProcessorTestPeer, TestManySpansLossLess)
     EXPECT_EQ(num_spans, spans_received->size());
     for(int i = 0; i < num_spans; ++i)
     {
-        EXPECT_EQ("Span " + i, spans_received->at(i)->GetName());
+        EXPECT_EQ("Span " + std::to_string(i), spans_received->at(i)->GetName());
     }
 }
 
@@ -304,8 +304,8 @@ TEST_F(BatchSpanProcessorTestPeer, TestScheduleDelayMillis)
     EXPECT_EQ(max_export_batch_size, spans_received->size());
     for(size_t i = 0; i < max_export_batch_size; ++i)
     {
-        EXPECT_EQ("Span " + i, spans_received->at(i)->GetName());
+        EXPECT_EQ("Span " + std::to_string(i), spans_received->at(i)->GetName());
     }
 }
 
-OPENTELEMETRY_END_NAMESPACE
+OPENTELEMETRY_END_NAMESPACE