Remove vaadin latest deps restriction
Resolves
MODIFY
instrumentation/vaadin-14.2/javaagent/build.gradle.kts
instrumentation/vaadin-14.2/javaagent/build.gradle.kts
@@ -68,9 +68,7 @@ dependencies {
testInstrumentation(project(":instrumentation:tomcat:tomcat-7.0:javaagent"))
add("vaadin14LatestTestImplementation", "com.vaadin:vaadin-spring-boot-starter:14.+")
- // TODO https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/6551
- // add("latestDepTestImplementation", "com.vaadin:vaadin-spring-boot-starter:+")
- add("latestDepTestImplementation", "com.vaadin:vaadin-spring-boot-starter:23.1.+")
+ add("latestDepTestImplementation", "com.vaadin:vaadin-spring-boot-starter:+")
}
configurations {

MODIFY
instrumentation/vaadin-14.2/testing/src/main/groovy/test/vaadin/AbstractVaadin16Test.groovy
instrumentation/vaadin-14.2/testing/src/main/groovy/test/vaadin/AbstractVaadin16Test.groovy
@@ -16,11 +16,14 @@ abstract class AbstractVaadin16Test extends AbstractVaadinTest {
static final boolean VAADIN_21 = Version.majorVersion >= 8
static final boolean VAADIN_22 = Version.majorVersion >= 9
static final boolean VAADIN_23 = Version.majorVersion >= 23
+ static final boolean VAADIN_23_2 = Version.majorVersion > 23 || (Version.majorVersion == 23 && Version.minorVersion >= 2)
@Override
List<String> getRequestHandlers() {
List<String> handlers = []
- if (VAADIN_22) {
+ if (VAADIN_23_2) {
+ handlers.add("ViteHandler")
+ } else if (VAADIN_22) {
handlers.add("WebpackHandler")
} else if (VAADIN_21) {
handlers.add("DevModeHandlerImpl")
@@ -42,9 +45,17 @@ abstract class AbstractVaadin16Test extends AbstractVaadinTest {
@Override
void assertFirstRequest() {
- assertTraces(VAADIN_17 ? 9 : 8) {
+ def tracesCount
+ if (VAADIN_23_2) {
+ tracesCount = 12
+ } else if (VAADIN_17) {
+ tracesCount = 9
+ } else {
+ tracesCount = 8
+ }
+ assertTraces(tracesCount) {
traces.sort(orderByRootSpanName("IndexHtmlRequestHandler.handleRequest",
- getContextPath() + "/main", getContextPath(), getContextPath() + "/*",
+ getContextPath() + "/main", getContextPath(), getContextPath() + "/", getContextPath() + "/*",
getContextPath() + "/VAADIN/*"))
def handlers = getRequestHandlers("IndexHtmlRequestHandler")
@@ -114,10 +125,15 @@ abstract class AbstractVaadin16Test extends AbstractVaadinTest {
}
}
// following traces are for javascript files used on page
- def count = VAADIN_17 ? 5 : 4
+ def count = traces.size() - 4
for (i in 0..count) {
trace(3 + i, 1) {
- def spanName = VAADIN_23 && i != 0 ? getContextPath() + "/VAADIN/*" : getContextPath() + "/*"
+ def spanName
+ if (VAADIN_23_2) {
+ spanName = i != 0 ? getContextPath() + "/*" : getContextPath() + "/"
+ } else {
+ spanName = VAADIN_23 && i != 0 ? getContextPath() + "/VAADIN/*" : getContextPath() + "/*"
+ }
serverSpan(it, 0, spanName)
}
}

Remove vaadin latest deps restriction (#6829)

Resolves
https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/6551