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 some tests

This commit is contained in:
Nikolay Martynov 2020-02-14 12:44:03 -05:00
parent fd75575796
commit a04cc15ce8
15 changed files with 15 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dd-java-agent/instrumentation/dropwizard/src/test/groovy/DropwizardTest.groovy
View File

@ -113,7 +113,6 @@ class DropwizardTest extends HttpServerTest<DropwizardTestSupport, Servlet3Decor
tags { tags {
"$Tags.COMPONENT" serverDecorator.component() "$Tags.COMPONENT" serverDecorator.component()
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" { it == "localhost" || it == "127.0.0.1" }
"$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional "$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "${endpoint.resolve(address)}" "$Tags.HTTP_URL" "${endpoint.resolve(address)}"

1
dd-java-agent/instrumentation/glassfish/src/test/groovy/GlassFishServerTest.groovy
View File

@ -103,7 +103,6 @@ class GlassFishServerTest extends HttpServerTest<GlassFish, Servlet3Decorator> {
tags { tags {
"$Tags.COMPONENT" serverDecorator.component() "$Tags.COMPONENT" serverDecorator.component()
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" { it == "localhost" || it == "127.0.0.1" }
"$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional "$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_STATUS" endpoint.status "$Tags.HTTP_STATUS" endpoint.status

10
dd-java-agent/instrumentation/jetty-8/src/test/groovy/JettyHandlerTest.groovy
View File

@ -4,15 +4,16 @@ import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags import datadog.trace.api.DDTags
import datadog.trace.bootstrap.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import datadog.trace.instrumentation.jetty8.JettyDecorator import datadog.trace.instrumentation.jetty8.JettyDecorator
import javax.servlet.DispatcherType
import javax.servlet.ServletException
import javax.servlet.http.HttpServletRequest
import javax.servlet.http.HttpServletResponse
import org.eclipse.jetty.server.Request import org.eclipse.jetty.server.Request
import org.eclipse.jetty.server.Server import org.eclipse.jetty.server.Server
import org.eclipse.jetty.server.handler.AbstractHandler import org.eclipse.jetty.server.handler.AbstractHandler
import org.eclipse.jetty.server.handler.ErrorHandler import org.eclipse.jetty.server.handler.ErrorHandler
import javax.servlet.DispatcherType
import javax.servlet.ServletException
import javax.servlet.http.HttpServletRequest
import javax.servlet.http.HttpServletResponse
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.NOT_FOUND import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.NOT_FOUND
@ -131,7 +132,6 @@ class JettyHandlerTest extends HttpServerTest<Server, JettyDecorator> {
tags { tags {
"$Tags.COMPONENT" serverDecorator.component() "$Tags.COMPONENT" serverDecorator.component()
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" { it == "localhost" || it == "127.0.0.1" }
"$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional "$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "${endpoint.resolve(address)}" "$Tags.HTTP_URL" "${endpoint.resolve(address)}"

8
dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationBasicTests.groovy
View File

@ -96,7 +96,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "java-web-servlet" "$Tags.COMPONENT" "java-web-servlet"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "127.0.0.1"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/$jspFileName" "$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/$jspFileName"
@ -172,7 +171,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "java-web-servlet" "$Tags.COMPONENT" "java-web-servlet"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "127.0.0.1"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/getQuery.jsp" "$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/getQuery.jsp"
@ -245,7 +243,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "java-web-servlet" "$Tags.COMPONENT" "java-web-servlet"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "127.0.0.1"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/post.jsp" "$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/post.jsp"
@ -315,7 +312,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "java-web-servlet" "$Tags.COMPONENT" "java-web-servlet"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "127.0.0.1"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/$jspFileName" "$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/$jspFileName"
@ -406,7 +402,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "java-web-servlet" "$Tags.COMPONENT" "java-web-servlet"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "127.0.0.1"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/includes/includeHtml.jsp" "$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/includes/includeHtml.jsp"
@ -475,7 +470,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "java-web-servlet" "$Tags.COMPONENT" "java-web-servlet"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "127.0.0.1"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/includes/includeMulti.jsp" "$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/includes/includeMulti.jsp"
@ -600,7 +594,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "java-web-servlet" "$Tags.COMPONENT" "java-web-servlet"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "127.0.0.1"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/$jspFileName" "$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/$jspFileName"
@ -664,7 +657,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "java-web-servlet" "$Tags.COMPONENT" "java-web-servlet"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "127.0.0.1"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/$staticFile" "$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/$staticFile"

6
dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationForwardTests.groovy
View File

@ -95,7 +95,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "java-web-servlet" "$Tags.COMPONENT" "java-web-servlet"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "127.0.0.1"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/$forwardFromFileName" "$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/$forwardFromFileName"
@ -198,7 +197,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "java-web-servlet" "$Tags.COMPONENT" "java-web-servlet"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "127.0.0.1"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/forwards/forwardToHtml.jsp" "$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/forwards/forwardToHtml.jsp"
@ -267,7 +265,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "java-web-servlet" "$Tags.COMPONENT" "java-web-servlet"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "127.0.0.1"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/forwards/forwardToIncludeMulti.jsp" "$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/forwards/forwardToIncludeMulti.jsp"
@ -423,7 +420,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "java-web-servlet" "$Tags.COMPONENT" "java-web-servlet"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "127.0.0.1"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/forwards/forwardToJspForward.jsp" "$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/forwards/forwardToJspForward.jsp"
@ -550,7 +546,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "java-web-servlet" "$Tags.COMPONENT" "java-web-servlet"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "127.0.0.1"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/forwards/forwardToCompileError.jsp" "$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/forwards/forwardToCompileError.jsp"
@ -636,7 +631,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "java-web-servlet" "$Tags.COMPONENT" "java-web-servlet"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "127.0.0.1"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/forwards/forwardToNonExistent.jsp" "$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/forwards/forwardToNonExistent.jsp"

3
dd-java-agent/instrumentation/ratpack-1.4/src/test/groovy/RatpackOtherTest.groovy
View File

@ -72,7 +72,6 @@ class RatpackOtherTest extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "netty" "$Tags.COMPONENT" "netty"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "$app.address.host"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "${app.address.resolve(path)}" "$Tags.HTTP_URL" "${app.address.resolve(path)}"
@ -91,7 +90,7 @@ class RatpackOtherTest extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "ratpack" "$Tags.COMPONENT" "ratpack"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "$app.address.host" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "${app.address.resolve(path)}" "$Tags.HTTP_URL" "${app.address.resolve(path)}"
"$Tags.HTTP_METHOD" "GET" "$Tags.HTTP_METHOD" "GET"

1
dd-java-agent/instrumentation/ratpack-1.4/src/test/groovy/server/RatpackHttpServerTest.groovy
View File

@ -117,7 +117,6 @@ class RatpackHttpServerTest extends HttpServerTest<EmbeddedApp, NettyHttpServerD
tags { tags {
"$Tags.COMPONENT" RatpackServerDecorator.DECORATE.component() "$Tags.COMPONENT" RatpackServerDecorator.DECORATE.component()
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "localhost"
"$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional "$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" String "$Tags.HTTP_URL" String

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

@ -4,11 +4,12 @@ import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags import datadog.trace.api.DDTags
import datadog.trace.bootstrap.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import datadog.trace.instrumentation.servlet2.Servlet2Decorator import datadog.trace.instrumentation.servlet2.Servlet2Decorator
import javax.servlet.http.HttpServletRequest
import org.eclipse.jetty.server.Server import org.eclipse.jetty.server.Server
import org.eclipse.jetty.server.handler.ErrorHandler import org.eclipse.jetty.server.handler.ErrorHandler
import org.eclipse.jetty.servlet.ServletContextHandler import org.eclipse.jetty.servlet.ServletContextHandler
import javax.servlet.http.HttpServletRequest
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.AUTH_REQUIRED import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.AUTH_REQUIRED
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
@ -97,7 +98,6 @@ class JettyServlet2Test extends HttpServerTest<Server, Servlet2Decorator> {
tags { tags {
"$Tags.COMPONENT" serverDecorator.component() "$Tags.COMPONENT" serverDecorator.component()
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "localhost"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
// No peer port // No peer port
"$Tags.HTTP_URL" "${endpoint.resolve(address)}" "$Tags.HTTP_URL" "${endpoint.resolve(address)}"

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

@ -4,10 +4,11 @@ import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags import datadog.trace.api.DDTags
import datadog.trace.bootstrap.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import datadog.trace.instrumentation.servlet3.Servlet3Decorator import datadog.trace.instrumentation.servlet3.Servlet3Decorator
import javax.servlet.Servlet
import okhttp3.Request import okhttp3.Request
import org.apache.catalina.core.ApplicationFilterChain import org.apache.catalina.core.ApplicationFilterChain
import javax.servlet.Servlet
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.AUTH_REQUIRED import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.AUTH_REQUIRED
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
@ -86,7 +87,6 @@ abstract class AbstractServlet3Test<SERVER, CONTEXT> extends HttpServerTest<SERV
tags { tags {
"$Tags.COMPONENT" serverDecorator.component() "$Tags.COMPONENT" serverDecorator.component()
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" { it == "localhost" || it == "127.0.0.1" }
"$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional "$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "${endpoint.resolve(address)}" "$Tags.HTTP_URL" "${endpoint.resolve(address)}"

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

@ -5,12 +5,13 @@ import datadog.trace.api.DDTags
import datadog.trace.bootstrap.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import groovy.transform.stc.ClosureParams import groovy.transform.stc.ClosureParams
import groovy.transform.stc.SimpleType import groovy.transform.stc.SimpleType
import javax.servlet.Servlet
import javax.servlet.http.HttpServletRequest
import org.eclipse.jetty.server.Server import org.eclipse.jetty.server.Server
import org.eclipse.jetty.server.handler.ErrorHandler import org.eclipse.jetty.server.handler.ErrorHandler
import org.eclipse.jetty.servlet.ServletContextHandler import org.eclipse.jetty.servlet.ServletContextHandler
import javax.servlet.Servlet
import javax.servlet.http.HttpServletRequest
import static datadog.trace.agent.test.asserts.TraceAssert.assertTrace import static datadog.trace.agent.test.asserts.TraceAssert.assertTrace
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.AUTH_REQUIRED import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.AUTH_REQUIRED
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR
@ -253,7 +254,6 @@ abstract class JettyDispatchTest extends JettyServlet3Test {
tags { tags {
"$Tags.COMPONENT" serverDecorator.component() "$Tags.COMPONENT" serverDecorator.component()
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" { it == "localhost" || it == "127.0.0.1" }
"$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional "$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "${endpoint.resolve(address)}" "$Tags.HTTP_URL" "${endpoint.resolve(address)}"

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

@ -6,7 +6,6 @@ import datadog.trace.api.DDTags
import datadog.trace.bootstrap.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import groovy.transform.stc.ClosureParams import groovy.transform.stc.ClosureParams
import groovy.transform.stc.SimpleType import groovy.transform.stc.SimpleType
import javax.servlet.Servlet
import org.apache.catalina.Context import org.apache.catalina.Context
import org.apache.catalina.connector.Request import org.apache.catalina.connector.Request
import org.apache.catalina.connector.Response import org.apache.catalina.connector.Response
@ -17,6 +16,8 @@ import org.apache.catalina.valves.ErrorReportValve
import org.apache.tomcat.JarScanFilter import org.apache.tomcat.JarScanFilter
import org.apache.tomcat.JarScanType import org.apache.tomcat.JarScanType
import javax.servlet.Servlet
import static datadog.trace.agent.test.asserts.TraceAssert.assertTrace import static datadog.trace.agent.test.asserts.TraceAssert.assertTrace
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.AUTH_REQUIRED import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.AUTH_REQUIRED
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR
@ -304,7 +305,6 @@ abstract class TomcatDispatchTest extends TomcatServlet3Test {
tags { tags {
"$Tags.COMPONENT" serverDecorator.component() "$Tags.COMPONENT" serverDecorator.component()
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" { it == "localhost" || it == "127.0.0.1" }
"$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional "$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "${endpoint.resolve(address)}" "$Tags.HTTP_URL" "${endpoint.resolve(address)}"

1
dd-java-agent/instrumentation/sparkjava-2.3/src/test/groovy/SparkJavaBasedTest.groovy
View File

@ -53,7 +53,6 @@ class SparkJavaBasedTest extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "jetty-handler" "$Tags.COMPONENT" "jetty-handler"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "127.0.0.1"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/param/asdf1234" "$Tags.HTTP_URL" "http://localhost:$port/param/asdf1234"

8
dd-java-agent/instrumentation/spring-webflux-5/src/test/groovy/SpringWebfluxTest.groovy
View File

@ -84,7 +84,6 @@ class SpringWebfluxTest extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "netty" "$Tags.COMPONENT" "netty"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "localhost"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url "$Tags.HTTP_URL" url
@ -158,7 +157,6 @@ class SpringWebfluxTest extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "netty" "$Tags.COMPONENT" "netty"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "localhost"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url "$Tags.HTTP_URL" url
@ -219,7 +217,6 @@ class SpringWebfluxTest extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "netty" "$Tags.COMPONENT" "netty"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "localhost"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url "$Tags.HTTP_URL" url
@ -284,7 +281,6 @@ class SpringWebfluxTest extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "netty" "$Tags.COMPONENT" "netty"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "localhost"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url "$Tags.HTTP_URL" url
@ -327,7 +323,6 @@ class SpringWebfluxTest extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "netty" "$Tags.COMPONENT" "netty"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "localhost"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url "$Tags.HTTP_URL" url
@ -401,7 +396,6 @@ class SpringWebfluxTest extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "netty" "$Tags.COMPONENT" "netty"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "localhost"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url "$Tags.HTTP_URL" url
@ -451,7 +445,6 @@ class SpringWebfluxTest extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "netty" "$Tags.COMPONENT" "netty"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "localhost"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" finalUrl "$Tags.HTTP_URL" finalUrl
@ -514,7 +507,6 @@ class SpringWebfluxTest extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT" "netty" "$Tags.COMPONENT" "netty"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" "localhost"
"$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url "$Tags.HTTP_URL" url

1
dd-java-agent/instrumentation/spring-webmvc-3.1/src/test/groovy/test/SpringBootBasedTest.groovy
View File

@ -128,7 +128,6 @@ class SpringBootBasedTest extends HttpServerTest<ConfigurableApplicationContext,
tags { tags {
"$Tags.COMPONENT" serverDecorator.component() "$Tags.COMPONENT" serverDecorator.component()
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" { it == "localhost" || it == "127.0.0.1" }
"$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional "$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "${endpoint.resolve(address)}" "$Tags.HTTP_URL" "${endpoint.resolve(address)}"

1
dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy
View File

@ -526,7 +526,6 @@ abstract class HttpServerTest<SERVER, DECORATOR extends HttpServerDecorator> ext
tags { tags {
"$Tags.COMPONENT" serverDecorator.component() "$Tags.COMPONENT" serverDecorator.component()
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOSTNAME" { it == "localhost" || it == "127.0.0.1" }
"$Tags.PEER_PORT" Integer "$Tags.PEER_PORT" Integer
"$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional "$Tags.PEER_HOST_IPV4" { it == null || it == "127.0.0.1" } // Optional
"$Tags.HTTP_URL" "${endpoint.resolve(address)}" "$Tags.HTTP_URL" "${endpoint.resolve(address)}"