From 62030916408166da71f34f12da5779d3de97eeb0 Mon Sep 17 00:00:00 2001
From: Laplie Anderson <laplie.anderson@datadoghq.com>
Date: Thu, 3 Oct 2019 11:58:07 -0400
Subject: [PATCH] Wrap class setup spans in a trace for another race condition

---
 .../groovy/springdata/CouchbaseSpringTemplateTest.groovy   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dd-java-agent/instrumentation/couchbase-2.0/src/test/groovy/springdata/CouchbaseSpringTemplateTest.groovy b/dd-java-agent/instrumentation/couchbase-2.0/src/test/groovy/springdata/CouchbaseSpringTemplateTest.groovy
index 4e18ad8099..c07bb3516c 100644
--- a/dd-java-agent/instrumentation/couchbase-2.0/src/test/groovy/springdata/CouchbaseSpringTemplateTest.groovy
+++ b/dd-java-agent/instrumentation/couchbase-2.0/src/test/groovy/springdata/CouchbaseSpringTemplateTest.groovy
@@ -42,8 +42,11 @@ class CouchbaseSpringTemplateTest extends AbstractCouchbaseTest {
     Bucket bucketCouchbase = couchbaseCluster.openBucket(bucketCouchbase.name(), bucketCouchbase.password())
     Bucket bucketMemcache = memcacheCluster.openBucket(bucketMemcache.name(), bucketMemcache.password())
 
-    templates = [new CouchbaseTemplate(couchbaseManager.info(), bucketCouchbase),
-                 new CouchbaseTemplate(memcacheManager.info(), bucketMemcache)]
+    runUnderTrace("getting info") {
+      templates = [new CouchbaseTemplate(couchbaseManager.info(), bucketCouchbase),
+                   new CouchbaseTemplate(memcacheManager.info(), bucketMemcache)]
+      blockUntilChildSpansFinished(2)
+    }
   }
 
   def cleanupSpec() {