open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove restriction on vaadin latest dep tests (#4311)

This commit is contained in:
Lauri Tulmin 2021-10-06 19:33:20 +03:00 committed by GitHub
parent f80f4a9f63
commit cc75cd351b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
instrumentation/vaadin-14.2/javaagent/build.gradle.kts
View File

@ -63,9 +63,5 @@ dependencies {
testInstrumentation(project(":instrumentation:tomcat:tomcat-7.0:javaagent")) testInstrumentation(project(":instrumentation:tomcat:tomcat-7.0:javaagent"))
add("vaadin14LatestTestImplementation", "com.vaadin:vaadin-spring-boot-starter:14.+") add("vaadin14LatestTestImplementation", "com.vaadin:vaadin-spring-boot-starter:14.+")
// Pin latest tested vaadin version to 19 add("latestDepTestImplementation", "com.vaadin:vaadin-spring-boot-starter:+")
// https://github.com/vaadin/flow/issues/11524
// Update to workbox-build node module broke building javascript, remove this restriction after
// new version of vaadin is released.
add("latestDepTestImplementation", "com.vaadin:vaadin-spring-boot-starter:19.+")
} }

17
instrumentation/vaadin-14.2/testing/src/main/groovy/test/vaadin/AbstractVaadin16Test.groovy
View File

@ -12,20 +12,25 @@ import io.opentelemetry.api.trace.SpanKind
abstract class AbstractVaadin16Test extends AbstractVaadinTest { abstract class AbstractVaadin16Test extends AbstractVaadinTest {
static final boolean VAADIN_17 = Version.majorVersion >= 4 static final boolean VAADIN_17 = Version.majorVersion >= 4
static final boolean VAADIN_19 = Version.majorVersion >= 6 static final boolean VAADIN_19 = Version.majorVersion >= 6
static final boolean VAADIN_21 = Version.majorVersion >= 8
@Override @Override
List<String> getRequestHandlers() { List<String> getRequestHandlers() {
List<String> handlers = [ List<String> handlers = []
"PushRequestHandler" if (VAADIN_21) {
] handlers.add("DevModeHandlerImpl")
}
handlers.add("PushRequestHandler")
if (VAADIN_19) { if (VAADIN_19) {
handlers.addAll("WebComponentBootstrapHandler", "WebComponentProvider", "PwaHandler") handlers.addAll("WebComponentBootstrapHandler", "WebComponentProvider", "PwaHandler")
} }
handlers.addAll([ handlers.addAll([
"StreamRequestHandler", "UnsupportedBrowserHandler", "UidlRequestHandler", "StreamRequestHandler", "UnsupportedBrowserHandler", "UidlRequestHandler",
"HeartbeatHandler", "SessionRequestHandler", "JavaScriptBootstrapHandler", "FaviconHandler", "HeartbeatHandler", "SessionRequestHandler", "JavaScriptBootstrapHandler", "FaviconHandler"])
"DevModeHandler", "IndexHtmlRequestHandler" if (!VAADIN_21) {
]) handlers.add("DevModeHandler")
}
handlers.add("IndexHtmlRequestHandler")
return handlers return handlers
} }