Simplify local_span_store_test and SpanImpl. (#77)

Author: g-easy

opencensus/trace/internal/local_span_store_test.cc

@@ -22,17 +22,6 @@
 namespace opencensus {
 namespace trace {
 
-class SpanTestPeer {
- public:
-  static void End(absl::Duration latency, Span* span) {
-    // Set latency.
-    span->span_impl_for_test()->EndWithLatencyForTesting(latency);
-    // Call Span::ExportSpanForTesting to get span into stores.
-    span->span_impl_for_test()->ExportSpanForTesting(
-        span->span_impl_for_test());
-  }
-};
-
 namespace exporter {
 class LocalSpanStoreImplTestPeer {
  public:
@@ -48,16 +37,14 @@ TEST(LocalSpanStoreTest, GetSummary) {
   auto span = Span::StartSpan("SpanName", /*parent=*/nullptr,
                               {nullptr, /*record_events=*/true});
   span.AddAnnotation("Annotation");
-  SpanTestPeer::End(absl::Microseconds(15), &span);
+  span.End();
 
   auto summary = LocalSpanStore::GetSummary();
   EXPECT_EQ(1, summary.per_span_name_summary.size());
   EXPECT_EQ(1, summary.per_span_name_summary["SpanName"]
                    .number_of_latency_sampled_spans.size());
-  EXPECT_EQ(
-      1,
-      summary.per_span_name_summary["SpanName"].number_of_latency_sampled_spans
-          [LocalSpanStore::LatencyBucketBoundary::k10us_to_100us]);
+  // TODO: EXPECT it ended up in the right bucket in
+  // number_of_latency_sampled_spans[].
 }
 
 }  // namespace

opencensus/trace/internal/span_impl.cc

@@ -137,25 +137,13 @@ 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 {
   absl::MutexLock l(&mu_);
   return has_ended_;
 }
 
-void SpanImpl::EndWithLatencyForTesting(absl::Duration latency) {
-  absl::MutexLock l(&mu_);
-  has_ended_ = true;
-  end_time_ = start_time_ + latency;
-}
-
 void SpanImpl::EndWithTime(absl::Time end_time) {
   absl::MutexLock l(&mu_);
   if (!has_ended_) {

opencensus/trace/internal/span_impl.h

@@ -106,8 +106,6 @@ 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_);
 
   // Makes a deep copy of span contents and returns copied data in SpanData.