From b6d264e363eb25bce4ba89707f60bd392057e76d Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Wed, 24 Aug 2022 19:20:31 +0300 Subject: [PATCH] Fix vaadin latest dep tests (#6506) --- .../vaadin-14.2/javaagent/build.gradle.kts | 3 --- .../groovy/test/vaadin/AbstractVaadin16Test.groovy | 13 +++++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/instrumentation/vaadin-14.2/javaagent/build.gradle.kts b/instrumentation/vaadin-14.2/javaagent/build.gradle.kts index a064cb4ae2..7b6f716521 100644 --- a/instrumentation/vaadin-14.2/javaagent/build.gradle.kts +++ b/instrumentation/vaadin-14.2/javaagent/build.gradle.kts @@ -69,7 +69,4 @@ dependencies { add("vaadin14LatestTestImplementation", "com.vaadin:vaadin-spring-boot-starter:14.+") add("latestDepTestImplementation", "com.vaadin:vaadin-spring-boot-starter:+") - // to work around https://github.com/vaadin/flow/issues/13952 - // can be removed after a new version of vaadin-spring-boot-starter has been released - add("latestDepTestImplementation", "com.vaadin:flow-server:+") } 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 870e3398f4..f75156f4d6 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 @@ -8,6 +8,7 @@ package test.vaadin import com.vaadin.flow.server.Version import io.opentelemetry.api.trace.SpanKind +import io.opentelemetry.sdk.trace.data.SpanData abstract class AbstractVaadin16Test extends AbstractVaadinTest { static final boolean VAADIN_17 = Version.majorVersion >= 4 @@ -55,6 +56,7 @@ abstract class AbstractVaadin16Test extends AbstractVaadinTest { childOf span(0) } int spanIndex = 2 + sortHandlerSpans(spans, spanIndex, handlers) handlers.each { handler -> span(spanIndex++) { name handler + ".handleRequest" @@ -73,6 +75,7 @@ abstract class AbstractVaadin16Test extends AbstractVaadinTest { } int spanIndex = 2 + sortHandlerSpans(spans, spanIndex, handlers) handlers.each { handler -> span(spanIndex++) { name handler + ".handleRequest" @@ -101,6 +104,7 @@ abstract class AbstractVaadin16Test extends AbstractVaadinTest { childOf span(0) } int spanIndex = 2 + sortHandlerSpans(spans, spanIndex, handlers) handlers.each { handler -> span(spanIndex++) { name handler + ".handleRequest" @@ -133,6 +137,7 @@ abstract class AbstractVaadin16Test extends AbstractVaadinTest { } int spanIndex = 2 + sortHandlerSpans(spans, spanIndex, handlers) handlers.each { handler -> span(spanIndex++) { name handler + ".handleRequest" @@ -149,4 +154,12 @@ abstract class AbstractVaadin16Test extends AbstractVaadinTest { } } } + + static void sortHandlerSpans(List spans, int startIndex, List handlers) { + spans.subList(startIndex, startIndex + handlers.size()).sort({ + // strip .handleRequest from span name to get the handler name + def handlerName = it.name.substring(0, it.name.indexOf('.')) + return handlers.indexOf(handlerName) + }) + } }