Fix double-export bug in local_span_store_test. (#72)

Author: Vizerai

opencensus/trace/internal/local_span_store_test.cc

@@ -27,8 +27,9 @@ class SpanTestPeer {
   static void End(absl::Duration latency, Span* span) {
     // Set latency.
     span->span_impl_for_test()->EndWithLatencyForTesting(latency);
-    // Then call Span::End to get into stores.
-    span->End();
+    // Call Span::ExportSpanForTesting to get span into stores.
+    span->span_impl_for_test()->ExportSpanForTesting(
+        span->span_impl_for_test());
   }
 };
 

opencensus/trace/internal/span_impl.cc

@@ -23,6 +23,9 @@
 #include "opencensus/trace/attribute_value_ref.h"
 #include "opencensus/trace/exporter/attribute_value.h"
 #include "opencensus/trace/exporter/message_event.h"
+#include "opencensus/trace/internal/local_span_store_impl.h"
+#include "opencensus/trace/internal/running_span_store_impl.h"
+#include "opencensus/trace/internal/span_exporter_impl.h"
 #include "opencensus/trace/span.h"
 
 namespace opencensus {
@@ -134,6 +137,12 @@ void SpanImpl::SetStatus(exporter::Status&& status) {
   }
 }
 
+void SpanImpl::ExportSpanForTesting(const std::shared_ptr<SpanImpl>& span) {
+  exporter::RunningSpanStoreImpl::Get()->RemoveSpan(span);
+  exporter::LocalSpanStoreImpl::Get()->AddSpan(span);
+  exporter::SpanExporterImpl::Get()->AddSpan(span);
+}
+
 void SpanImpl::End() { EndWithTime(absl::Now()); }
 
 bool SpanImpl::HasEnded() const {
@@ -142,7 +151,9 @@ bool SpanImpl::HasEnded() const {
 }
 
 void SpanImpl::EndWithLatencyForTesting(absl::Duration latency) {
-  EndWithTime(start_time_ + latency);
+  absl::MutexLock l(&mu_);
+  has_ended_ = true;
+  end_time_ = start_time_ + latency;
 }
 
 void SpanImpl::EndWithTime(absl::Time end_time) {

opencensus/trace/internal/span_impl.h

@@ -106,6 +106,7 @@ class SpanImpl final {
   friend class ::opencensus::trace::exporter::SpanExporterImpl;
   friend class ::opencensus::trace::SpanTestPeer;
 
+  void ExportSpanForTesting(const std::shared_ptr<SpanImpl>& span);
   void EndWithLatencyForTesting(absl::Duration latency) LOCKS_EXCLUDED(mu_);
   void EndWithTime(absl::Time end_time) LOCKS_EXCLUDED(mu_);