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

Sort traces in vaarin tests (#4812)

This commit is contained in:
Lauri Tulmin 2021-12-06 19:35:00 +02:00 committed by GitHub
parent 31fddb7afd
commit 0b414e4ea4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
instrumentation/vaadin-14.2/testing/src/main/groovy/test/vaadin/AbstractVaadin14Test.groovy
View File

@ -30,6 +30,8 @@ abstract class AbstractVaadin14Test extends AbstractVaadinTest {
@Override @Override
void assertFirstRequest() { void assertFirstRequest() {
assertTraces(VAADIN_14_4 ? 5 : 4) { assertTraces(VAADIN_14_4 ? 5 : 4) {
traces.sort(orderByRootSpanName(getContextPath() + "/main", getContextPath() + "/*"))
def handlers = getRequestHandlers("BootstrapHandler") def handlers = getRequestHandlers("BootstrapHandler")
trace(0, 2 + handlers.size()) { trace(0, 2 + handlers.size()) {
serverSpan(it, 0, getContextPath() + "/main") serverSpan(it, 0, getContextPath() + "/main")
@ -49,17 +51,9 @@ abstract class AbstractVaadin14Test extends AbstractVaadinTest {
} }
} }
// following traces are for javascript files used on page // following traces are for javascript files used on page
trace(1, 1) { def count = VAADIN_14_4 ? 3 : 2
serverSpan(it, 0, getContextPath() + "/*") for (i in 0..count) {
} trace(1 + i, 1) {
trace(2, 1) {
serverSpan(it, 0, getContextPath() + "/*")
}
trace(3, 1) {
serverSpan(it, 0, getContextPath() + "/*")
}
if (VAADIN_14_4) {
trace(4, 1) {
serverSpan(it, 0, getContextPath() + "/*") serverSpan(it, 0, getContextPath() + "/*")
} }
} }

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

@ -41,6 +41,9 @@ abstract class AbstractVaadin16Test extends AbstractVaadinTest {
@Override @Override
void assertFirstRequest() { void assertFirstRequest() {
assertTraces(VAADIN_17 ? 9 : 8) { assertTraces(VAADIN_17 ? 9 : 8) {
traces.sort(orderByRootSpanName("IndexHtmlRequestHandler.handleRequest",
getContextPath() + "/main", getContextPath(), getContextPath() + "/*"))
def handlers = getRequestHandlers("IndexHtmlRequestHandler") def handlers = getRequestHandlers("IndexHtmlRequestHandler")
trace(0, 2 + handlers.size()) { trace(0, 2 + handlers.size()) {
serverSpan(it, 0, "IndexHtmlRequestHandler.handleRequest") 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") handlers = getRequestHandlers("UidlRequestHandler")
trace(traceIndex + 5, 2 + handlers.size() + 2) { trace(1, 2 + handlers.size() + 2) {
serverSpan(it, 0, getContextPath() + "/main") serverSpan(it, 0, getContextPath() + "/main")
span(1) { span(1) {
name "SpringVaadinServletService.handleRequest" name "SpringVaadinServletService.handleRequest"
@ -131,6 +90,30 @@ abstract class AbstractVaadin16Test extends AbstractVaadinTest {
childOf span(spanIndex) 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() + "/*")
}
}
} }
} }