Fold up submitSpanEnd

Author: fhanau

src/workerd/io/tracer.h

@@ -194,12 +194,11 @@ class WorkerTracer final: public BaseTracer {
 
 class SpanSubmitter: public kj::Refcounted {
  public:
-  virtual void submitSpan(tracing::SpanId context, tracing::SpanId spanId, const Span& span) = 0;
   virtual void submitSpanOpen(tracing::SpanId spanId,
       tracing::SpanId parentSpanId,
       kj::ConstString operationName,
       kj::Date startTime) = 0;
-  virtual void submitSpanEnd(tracing::SpanId spanId, const Span& span) = 0;
+  virtual void submitSpan(tracing::SpanId context, tracing::SpanId spanId, const Span& span) = 0;
 
   virtual tracing::SpanId makeSpanId() = 0;
 };

src/workerd/server/server.c++

@@ -1701,23 +1701,8 @@ class SequentialSpanSubmitter final: public SpanSubmitter {
  public:
   SequentialSpanSubmitter(kj::Own<WorkerTracer> workerTracer): workerTracer(kj::mv(workerTracer)) {}
   void submitSpan(tracing::SpanId spanId, tracing::SpanId parentSpanId, const Span& span) override {
-    // This code path is workerd-only, we can safely decompose this span into its components and
-    // call submitSpanOpen/submitSpanEnd instead of reimplementing them here.
+    // This code path is workerd-only, we can safely utilize submitSpanOpen here.
     submitSpanOpen(spanId, parentSpanId, span.operationName.clone(), span.startTime);
-    submitSpanEnd(spanId, span);
-  }
-
-  void submitSpanOpen(tracing::SpanId spanId,
-      tracing::SpanId parentSpanId,
-      kj::ConstString operationName,
-      kj::Date startTime) override {
-    if (isPredictableModeForTest()) {
-      startTime = kj::UNIX_EPOCH;
-    }
-    workerTracer->addSpanOpen(spanId, parentSpanId, kj::mv(operationName), startTime);
-  }
-
-  void submitSpanEnd(tracing::SpanId spanId, const Span& span) override {
     tracing::SpanEndData span2(spanId, span.startTime, span.endTime);
     span2.tags.reserve(span.tags.size());
     for (auto& tag: span.tags) {
@@ -1730,6 +1715,16 @@ class SequentialSpanSubmitter final: public SpanSubmitter {
     workerTracer->addSpanEnd(kj::mv(span2));
   }
 
+  void submitSpanOpen(tracing::SpanId spanId,
+      tracing::SpanId parentSpanId,
+      kj::ConstString operationName,
+      kj::Date startTime) override {
+    if (isPredictableModeForTest()) {
+      startTime = kj::UNIX_EPOCH;
+    }
+    workerTracer->addSpanOpen(spanId, parentSpanId, kj::mv(operationName), startTime);
+  }
+
   tracing::SpanId makeSpanId() override {
     return tracing::SpanId(nextSpanId++);
   }