From ec138d73c5bfec4d6b0b9fecae9f78173dfbe7fc Mon Sep 17 00:00:00 2001
From: Carlos Alberto Cortez <calberto.cortez@gmail.com>
Date: Wed, 21 Aug 2019 15:26:37 +0200
Subject: [PATCH] Sort finished Spans by either start/finish time in OT
 testbed. (#502)

Order the Spans in latespanfinish and multiplecallbacks cases
to *make sure* the invariant is enforced (prior to do assert
the conditions).
---
 .../testbed/latespanfinish/LateSpanFinishTest.java          | 6 ++++--
 .../testbed/multiplecallbacks/MultipleCallbacksTest.java    | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/opentracing_shim/src/test/java/io/opentelemetry/opentracingshim/testbed/latespanfinish/LateSpanFinishTest.java b/opentracing_shim/src/test/java/io/opentelemetry/opentracingshim/testbed/latespanfinish/LateSpanFinishTest.java
index 8bc3e6d74b..b4cbd46c05 100644
--- a/opentracing_shim/src/test/java/io/opentelemetry/opentracingshim/testbed/latespanfinish/LateSpanFinishTest.java
+++ b/opentracing_shim/src/test/java/io/opentelemetry/opentracingshim/testbed/latespanfinish/LateSpanFinishTest.java
@@ -21,6 +21,7 @@ import static io.opentelemetry.opentracingshim.testbed.TestUtils.createTracerShi
 import static io.opentelemetry.opentracingshim.testbed.TestUtils.sleep;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import io.opentelemetry.sdk.trace.export.InMemorySpanExporter;
 import io.opentracing.Scope;
@@ -51,10 +52,11 @@ public final class LateSpanFinishTest {
     // Late-finish the parent Span now
     parentSpan.finish();
 
+    // Children finish order is not guaranteed, but parent should finish *last*.
     List<io.opentelemetry.proto.trace.v1.Span> spans = exporter.getFinishedSpanItems();
     assertEquals(3, spans.size());
-    assertEquals("task1", spans.get(0).getName());
-    assertEquals("task2", spans.get(1).getName());
+    assertTrue(spans.get(0).getName().startsWith("task"));
+    assertTrue(spans.get(1).getName().startsWith("task"));
     assertEquals("parent", spans.get(2).getName());
 
     assertSameTrace(spans);
diff --git a/opentracing_shim/src/test/java/io/opentelemetry/opentracingshim/testbed/multiplecallbacks/MultipleCallbacksTest.java b/opentracing_shim/src/test/java/io/opentelemetry/opentracingshim/testbed/multiplecallbacks/MultipleCallbacksTest.java
index 3957a267c8..84939c91e8 100644
--- a/opentracing_shim/src/test/java/io/opentelemetry/opentracingshim/testbed/multiplecallbacks/MultipleCallbacksTest.java
+++ b/opentracing_shim/src/test/java/io/opentelemetry/opentracingshim/testbed/multiplecallbacks/MultipleCallbacksTest.java
@@ -18,6 +18,7 @@ package io.opentelemetry.opentracingshim.testbed.multiplecallbacks;
 
 import static io.opentelemetry.opentracingshim.testbed.TestUtils.createTracerShim;
 import static io.opentelemetry.opentracingshim.testbed.TestUtils.finishedSpansSize;
+import static io.opentelemetry.opentracingshim.testbed.TestUtils.sortByStartTime;
 import static org.awaitility.Awaitility.await;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertEquals;
@@ -50,7 +51,9 @@ public class MultipleCallbacksTest {
 
     await().atMost(15, TimeUnit.SECONDS).until(finishedSpansSize(exporter), equalTo(4));
 
+    // Finish order is not guaranteed, so we rely on *start time* to fetch the parent.
     List<io.opentelemetry.proto.trace.v1.Span> spans = exporter.getFinishedSpanItems();
+    spans = sortByStartTime(spans);
     assertEquals(4, spans.size());
     assertEquals("parent", spans.get(0).getName());