8000 Ensure jetty 12 has servlet.path starting with / by github-actions[bot] · Pull Request #8093 · DataDog/dd-trace-java · GitHub
[go: up one dir, main page]
Skip to content

Ensure jetty 12 has servlet.path starting with / #8093

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

Merged
merged 8 commits into from
Dec 17, 2024
Merged

Ensure jetty 12 has servlet.path starting with / #8093

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
94bdefb
chore: Update Gradle dependencies
github-actions[bot] Dec 15, 2024
1da798c
chore: Update Gradle dependencies
github-actions[bot] Dec 15, 2024
50bddd0
chore: Update Gradle dependencies
github-actions[bot] Dec 15, 2024
5c6f87c
chore: Update Gradle dependencies
github-actions[bot] Dec 15, 2024
320c9f9
baseline latest cxf to java 17
amarziali Dec 16, 2024
689d2ea
Ensure servlet.path starts with /
amarziali Dec 16, 2024
7bd51cc
fix min java version property
amarziali Dec 17, 2024
702ac0e
reformat
amarziali Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
reformat
  • Loading branch information
@amarziali
amarziali committed Dec 17, 2024
commit 702ac0e91a6bff17c9f9de5bc7337f46c5454bf7
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/cxf-2.1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ext {
minJavaVersionForTests = JavaVersion.VERSION_11
cxf3LatestDepTestMinJavaVersionForTests = JavaVersion.VERSION_11
latestDepTestMinJavaVersionForTests = JavaVersion.VERSION_17
}
muzzle {
Expand Down
2 changes: 1 addition & 1 deletion .../jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/SetContextPathAdvice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public static void updateContextPath(
pathInContext.startsWith(servletContext)
? pathInContext.substring(servletContext.length())
: pathInContext;
if (!relativePath.isEmpty() && relativePath.charAt(0) != '/') {
if (relativePath.isEmpty() || relativePath.charAt(0) != '/') {
relativePath = "/" + relativePath;
}
((AgentSpan) span).setTag(SERVLET_PATH, relativePath);
Expand Down
119 changes: 59 additions & 60 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
@@ -1,44 +1,5 @@
package datadog.trace.agent.test.base

import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_JSON
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_URLENCODED
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CREATED
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CREATED_IS
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CUSTOM_EXCEPTION
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.FORWARDED
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.NOT_FOUND
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_BOTH
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_QUERY
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.REDIRECT
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SESSION_ID
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.TIMEOUT
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.TIMEOUT_ERROR
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.UNKNOWN
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.USER_BLOCK
import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_SERVER_RAW_QUERY_STRING
import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_SERVER_RAW_RESOURCE
import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_SERVER_TAG_QUERY_STRING
import static datadog.trace.api.config.TraceInstrumentationConfig.SERVLET_ASYNC_TIMEOUT_ERROR
import static datadog.trace.api.config.TracerConfig.HEADER_TAGS
import static datadog.trace.api.config.TracerConfig.REQUEST_HEADER_TAGS
import static datadog.trace.api.config.TracerConfig.RESPONSE_HEADER_TAGS
import static datadog.trace.bootstrap.blocking.BlockingActionHelper.TemplateType.JSON
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeScope
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.get
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan
import static datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator.SERVER_PATHWAY_EDGE_TAGS
import static java.nio.charset.StandardCharsets.UTF_8
import static org.junit.Assume.assumeTrue

import ch.qos.logback.classic.Level
import datadog.appsec.api.blocking.Blocking
import datadog.appsec.api.blocking.BlockingContentType
Expand Down Expand Up @@ -90,6 +51,45 @@ import java.util.function.BiFunction
import java.util.function.Function
import java.util.function.Supplier

import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_JSON
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_URLENCODED
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CREATED
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CREATED_IS
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CUSTOM_EXCEPTION
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.FORWARDED
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.NOT_FOUND
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_BOTH
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_QUERY
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.REDIRECT
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SESSION_ID
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.TIMEOUT
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.TIMEOUT_ERROR
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.UNKNOWN
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.USER_BLOCK
import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_SERVER_RAW_QUERY_STRING
import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_SERVER_RAW_RESOURCE
import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_SERVER_TAG_QUERY_STRING
import static datadog.trace.api.config.TraceInstrumentationConfig.SERVLET_ASYNC_TIMEOUT_ERROR
import static datadog.trace.api.config.TracerConfig.HEADER_TAGS
import static datadog.trace.api.config.TracerConfig.REQUEST_HEADER_TAGS
import static datadog.trace.api.config.TracerConfig.RESPONSE_HEADER_TAGS
import static datadog.trace.bootstrap.blocking.BlockingActionHelper.TemplateType.JSON
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeScope
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.get
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan
import static datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator.SERVER_PATHWAY_EDGE_TAGS
import static java.nio.charset.StandardCharsets.UTF_8
import static org.junit.Assume.assumeTrue

abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {

public static final Logger SERVER_LOGGER = LoggerFactory.getLogger("http-server")
Expand Down Expand Up @@ -209,9 +209,9 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
// Only used if hasExtraErrorInformation is true
Map<String, Serializable> expectedExtraErrorInformation(ServerEndpoint endpoint) {
if (endpoint.errored) {
["error.message": { it == null || it == EXCEPTION.body },
"error.type" : { it == null || it == Exception.name },
"error.stack" : { it == null || it instanceof String }]
["error.message" : { it == null || it == EXCEPTION.body },
"error.type" : { it == null || it == Exception.name },
"error.stack": { it == null || it instanceof String }]
} else {
Collections.emptyMap()
}
Expand Down Expand Up @@ -493,8 +493,8 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
}

private static final Map<String, ServerEndpoint> PATH_MAP = {
Map<String, ServerEndpoint> map = values().collectEntries { [it.path, it] }
map.putAll(values().collectEntries { [it.rawPath, it] })
Map<String, ServerEndpoint> map = values().collectEntries { [it.path, it]}
map.putAll(values().collectEntries { [it.rawPath, it]})
map
}.call()

Expand Down Expand Up @@ -702,9 +702,9 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
}

where:
method | body | header | value | tags
'GET' | null | 'x-datadog-test-both-header' | 'foo' | ['both_header_tag': 'foo']
'GET' | null | 'x-datadog-test-request-header' | 'bar' | ['request_header_tag': 'bar']
method | body | header | value | tags
'GET' | null | 'x-datadog-test-both-header' | 'foo' | [ 'both_header_tag': 'foo' ]
'GET' | null | 'x-datadog-test-request-header' | E864 'bar' | [ 'request_header_tag': 'bar' ]
}

@Flaky(value = "https://github.com/DataDog/dd-trace-java/issues/4690", suites = ["MuleHttpServerForkedTest"])
Expand All @@ -716,7 +716,7 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
def body = null
def header = IG_RESPONSE_HEADER
def mapping = 'mapped_response_header_tag'
def tags = ['mapped_response_header_tag': "$IG_RESPONSE_HEADER_VALUE"]
def tags = ['mapped_response_header_tag': "$IG_RESPONSE_HEADER_VALUE" ]

injectSysConfig(HTTP_SERVER_TAG_QUERY_STRING, "true")
injectSysConfig(RESPONSE_HEADER_TAGS, "$header:$mapping")
Expand Down Expand Up @@ -799,13 +799,13 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
}

where:
rawQuery | endpoint | encoded
true | SUCCESS | false
true | QUERY_PARAM | false
true | QUERY_ENCODED_QUERY | true
false | SUCCESS | false
false | QUERY_PARAM | false
false | QUERY_ENCODED_QUERY | true
rawQuery | endpoint | encoded
true | SUCCESS | false
true | QUERY_PARAM | false
true | QUERY_ENCODED_QUERY | true
false | SUCCESS | false
false | QUERY_PARAM | false
false | QUERY_ENCODED_QUERY | true

method = "GET"
body = null
Expand Down Expand Up @@ -918,7 +918,7 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
}

then:
DDSpan span = TEST_WRITER.flatten().find { it.operationName == 'appsec-span' }
DDSpan span = TEST_WRITER.flatten().find {it.operationName =='appsec-span' }
span.getTag(IG_PATH_PARAMS_TAG) == expectedIGPathParams()

and:
Expand Down Expand Up @@ -1612,7 +1612,7 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
then:
TEST_WRITER.waitForTraces(1)
def trace = TEST_WRITER.get(0)
assert trace.find { it.isError() } == null
assert trace.find {it.isError() } == null
}

def 'test blocking of request for path parameters'() {
Expand Down Expand Up @@ -1693,8 +1693,7 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
spans.find { it.tags['appsec.blocked'] == 'true' } != null
spans.find {
it.error &&
it.tags['error.type'] == BlockingException.name
} != null
it.tags['error.type'] == BlockingException.name } != null

and:
if (isDataStreamsEnabled()) {
Expand Down Expand Up @@ -1874,7 +1873,7 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
if (isDataStreamsEnabled()) {
TEST_DATA_STREAMS_WRITER.waitForGroups(1)
}
DDSpan span = TEST_WRITER.flatten().find { it.operationName == 'appsec-span' }
DDSpan span = TEST_WRITER.flatten().find {it.operationName =='appsec-span' }
span != null
final sessionId = span.tags[IG_SESSION_ID_TAG]
sessionId != null
Expand Down
Loading
0