Handle IllegalArgumentException due to skipped SpanStartEvent (#1809)

census-instrumentation · Apr 11, 2019 · 8b886b0 · 8b886b0
1 parent 4bc39b6
commit 8b886b0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/impl_core/src/main/java/io/opencensus/implcore/trace/StartEndHandlerImpl.java b/impl_core/src/main/java/io/opencensus/implcore/trace/StartEndHandlerImpl.java
@@ -117,7 +117,10 @@ public void process() {
         spanExporter.addSpan(span);
       }
       if (runningSpanStore != null) {
-        runningSpanStore.onEnd(span);
+        try {
+          // Note that corresponding SpanStartEvent / onStart(span) might not have called if queue was full.
+          runningSpanStore.onEnd(span);
+        } catch (IllegalArgumentException e) {} // Span was not in the running span list
       }
       if (sampledSpanStore != null) {
         sampledSpanStore.considerForSampling(span);

diff --git a/...core/src/main/java/io/opencensus/implcore/trace/export/InProcessRunningSpanStoreImpl.java b/...core/src/main/java/io/opencensus/implcore/trace/export/InProcessRunningSpanStoreImpl.java
@@ -43,7 +43,7 @@ public void onStart(RecordEventsSpanImpl span) {
 
   @Override
   public void onEnd(RecordEventsSpanImpl span) {
-    runningSpans.removeElement(span);
+    runningSpans.removeElement(span); // Throws IllegalArgumentException if given span is not in the list
   }
 
   @Override

diff --git a/impl_core/src/main/java/io/opencensus/implcore/trace/export/RunningSpanStoreImpl.java b/impl_core/src/main/java/io/opencensus/implcore/trace/export/RunningSpanStoreImpl.java
@@ -44,6 +44,7 @@ static RunningSpanStoreImpl getNoopRunningSpanStoreImpl() {
    * Removes the {@code Span} from the running spans list when the {@code Span} ends.
    *
    * @param span the {@code Span} that ended.
+   * @throws IllegalArgumentException Given span is not started.
    */
   public abstract void onEnd(RecordEventsSpanImpl span);