From 0b414e4ea4517ef2aad4c8293fbbce7da0c9f283 Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Mon, 6 Dec 2021 19:35:00 +0200
Subject: [PATCH] Sort traces in vaarin tests (#4812)

---
 .../test/vaadin/AbstractVaadin14Test.groovy   | 16 ++--
 .../test/vaadin/AbstractVaadin16Test.groovy   | 73 +++++++------------
 2 files changed, 33 insertions(+), 56 deletions(-)

diff --git a/instrumentation/vaadin-14.2/testing/src/main/groovy/test/vaadin/AbstractVaadin14Test.groovy b/instrumentation/vaadin-14.2/testing/src/main/groovy/test/vaadin/AbstractVaadin14Test.groovy
index bc31082d59..50b1e8b7bf 100644
--- a/instrumentation/vaadin-14.2/testing/src/main/groovy/test/vaadin/AbstractVaadin14Test.groovy
+++ b/instrumentation/vaadin-14.2/testing/src/main/groovy/test/vaadin/AbstractVaadin14Test.groovy
@@ -30,6 +30,8 @@ abstract class AbstractVaadin14Test extends AbstractVaadinTest {
   @Override
   void assertFirstRequest() {
     assertTraces(VAADIN_14_4 ? 5 : 4) {
+      traces.sort(orderByRootSpanName(getContextPath() + "/main", getContextPath() + "/*"))
+
       def handlers = getRequestHandlers("BootstrapHandler")
       trace(0, 2 + handlers.size()) {
         serverSpan(it, 0, getContextPath() + "/main")
@@ -49,17 +51,9 @@ abstract class AbstractVaadin14Test extends AbstractVaadinTest {
         }
       }
       // following traces are for javascript files used on page
-      trace(1, 1) {
-        serverSpan(it, 0, getContextPath() + "/*")
-      }
-      trace(2, 1) {
-        serverSpan(it, 0, getContextPath() + "/*")
-      }
-      trace(3, 1) {
-        serverSpan(it, 0, getContextPath() + "/*")
-      }
-      if (VAADIN_14_4) {
-        trace(4, 1) {
+      def count = VAADIN_14_4 ? 3 : 2
+      for (i in 0..count) {
+        trace(1 + i, 1) {
           serverSpan(it, 0, getContextPath() + "/*")
         }
       }
diff --git a/instrumentation/vaadin-14.2/testing/src/main/groovy/test/vaadin/AbstractVaadin16Test.groovy b/instrumentation/vaadin-14.2/testing/src/main/groovy/test/vaadin/AbstractVaadin16Test.groovy
index 4392fb17a0..2463476c3d 100644
--- a/instrumentation/vaadin-14.2/testing/src/main/groovy/test/vaadin/AbstractVaadin16Test.groovy
+++ b/instrumentation/vaadin-14.2/testing/src/main/groovy/test/vaadin/AbstractVaadin16Test.groovy
@@ -41,6 +41,9 @@ abstract class AbstractVaadin16Test extends AbstractVaadinTest {
   @Override
   void assertFirstRequest() {
     assertTraces(VAADIN_17 ? 9 : 8) {
+      traces.sort(orderByRootSpanName("IndexHtmlRequestHandler.handleRequest",
+        getContextPath() + "/main", getContextPath(), getContextPath() + "/*"))
+
       def handlers = getRequestHandlers("IndexHtmlRequestHandler")
       trace(0, 2 + handlers.size()) {
         serverSpan(it, 0, "IndexHtmlRequestHandler.handleRequest")
@@ -58,52 +61,8 @@ abstract class AbstractVaadin16Test extends AbstractVaadinTest {
           }
         }
       }
-      // /xyz/VAADIN/build/vaadin-bundle-*.cache.js
-      trace(1, 1) {
-        serverSpan(it, 0, getContextPath() + "/*")
-      }
-      if (VAADIN_17) {
-        // /xyz/VAADIN/build/vaadin-devmodeGizmo-*.cache.js
-        trace(2, 1) {
-          serverSpan(it, 0, getContextPath() + "/*")
-        }
-      }
-      int traceIndex = VAADIN_17 ? 3 : 2
-      handlers = getRequestHandlers("JavaScriptBootstrapHandler")
-      trace(traceIndex, 2 + handlers.size()) {
-        serverSpan(it, 0, getContextPath())
-        span(1) {
-          name "SpringVaadinServletService.handleRequest"
-          kind SpanKind.INTERNAL
-          childOf span(0)
-        }
-        int spanIndex = 2
-        handlers.each { handler ->
-          span(spanIndex++) {
-            name handler + ".handleRequest"
-            kind SpanKind.INTERNAL
-            childOf span(1)
-          }
-        }
-      }
-      // /xyz/VAADIN/build/vaadin-?-*.cache.js
-      trace(traceIndex + 1, 1) {
-        serverSpan(it, 0, getContextPath() + "/*")
-      }
-      // /xyz/VAADIN/build/vaadin-?-*.cache.js
-      trace(traceIndex + 2, 1) {
-        serverSpan(it, 0, getContextPath() + "/*")
-      }
-      // /xyz/VAADIN/build/vaadin-?-*.cache.js
-      trace(traceIndex + 3, 1) {
-        serverSpan(it, 0, getContextPath() + "/*")
-      }
-      // /xyz/VAADIN/build/vaadin-?-*.cache.js
-      trace(traceIndex + 4, 1) {
-        serverSpan(it, 0, getContextPath() + "/*")
-      }
       handlers = getRequestHandlers("UidlRequestHandler")
-      trace(traceIndex + 5, 2 + handlers.size() + 2) {
+      trace(1, 2 + handlers.size() + 2) {
         serverSpan(it, 0, getContextPath() + "/main")
         span(1) {
           name "SpringVaadinServletService.handleRequest"
@@ -131,6 +90,30 @@ abstract class AbstractVaadin16Test extends AbstractVaadinTest {
           childOf span(spanIndex)
         }
       }
+      handlers = getRequestHandlers("JavaScriptBootstrapHandler")
+      trace(2, 2 + handlers.size()) {
+        serverSpan(it, 0, getContextPath())
+        span(1) {
+          name "SpringVaadinServletService.handleRequest"
+          kind SpanKind.INTERNAL
+          childOf span(0)
+        }
+        int spanIndex = 2
+        handlers.each { handler ->
+          span(spanIndex++) {
+            name handler + ".handleRequest"
+            kind SpanKind.INTERNAL
+            childOf span(1)
+          }
+        }
+      }
+      // following traces are for javascript files used on page
+      def count = VAADIN_17 ? 5 : 4
+      for (i in 0..count) {
+        trace(3 + i, 1) {
+          serverSpan(it, 0, getContextPath() + "/*")
+        }
+      }
     }
   }