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

fix test

This commit is contained in:
Tyler Benson 2019-11-11 16:25:51 -08:00
parent bff8303e18
commit 53b4e5db19
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/JettyServlet2Test.groovy
View File

@ -94,6 +94,7 @@ class JettyServlet2Test extends HttpServerTest<Server, Servlet2Decorator> {
} }
tags { tags {
"servlet.context" "/$CONTEXT" "servlet.context" "/$CONTEXT"
"servlet.path" endpoint.path
"span.origin.type" TestServlet2.Sync.name "span.origin.type" TestServlet2.Sync.name
defaultTags(true) defaultTags(true)

2
dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/AbstractServlet3Test.groovy
View File

@ -83,7 +83,7 @@ abstract class AbstractServlet3Test<SERVER, CONTEXT> extends HttpServerTest<SERV
} }
tags { tags {
"servlet.context" "/$context" "servlet.context" "/$context"
"servlet.path" endpoint.path "servlet.path" { it == endpoint.path || it == "/dispatch$endpoint.path" }
"span.origin.type" { it == servlet.name || it == ApplicationFilterChain.name } "span.origin.type" { it == servlet.name || it == ApplicationFilterChain.name }
defaultTags(true) defaultTags(true)

1
dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/JettyServlet3Test.groovy
View File

@ -244,6 +244,7 @@ abstract class JettyDispatchTest extends JettyServlet3Test {
// we can't reliably assert parent or child relationship here since both are tested. // we can't reliably assert parent or child relationship here since both are tested.
tags { tags {
"servlet.context" "/$context" "servlet.context" "/$context"
"servlet.path" endpoint.status == 404 ? endpoint.path : "/dispatch$endpoint.path"
"servlet.dispatch" endpoint.path "servlet.dispatch" endpoint.path
"span.origin.type" { "span.origin.type" {
it == TestServlet3.DispatchImmediate.name || it == TestServlet3.DispatchAsync.name || it == ApplicationFilterChain.name it == TestServlet3.DispatchImmediate.name || it == TestServlet3.DispatchAsync.name || it == ApplicationFilterChain.name

1
dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/TomcatServlet3Test.groovy
View File

@ -296,6 +296,7 @@ abstract class TomcatDispatchTest extends TomcatServlet3Test {
// we can't reliably assert parent or child relationship here since both are tested. // we can't reliably assert parent or child relationship here since both are tested.
tags { tags {
"servlet.context" "/$context" "servlet.context" "/$context"
"servlet.path" endpoint.status == 404 ? endpoint.path : "/dispatch$endpoint.path"
"servlet.dispatch" endpoint.path "servlet.dispatch" endpoint.path
"span.origin.type" { "span.origin.type" {
it == TestServlet3.DispatchImmediate.name || it == TestServlet3.DispatchAsync.name || it == ApplicationFilterChain.name it == TestServlet3.DispatchImmediate.name || it == TestServlet3.DispatchAsync.name || it == ApplicationFilterChain.name