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 vaadin latest deps restriction (#6829) 

Resolves
https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/6551
This commit is contained in:
Lauri Tulmin 2022-10-07 22:14:06 +03:00 committed by GitHub
parent 709ab76dd2
commit 418c414de9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,9 +68,7 @@ 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.+")
// 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:+")
add("latestDepTestImplementation", "com.vaadin:vaadin-spring-boot-starter:23.1.+")
} }
configurations { configurations {

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

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