From c5dbd7d0d76827ad25d3cfaf322f5597676df011 Mon Sep 17 00:00:00 2001
From: Nikolay Martynov <mar.kolya@gmail.com>
Date: Fri, 17 May 2019 13:49:46 -0400
Subject: [PATCH] Fix ApacheHttpAsync race condition

---
 .../groovy/ApacheHttpAsyncClientNullCallbackTest.groovy     | 6 +-----
 .../groovy/datadog/trace/agent/test/AgentTestRunner.java    | 4 ++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/test/groovy/ApacheHttpAsyncClientNullCallbackTest.groovy b/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/test/groovy/ApacheHttpAsyncClientNullCallbackTest.groovy
index ea8e04521b..ea3ecff48b 100644
--- a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/test/groovy/ApacheHttpAsyncClientNullCallbackTest.groovy
+++ b/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/test/groovy/ApacheHttpAsyncClientNullCallbackTest.groovy
@@ -1,6 +1,5 @@
 import datadog.trace.agent.test.base.HttpClientTest
 import datadog.trace.instrumentation.apachehttpasyncclient.ApacheHttpAsyncClientDecorator
-import io.opentracing.util.GlobalTracer
 import org.apache.http.client.methods.HttpGet
 import org.apache.http.impl.nio.client.HttpAsyncClients
 import org.apache.http.message.BasicHeader
@@ -34,10 +33,7 @@ class ApacheHttpAsyncClientNullCallbackTest extends HttpClientTest<ApacheHttpAsy
     Future future = client.execute(request, null)
     future.get()
     if (callback != null) {
-      // Request span is closed asynchronously even in regards to returned future so we have to wait here.
-      if (GlobalTracer.get().activeSpan() != null) {
-        blockUntilChildSpansFinished(1)
-      }
+      blockUntilChildSpansFinished(1)
       callback()
     }
     return 200
diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/AgentTestRunner.java b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/AgentTestRunner.java
index 9d97fd4d5c..3dcc24912e 100644
--- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/AgentTestRunner.java
+++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/AgentTestRunner.java
@@ -200,6 +200,10 @@ public abstract class AgentTestRunner extends Specification {
 
   public void blockUntilChildSpansFinished(final int numberOfSpans) throws InterruptedException {
     final DDSpan span = (DDSpan) io.opentracing.util.GlobalTracer.get().activeSpan();
+    if (span == null) {
+      // If there is no active span avoid getting an NPE
+      return;
+    }
     final PendingTrace pendingTrace = span.context().getTrace();
 
     while (pendingTrace.size() < numberOfSpans) {