Fix flaky test on TomcatServlet3TestAsync (#7550)

Author: smola

dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/TomcatServlet3Test.groovy

@@ -199,6 +199,8 @@ abstract class TomcatServlet3Test extends AbstractServlet3Test<Tomcat, Context>
 
     and:
     assertTraces(count) {
+      Set<Tuple2<String, String>> loggedSpanIds = accessLogValue.loggedIds.toSet()
+      assert loggedSpanIds.size() == count
       (1..count).eachWithIndex { val, i ->
         trace(spanCount(SUCCESS)) {
           sortSpansByStart()
@@ -212,9 +214,8 @@ abstract class TomcatServlet3Test extends AbstractServlet3Test<Tomcat, Context>
           }
         }
 
-        def (String traceId, String spanId) = accessLogValue.loggedIds[i]
-        assert trace(i).get(0).traceId.toString() == traceId
-        assert trace(i).get(0).spanId.toString() == spanId
+        def ids = new Tuple2(trace(i).get(0).localRootSpan.traceId.toString(), trace(i).get(0).localRootSpan.spanId.toString())
+        assert ids in loggedSpanIds
       }
     }
 
@@ -250,8 +251,8 @@ abstract class TomcatServlet3Test extends AbstractServlet3Test<Tomcat, Context>
       }
 
       def (String traceId, String spanId) = accessLogValue.loggedIds[0]
-      assert trace(0).get(0).traceId.toString() == traceId
-      assert trace(0).get(0).spanId.toString() == spanId
+      assert trace(0).get(0).localRootSpan.traceId.toString() == traceId
+      assert trace(0).get(0).localRootSpan.spanId.toString() == spanId
     }
 
     where: