Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add tag for http server request hostname #3064

Merged
merged 1 commit into from
Oct 14, 2021
Merged

Add tag for http server request hostname #3064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ jobs:

smoke_tests:
<<: *base_tests
resource_class: medium
resource_class: medium+

docker:
- image: *default_container
Expand Down
3 changes: 3 additions & 0 deletions .../src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@ public AgentSpan onRequest(
String path = encoded ? url.rawPath() : url.path();

span.setTag(Tags.HTTP_URL, URIUtils.buildURL(url.scheme(), url.host(), url.port(), path));
if (url.host() != null) {
span.setTag(Tags.HTTP_HOSTNAME, url.host());
}

if (config.isHttpServerTagQueryString()) {
String query =
Expand Down
5 changes: 5 additions & 0 deletions ...t/groovy/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecoratorTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class HttpServerDecoratorTest extends ServerDecoratorTest {
if (req) {
1 * span.setTag(Tags.HTTP_METHOD, "test-method")
1 * span.setTag(Tags.HTTP_URL, url)
1 * span.setTag(Tags.HTTP_HOSTNAME, req.url.host)
1 * span.getRequestContext()
1 * span.setResourceName({ it as String == req.method.toUpperCase() + " " + req.path }, ResourceNamePriorities.HTTP_PATH_NORMALIZER)
}
Expand Down Expand Up @@ -71,6 +72,9 @@ class HttpServerDecoratorTest extends ServerDecoratorTest {
}
if (url != null) {
1 * span.setResourceName({ it as String == expectedPath }, ResourceNamePriorities.HTTP_PATH_NORMALIZER)
if (req.url.host != null) {
1 * span.setTag(Tags.HTTP_HOSTNAME, req.url.host)
}
} else {
1 * span.setResourceName({ it as String == expectedPath })
}
Expand Down Expand Up @@ -108,6 +112,7 @@ class HttpServerDecoratorTest extends ServerDecoratorTest {

then:
1 * span.setTag(Tags.HTTP_URL, expectedUrl)
1 * span.setTag(Tags.HTTP_HOSTNAME, req.url.host)
1 * span.setTag(DDTags.HTTP_QUERY, expectedQuery)
1 * span.setTag(DDTags.HTTP_FRAGMENT, null)
1 * span.getRequestContext()
Expand Down
2 changes: 2 additions & 0 deletions dd-java-agent/instrumentation/akka-http-10.0/src/lagomTest/groovy/LagomTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class LagomTest extends AgentTestRunner {
"$Tags.COMPONENT" "akka-http-server"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.HTTP_URL" "ws://localhost:${server.port()}/echo"
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 101
defaultTags()
Expand Down Expand Up @@ -109,6 +110,7 @@ class LagomTest extends AgentTestRunner {
"$Tags.COMPONENT" "akka-http-server"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.HTTP_URL" "ws://localhost:${server.port()}/error"
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 500
defaultTags()
Expand Down
8 changes: 8 additions & 0 deletions dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationBasicTests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class JSPInstrumentationBasicTests extends JSPTestBase {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/$jspFileName"
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
"servlet.context" "/$jspWebappContext"
Expand Down Expand Up @@ -107,6 +108,7 @@ class JSPInstrumentationBasicTests extends JSPTestBase {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/getQuery.jsp"
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
"servlet.context" "/$jspWebappContext"
Expand Down Expand Up @@ -177,6 +179,7 @@ class JSPInstrumentationBasicTests extends JSPTestBase {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/post.jsp"
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "POST"
"$Tags.HTTP_STATUS" 200
"servlet.context" "/$jspWebappContext"
Expand Down Expand Up @@ -244,6 +247,7 @@ class JSPInstrumentationBasicTests extends JSPTestBase {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/$jspFileName"
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 500
"servlet.context" "/$jspWebappContext"
Expand Down Expand Up @@ -330,6 +334,7 @@ class JSPInstrumentationBasicTests extends JSPTestBase {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/includes/includeHtml.jsp"
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
"servlet.context" "/$jspWebappContext"
Expand Down Expand Up @@ -396,6 +401,7 @@ class JSPInstrumentationBasicTests extends JSPTestBase {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/includes/includeMulti.jsp"
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
"servlet.context" "/$jspWebappContext"
Expand Down Expand Up @@ -516,6 +522,7 @@ class JSPInstrumentationBasicTests extends JSPTestBase {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/$jspFileName"
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 500
"servlet.context" "/$jspWebappContext"
Expand Down Expand Up @@ -578,6 +585,7 @@ class JSPInstrumentationBasicTests extends JSPTestBase {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/$staticFile"
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
"servlet.context" "/$jspWebappContext"
Expand Down
6 changes: 6 additions & 0 deletions dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationForwardTests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class JSPInstrumentationForwardTests extends JSPTestBase {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/$forwardFromFileName"
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
"servlet.context" "/$jspWebappContext"
Expand Down Expand Up @@ -131,6 +132,7 @@ class JSPInstrumentationForwardTests extends JSPTestBase {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/forwards/forwardToHtml.jsp"
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
"servlet.context" "/$jspWebappContext"
Expand Down Expand Up @@ -197,6 +199,7 @@ class JSPInstrumentationForwardTests extends JSPTestBase {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/forwards/forwardToIncludeMulti.jsp"
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
"servlet.context" "/$jspWebappContext"
Expand Down Expand Up @@ -347,6 +350,7 @@ class JSPInstrumentationForwardTests extends JSPTestBase {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/forwards/forwardToJspForward.jsp"
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
"servlet.context" "/$jspWebappContext"
Expand Down Expand Up @@ -469,6 +473,7 @@ class JSPInstrumentationForwardTests extends JSPTestBase {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/forwards/forwardToCompileError.jsp"
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 500
"servlet.context" "/$jspWebappContext"
Expand Down Expand Up @@ -552,6 +557,7 @@ class JSPInstrumentationForwardTests extends JSPTestBase {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/$jspWebappContext/forwards/forwardToNonExistent.jsp"
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 404
"servlet.context" "/$jspWebappContext"
Expand Down
2 changes: 2 additions & 0 deletions dd-java-agent/instrumentation/mule-4/src/test/groovy/mule4/MuleForkedTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ class MuleForkedTest extends WithHttpServer<MuleTestContainer> {
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
"$Tags.HTTP_URL" "${address.resolve("/client-request")}"
"$Tags.HTTP_HOSTNAME" address.host
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" { true } // is this really the best way to ignore tags?
defaultTags()
Expand Down Expand Up @@ -166,6 +167,7 @@ class MuleForkedTest extends WithHttpServer<MuleTestContainer> {
"$Tags.HTTP_METHOD" "PUT"
"$Tags.HTTP_STATUS" 200
"$Tags.HTTP_URL" "${address.resolve("/pfe-request")}"
"$Tags.HTTP_HOSTNAME" address.host
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" { true } // is this really the best way to ignore tags?
defaultTags()
Expand Down
1 change: 1 addition & 0 deletions dd-java-agent/instrumentation/play-2.3/src/test/groovy/server/PlayServerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ class PlayServerTest extends HttpServerTest<TestServer> {
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOST_IPV4" { it == (endpoint == FORWARDED ? endpoint.body : "127.0.0.1") }
"$Tags.HTTP_URL" String
"$Tags.HTTP_HOSTNAME" address.host
"$Tags.HTTP_METHOD" String
// BUG
// "$Tags.HTTP_ROUTE" String
Expand Down
1 change: 1 addition & 0 deletions dd-java-agent/instrumentation/play-2.4/src/test/groovy/server/PlayServerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ class PlayServerTest extends HttpServerTest<Server> {
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOST_IPV4" { it == (endpoint == FORWARDED ? endpoint.body : "127.0.0.1") }
"$Tags.HTTP_URL" String
"$Tags.HTTP_HOSTNAME" address.host
"$Tags.HTTP_METHOD" String
// BUG
// "$Tags.HTTP_ROUTE" String
Expand Down
1 change: 1 addition & 0 deletions dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayServerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ class PlayServerTest extends HttpServerTest<Server> {
"$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
"$Tags.PEER_HOST_IPV4" { it == (endpoint == FORWARDED ? endpoint.body : "127.0.0.1") }
"$Tags.HTTP_URL" String
"$Tags.HTTP_HOSTNAME" address.host
"$Tags.HTTP_METHOD" String
// BUG
// "$Tags.HTTP_ROUTE" String
Expand Down
2 changes: 2 additions & 0 deletions dd-java-agent/instrumentation/ratpack-1.5/src/test/groovy/RatpackOtherTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ class RatpackOtherTest extends AgentTestRunner {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "${app.address.resolve(path)}"
"$Tags.HTTP_HOSTNAME" "${app.address.host}"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
"$Tags.HTTP_ROUTE" "/$route"
Expand All @@ -92,6 +93,7 @@ class RatpackOtherTest extends AgentTestRunner {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "${app.address.resolve(path)}"
"$Tags.HTTP_HOSTNAME" "${app.address.host}"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
"$Tags.HTTP_ROUTE" "/$route"
Expand Down
1 change: 1 addition & 0 deletions ...ava-agent/instrumentation/ratpack-1.5/src/test/groovy/server/RatpackHttpServerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ class RatpackHttpServerTest extends HttpServerTest<EmbeddedApp> {
"$Tags.PEER_HOST_IPV4" "127.0.0.1" // This span ignores "x-forwards-from".
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" String
"$Tags.HTTP_HOSTNAME" "${address.host}"
"$Tags.HTTP_METHOD" String
"$Tags.HTTP_STATUS" Integer
"$Tags.HTTP_ROUTE" String
Expand Down
1 change: 1 addition & 0 deletions dd-java-agent/instrumentation/sparkjava-2.3/src/test/groovy/SparkJavaBasedTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ class SparkJavaBasedTest extends AgentTestRunner {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" "http://localhost:$port/param/asdf1234"
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
"$Tags.HTTP_ROUTE" String
Expand Down
8 changes: 8 additions & 0 deletions ...ava-agent/instrumentation/spring-webflux-5/src/boot20Test/groovy/SpringWebfluxTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ class SpringWebfluxTest extends AgentTestRunner {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
// BUG
Expand Down Expand Up @@ -135,6 +136,7 @@ class SpringWebfluxTest extends AgentTestRunner {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
// BUG
Expand Down Expand Up @@ -285,6 +287,7 @@ class SpringWebfluxTest extends AgentTestRunner {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 404
defaultTags()
Expand Down Expand Up @@ -335,6 +338,7 @@ class SpringWebfluxTest extends AgentTestRunner {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "POST"
"$Tags.HTTP_STATUS" 202
// BUG "$Tags.HTTP_ROUTE" "/echo"
Expand Down Expand Up @@ -394,6 +398,7 @@ class SpringWebfluxTest extends AgentTestRunner {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 500
// BUG
Expand Down Expand Up @@ -469,6 +474,7 @@ class SpringWebfluxTest extends AgentTestRunner {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 307
// BUG "$Tags.HTTP_ROUTE" "/double-greet-redirect"
Expand Down Expand Up @@ -504,6 +510,7 @@ class SpringWebfluxTest extends AgentTestRunner {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" finalUrl
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
// BUG "$Tags.HTTP_ROUTE" "/double-greet"
Expand Down Expand Up @@ -555,6 +562,7 @@ class SpringWebfluxTest extends AgentTestRunner {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
// BUG
Expand Down
8 changes: 8 additions & 0 deletions ...ava-agent/instrumentation/spring-webflux-5/src/boot24Test/groovy/SpringWebfluxTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ class SpringWebfluxTest extends AgentTestRunner {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
"$Tags.HTTP_ROUTE" "$urlPathWithVariables"
Expand Down Expand Up @@ -134,6 +135,7 @@ class SpringWebfluxTest extends AgentTestRunner {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
"$Tags.HTTP_ROUTE" "$urlPathWithVariables"
Expand Down Expand Up @@ -283,6 +285,7 @@ class SpringWebfluxTest extends AgentTestRunner {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 404
defaultTags()
Expand Down Expand Up @@ -333,6 +336,7 @@ class SpringWebfluxTest extends AgentTestRunner {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "POST"
"$Tags.HTTP_STATUS" 202
"$Tags.HTTP_ROUTE" "/echo"
Expand Down Expand Up @@ -392,6 +396,7 @@ class SpringWebfluxTest extends AgentTestRunner {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 500
"$Tags.HTTP_ROUTE" "$urlPathWithVariables"
Expand Down Expand Up @@ -466,6 +471,7 @@ class SpringWebfluxTest extends AgentTestRunner {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 307
"$Tags.HTTP_ROUTE" "/double-greet-redirect"
Expand Down Expand Up @@ -501,6 +507,7 @@ class SpringWebfluxTest extends AgentTestRunner {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" finalUrl
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
"$Tags.HTTP_ROUTE" "/double-greet"
Expand Down Expand Up @@ -553,6 +560,7 @@ class SpringWebfluxTest extends AgentTestRunner {
"$Tags.PEER_HOST_IPV4" "127.0.0.1"
"$Tags.PEER_PORT" Integer
"$Tags.HTTP_URL" url
"$Tags.HTTP_HOSTNAME" "localhost"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 200
"$Tags.HTTP_ROUTE" String
Expand Down
1 change: 1 addition & 0 deletions dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,7 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
}
"$Tags.PEER_HOST_IPV4" { it == "127.0.0.1" || (endpoint == FORWARDED && it == endpoint.body) }
}
"$Tags.HTTP_HOSTNAME" address.host
"$Tags.HTTP_URL" "$expectedUrl"
"$Tags.HTTP_METHOD" method
"$Tags.HTTP_STATUS" expectedStatus
Expand Down
1 change: 1 addition & 0 deletions ...enliberty/snapshots/datadog.smoketest.SpringBootOpenLibertySnapshotTest.exception404.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"runtime-id" "fc5c927a-eb1a-4498-af46-731a5f2b0ce1"
"version" "99"
"http.url" "http://localhost:57690/randomEndpoint"
"http.hostname" "localhost"
"component" "liberty-server"
"error.msg" "SRVE0295E: Error reported: 404"
"thread.name" "Default Executor-thread-13"
Expand Down