Skip to content

Refactor instrumentation modules for jetty, netty and tibco #9547

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 3 commits into from
Sep 16, 2025
+137 −137
Merged

Refactor instrumentation modules for jetty, netty and tibco #9547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6444ad2
move tibco bw modules
amarziali Sep 16, 2025
f88b72a
group netty modules
amarziali Sep 16, 2025
a08cd6e
Group jetty modules
amarziali Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies {
// to instrument the integration test
iastIntegrationTestImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures')
iastIntegrationTestImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0'
iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jetty-9'))
iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0'))
iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:apache-httpcore:apache-httpcore-4.0'))
iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:servlet'))
iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java-lang'))
Expand Down
6 changes: 3 additions & 3 deletions dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ dependencies {
testImplementation group: 'io.grpc', name: 'grpc-stub', version: grpcVersion
testImplementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
testImplementation project(':dd-java-agent:instrumentation:grpc-1.5')
testImplementation project(':dd-java-agent:instrumentation:netty-3.8')
testImplementation project(':dd-java-agent:instrumentation:netty-4.0')
testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
testImplementation project(':dd-java-agent:instrumentation:netty:netty-3.8')
testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.0')
testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')

latestDepTestImplementation sourceSets.test.output // include the protobuf generated classes
latestDepTestImplementation group: 'com.linecorp.armeria', name: 'armeria-grpc', version: '1.+'
Expand Down
12 changes: 6 additions & 6 deletions dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,18 @@ dependencies {
exclude group: 'org.slf4j', module: 'slf4j-api'
}
testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty-9'))
testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0'))
testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5'))
testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty-11'))
testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0'))

testImplementation(project(':dd-java-agent:instrumentation-testing')) {
exclude group: 'org.eclipse.jetty', module: 'jetty-server'
}
// always mix everything up
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-11')
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9')
testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty-util'))
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-appsec-9.3')
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31'))
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')
testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')
testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-3')

Expand Down
4 changes: 2 additions & 2 deletions dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies {
// Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
// Also include netty instrumentation because it is used by aws async client
testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
testImplementation group: 'software.amazon.awssdk', name: 'apache-client', version: '2.2.0'
testImplementation group: 'software.amazon.awssdk', name: 's3', version: '2.2.0'
testImplementation group: 'software.amazon.awssdk', name: 'rds', version: '2.2.0'
Expand Down Expand Up @@ -70,7 +70,7 @@ dependencies {
latestPayloadTaggingTestImplementation group: 'software.amazon.awssdk', name: 'kinesis', version: '2.18.40'

latestDepTestImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
latestDepTestImplementation project(':dd-java-agent:instrumentation:netty-4.1')
latestDepTestImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')

latestDepTestImplementation group: 'software.amazon.awssdk', name: 'apache-client', version: fixedSdkVersion
latestDepTestImplementation group: 'software.amazon.awssdk', name: 'apigateway', version: fixedSdkVersion
Expand Down
10 changes: 5 additions & 5 deletions dd-java-agent/instrumentation/cxf-2.1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ dependencies {
testCompileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.1'
testRuntimeOnly group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
testRuntimeOnly group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-7.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-7.6')
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9')
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-11')
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-12')
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.6')
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-12.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:trace-annotation')
testRuntimeOnly project(':dd-java-agent:instrumentation:jax-rs-annotations-2')
testRuntimeOnly project(':dd-java-agent:instrumentation:jakarta-rs-annotations-3')
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/elasticsearch/rest-6.4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies {
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0')
// Netty is used, but it adds complexity to the tests since we're using embedded ES.
//testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
//testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')

testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/elasticsearch/rest-7/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies {
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0')
// Netty is used, but it adds complexity to the tests since we're using embedded ES.
//testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
//testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')

testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/elasticsearch/transport-5.3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dependencies {
implementation project(':dd-java-agent:instrumentation:elasticsearch')

testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0')
testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
testImplementation project(':dd-java-agent:instrumentation:spring:spring-data-1.8')
testImplementation project(':dd-java-agent:instrumentation:elasticsearch:transport')

Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/elasticsearch/transport-5/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies {
// Ensure no cross interference
testImplementation project(':dd-java-agent:instrumentation:elasticsearch:rest-5')
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0')
testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
testImplementation project(':dd-java-agent:instrumentation:elasticsearch:transport')

testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/elasticsearch/transport-6/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {
// Ensure no cross interference
testImplementation project(':dd-java-agent:instrumentation:elasticsearch:rest-5')
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0')
testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
testImplementation project(':dd-java-agent:instrumentation:elasticsearch:transport')

testImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.0.0'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/elasticsearch/transport-7.3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies {
testImplementation project(':dd-java-agent:instrumentation:elasticsearch:rest-5')
testImplementation project(':dd-java-agent:instrumentation:elasticsearch:rest-6.4')
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0')
testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
testImplementation project(':dd-java-agent:instrumentation:elasticsearch:transport')

testImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '7.3.0'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/finatra-2.9/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ muzzle {
dependencies {
compileOnly group: 'com.twitter', name: 'finatra-http_2.11', version: '2.9.0'

testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')

testImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '19.12.0'
testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
Expand Down
6 changes: 3 additions & 3 deletions dd-java-agent/instrumentation/jersey/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ dependencies {
jersey2JettyTestImplementation group: 'org.glassfish.jersey.media', name: 'jersey-media-json-jackson', version: jersey2Version
jersey2JettyTestRuntimeOnly group: 'javax.activation', name: 'javax.activation-api', version: '1.2.0'
jersey2JettyTestRuntimeOnly group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9')
jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jersey-2-appsec')
jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jax-rs-annotations-2')

Expand All @@ -69,8 +69,8 @@ dependencies {
jersey3JettyTestRuntimeOnly group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: jersey3Version
jersey3JettyTestRuntimeOnly group: 'javax.activation', name: 'javax.activation-api', version: '1.2.0'
jersey3JettyTestRuntimeOnly group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9')
jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty-11')
jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0')
jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jersey-2-appsec')
jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jersey-3-appsec')
jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jakarta-rs-annotations-3')
Expand Down
0 ...strumentation/jetty-appsec-7/build.gradle → ...etty-appsec/jetty-appsec-7.0/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...umentation/jetty-appsec-7/gradle.lockfile → ...y-appsec/jetty-appsec-7.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...uestExtractParametersInstrumentation.java → ...uestExtractParametersInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...on/jetty70/UrlEncodedInstrumentation.java → ...on/jetty70/UrlEncodedInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...mentation/jetty-appsec-8.1.3/build.gradle → ...ty-appsec/jetty-appsec-8.1.3/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...tation/jetty-appsec-8.1.3/gradle.lockfile → ...appsec/jetty-appsec-8.1.3/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...umentation/jetty8/ParameterCollector.java → ...umentation/jetty8/ParameterCollector.java
View file
Open in desktop
File renamed without changes.
0 ...etty8/RequestGetPartsInstrumentation.java → ...etty8/RequestGetPartsInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...rumentation/jetty-appsec-9.2/build.gradle → ...etty-appsec/jetty-appsec-9.2/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...entation/jetty-appsec-9.2/gradle.lockfile → ...y-appsec/jetty-appsec-9.2/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...ractContentParametersInstrumentation.java → ...ractContentParametersInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...rumentation/jetty-appsec-9.3/build.gradle → ...etty-appsec/jetty-appsec-9.3/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...entation/jetty-appsec-9.3/gradle.lockfile → ...y-appsec/jetty-appsec-9.3/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...ractContentParametersInstrumentation.java → ...ractContentParametersInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...instrumentation/jetty-client/build.gradle → ...mentation/jetty/jetty-client/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...trumentation/jetty-client/gradle.lockfile → ...tation/jetty/jetty-client/gradle.lockfile
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...tty-client/jetty-client-10.0/build.gradle → ...tty-client/jetty-client-10.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ compileMain_java11Java.configure {
}
dependencies {
main_java11CompileOnly group: 'org.eclipse.jetty', name: 'jetty-client', version: '10.0.0'
main_java11Implementation(project(':dd-java-agent:instrumentation:jetty-client:jetty-client-common')) {
main_java11Implementation(project(':dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-common')) {
transitive = false
}
//because contains some instrumentation that still apply
testImplementation(project(':dd-java-agent:instrumentation:jetty-client:jetty-client-9.1'))
testImplementation(project(':dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-9.1'))
testImplementation(project(path:':dd-java-agent:testing', 'configuration': 'shadow')) {
// explicitly declared below.
exclude group: 'org.eclipse.jetty'
}
testImplementation project(':dd-java-agent:instrumentation:jetty-util')
testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31')
testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '10.0.0'
testImplementation group: 'org.eclipse.jetty', name: 'jetty-client', version: '10.0.0'
jetty10LatestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-client', version: '10.+'
Expand Down
0 ...-client/jetty-client-10.0/gradle.lockfile → ...-client/jetty-client-10.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ..._client10/JettyClientInstrumentation.java → ..._client10/JettyClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 .../jetty_client10/JettyClientDecorator.java → .../jetty_client10/JettyClientDecorator.java
View file
Open in desktop
File renamed without changes.
0 ...umentation/jetty_client10/SendAdvice.java → ...umentation/jetty_client10/SendAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...ient10/SpanFinishingCompleteListener.java → ...ient10/SpanFinishingCompleteListener.java
View file
Open in desktop
File renamed without changes.
0 ....0/src/test/groovy/JettyClientTest.groovy → ....0/src/test/groovy/JettyClientTest.groovy
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...tty-client/jetty-client-12.0/build.gradle → ...tty-client/jetty-client-12.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ configurations.matching({ it.name.startsWith('test') || it.name.startsWith('late
dependencies {
main_java17CompileOnly group: 'org.eclipse.jetty', name: 'jetty-client', version: '12.0.0'
// to test conflicts
testImplementation(project(':dd-java-agent:instrumentation:jetty-client:jetty-client-9.1'))
testImplementation(project(':dd-java-agent:instrumentation:jetty-client:jetty-client-10.0'))
testImplementation(project(':dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-9.1'))
testImplementation(project(':dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-10.0'))

testImplementation(project(path:':dd-java-agent:testing', 'configuration': 'shadow')) {
// explicitly declared below.
exclude group: 'org.eclipse.jetty'
}
testImplementation project(':dd-java-agent:instrumentation:jetty-util')
testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31')
testImplementation group: 'org.eclipse.jetty', name: 'jetty-client', version: '12.0.0'
latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-client', version: '12.+'
}
0 ...-client/jetty-client-12.0/gradle.lockfile → ...-client/jetty-client-12.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...utureResponseListenerInstrumentation.java → ...utureResponseListenerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ent12/JettyHttpClientInstrumentation.java → ...ent12/JettyHttpClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ation/jetty_client12/CallbackWrapper.java → ...ation/jetty_client12/CallbackWrapper.java
View file
Open in desktop
File renamed without changes.
0 .../jetty_client12/HeadersInjectAdapter.java → .../jetty_client12/HeadersInjectAdapter.java
View file
Open in desktop
File renamed without changes.
0 .../jetty_client12/JettyClientDecorator.java → .../jetty_client12/JettyClientDecorator.java
View file
Open in desktop
File renamed without changes.
0 ...on/jetty_client12/LinkListenerAdvice.java → ...on/jetty_client12/LinkListenerAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...n/jetty_client12/RequestCreateAdvice.java → ...n/jetty_client12/RequestCreateAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...umentation/jetty_client12/SendAdvice.java → ...umentation/jetty_client12/SendAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...ient12/SpanFinishingCompleteListener.java → ...ient12/SpanFinishingCompleteListener.java
View file
Open in desktop
File renamed without changes.
0 ...on/jetty_client12/WrapListenerAdvice.java → ...on/jetty_client12/WrapListenerAdvice.java
View file
Open in desktop
File renamed without changes.
0 ....0/src/test/groovy/JettyClientTest.groovy → ....0/src/test/groovy/JettyClientTest.groovy
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...etty-client/jetty-client-9.1/build.gradle → ...etty-client/jetty-client-9.1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ addTestSuiteForDir('latestDepTest', 'test')

dependencies {
compileOnly group: 'org.eclipse.jetty', name: 'jetty-client', version: '9.1.0.v20131115'
implementation(project(':dd-java-agent:instrumentation:jetty-client:jetty-client-common')) {
implementation(project(':dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-common')) {
transitive = false
}
testImplementation(project(':dd-java-agent:instrumentation-testing')) {
// explicitly declared below.
exclude group: 'org.eclipse.jetty'
}
testImplementation project(':dd-java-agent:instrumentation:jetty-util')
testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31')
testImplementation group: 'org.eclipse.jetty', name: 'jetty-client', version: '9.1.0.v20131115'
testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.1.0.v20131115'
latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-client', version: '9.+'
Expand Down
0 ...y-client/jetty-client-9.1/gradle.lockfile → ...y-client/jetty-client-9.1/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...utureResponseListenerInstrumentation.java → ...utureResponseListenerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...nt91/JettyAddListenerInstrumentation.java → ...nt91/JettyAddListenerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 .../jetty_client91/JettyClientDecorator.java → .../jetty_client91/JettyClientDecorator.java
View file
Open in desktop
File renamed without changes.
0 ..._client91/JettyClientInstrumentation.java → ..._client91/JettyClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ient91/SpanFinishingCompleteListener.java → ...ient91/SpanFinishingCompleteListener.java
View file
Open in desktop
File renamed without changes.
0 ....1/src/test/groovy/JettyClientTest.groovy → ....1/src/test/groovy/JettyClientTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...y-client/jetty-client-common/build.gradle → ...y-client/jetty-client-common/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...lient/jetty-client-common/gradle.lockfile → ...lient/jetty-client-common/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...ntation/jetty_client/CallbackWrapper.java → ...ntation/jetty_client/CallbackWrapper.java
View file
Open in desktop
File renamed without changes.
0 ...on/jetty_client/HeadersInjectAdapter.java → ...on/jetty_client/HeadersInjectAdapter.java
View file
Open in desktop
File renamed without changes.
0 ...instrumentation/jetty-common/build.gradle → ...mentation/jetty/jetty-common/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...trumentation/jetty-common/gradle.lockfile → ...tation/jetty/jetty-common/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...jetty/ConnectionHandleRequestVisitor.java → ...jetty/ConnectionHandleRequestVisitor.java
View file
Open in desktop
File renamed without changes.
0 ...tation/jetty/DelayLoadsMethodVisitor.java → ...tation/jetty/DelayLoadsMethodVisitor.java
View file
Open in desktop
File renamed without changes.
0 ...mentation/jetty/HandleRequestVisitor.java → ...mentation/jetty/HandleRequestVisitor.java
View file
Open in desktop
File renamed without changes.
0 ...ion/jetty/JettyBlockResponseFunction.java → ...ion/jetty/JettyBlockResponseFunction.java
View file
Open in desktop
File renamed without changes.
0 ...umentation/jetty/JettyBlockingHelper.java → ...umentation/jetty/JettyBlockingHelper.java
View file
Open in desktop
File renamed without changes.
0 .../MergeConsecutiveFramesMethodVisitor.java → .../MergeConsecutiveFramesMethodVisitor.java
View file
Open in desktop
File renamed without changes.
0 .../jetty9/DelayCertainInsMethodVisitor.java → .../jetty9/DelayCertainInsMethodVisitor.java
View file
Open in desktop
File renamed without changes.
0 ...instrumentation/jetty9/HandleVisitor.java → ...instrumentation/jetty9/HandleVisitor.java
View file
Open in desktop
File renamed without changes.
0 ...tion/jetty9/HttpChannelHandleVisitor.java → ...tion/jetty9/HttpChannelHandleVisitor.java
View file
Open in desktop
File renamed without changes.
0 ...y/JettyBlockingHelperSpecification.groovy → ...y/JettyBlockingHelperSpecification.groovy
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions ...ent/instrumentation/jetty-11/build.gradle → ...tty-server/jetty-server-11.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ dependencies {
main_java11CompileOnly ("org.eclipse.jetty:jetty-server:11.0.0") {
exclude group: 'org.slf4j', module: 'slf4j-api'
}
main_java11Implementation project(':dd-java-agent:instrumentation:jetty-common')
implementation project(':dd-java-agent:instrumentation:jetty-common')
main_java11Implementation project(':dd-java-agent:instrumentation:jetty:jetty-common')
implementation project(':dd-java-agent:instrumentation:jetty:jetty-common')

testFixturesCompileOnly "org.eclipse.jetty:jetty-server:11.0.0"
testFixturesCompileOnly "org.eclipse.jetty:jetty-servlet:11.0.0"
Expand All @@ -59,10 +59,10 @@ dependencies {
testImplementation ("org.eclipse.jetty.websocket:websocket-jakarta-server:11.0.0") {
exclude group: 'org.slf4j', module: 'slf4j-api'
}
testImplementation(project(':dd-java-agent:instrumentation:jetty-appsec-9.3'))
testImplementation(project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3'))
testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5'))
testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures')
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9')
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')
testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0')
Expand All @@ -81,7 +81,7 @@ dependencies {

// just to mix things up, see if there's no conflict
latestDepTestRuntimeOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'
latestDepTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9')
latestDepTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
}

idea {
Expand Down
0 .../instrumentation/jetty-11/gradle.lockfile → ...-server/jetty-server-11.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...n/jetty11/JettyServerInstrumentation.java → ...n/jetty11/JettyServerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ation/jetty11/RequestInstrumentation.java → ...ation/jetty11/RequestInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...strumentation/jetty11/ExtractAdapter.java → ...strumentation/jetty11/ExtractAdapter.java
View file
Open in desktop
File renamed without changes.
0 ...strumentation/jetty11/JettyDecorator.java → ...strumentation/jetty11/JettyDecorator.java
View file
Open in desktop
File renamed without changes.
0 ...umentation/jetty11/JettyServerAdvice.java → ...umentation/jetty11/JettyServerAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...tation/jetty11/RequestURIDataAdapter.java → ...tation/jetty11/RequestURIDataAdapter.java
View file
Open in desktop
File renamed without changes.
0 ...ntation/jetty11/SetContextPathAdvice.java → ...ntation/jetty11/SetContextPathAdvice.java
View file
Open in desktop
File renamed without changes.
0 .../jetty11/SetRequestedSessionIdAdvice.java → .../jetty11/SetRequestedSessionIdAdvice.java
View file
Open in desktop
File renamed without changes.
0 .../test/groovy/HttpChannelAppSecTest.groovy → .../test/groovy/HttpChannelAppSecTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...t/groovy/Jetty11InactiveAppSecTest.groovy → ...t/groovy/Jetty11InactiveAppSecTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...tty-11/src/test/groovy/Jetty11Test.groovy → ...r-11.0/src/test/groovy/Jetty11Test.groovy
View file
Open in desktop
File renamed without changes.
0 .../test/groovy/JettyAsyncHandlerTest.groovy → .../test/groovy/JettyAsyncHandlerTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...rc/testFixtures/groovy/JettyServer.groovy → ...rc/testFixtures/groovy/JettyServer.groovy
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions ...ent/instrumentation/jetty-12/build.gradle → ...tty-server/jetty-server-12.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ dependencies {
main_java17CompileOnly ("org.eclipse.jetty:jetty-session:12.0.0") {
exclude group: 'org.slf4j', module: 'slf4j-api'
}
main_java17Implementation project(':dd-java-agent:instrumentation:jetty-common')
implementation project(':dd-java-agent:instrumentation:jetty-common')
main_java17Implementation project(':dd-java-agent:instrumentation:jetty:jetty-common')
implementation project(':dd-java-agent:instrumentation:jetty:jetty-common')

// Don't want to conflict with jetty from the test server.
testImplementation(project(':dd-java-agent:instrumentation-testing')) {
Expand All @@ -70,7 +70,7 @@ dependencies {
exclude group: 'org.slf4j', module: 'slf4j-api'
}

testImplementation(project(':dd-java-agent:instrumentation:jetty-appsec-9.3'))
testImplementation(project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3'))
testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5'))
testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0')
Expand All @@ -79,10 +79,10 @@ dependencies {
testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-11")
testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-12")
testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures')
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9')
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')
testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty-11'))
testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty-util'))
testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0'))
testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31'))

latestDepTestImplementation ("org.eclipse.jetty:jetty-server:12.+") {
exclude group: 'org.slf4j', module: 'slf4j-api'
Expand Down
0 .../instrumentation/jetty-12/gradle.lockfile → ...-server/jetty-server-12.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...bstractSessionManagerInstrumentation.java → ...bstractSessionManagerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...etty12/ContextHandlerInstrumentation.java → ...etty12/ContextHandlerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...n/jetty12/JettyServerInstrumentation.java → ...n/jetty12/JettyServerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...strumentation/jetty12/ExtractAdapter.java → ...strumentation/jetty12/ExtractAdapter.java
View file
Open in desktop
File renamed without changes.
0 ...strumentation/jetty12/JettyDecorator.java → ...strumentation/jetty12/JettyDecorator.java
View file
Open in desktop
File renamed without changes.
0 ...ntation/jetty12/JettyRunnableWrapper.java → ...ntation/jetty12/JettyRunnableWrapper.java
View file
Open in desktop
File renamed without changes.
0 ...umentation/jetty12/JettyServerAdvice.java → ...umentation/jetty12/JettyServerAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...tation/jetty12/RequestURIDataAdapter.java → ...tation/jetty12/RequestURIDataAdapter.java
View file
Open in desktop
File renamed without changes.
0 ...ty12/ResolveRequestedSessionIdAdvice.java → ...ty12/ResolveRequestedSessionIdAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...ntation/jetty12/SetContextPathAdvice.java → ...ntation/jetty12/SetContextPathAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...2/src/test/ee10/groovy/Jetty12Test.groovy → ...0/src/test/ee10/groovy/Jetty12Test.groovy
View file
Open in desktop
File renamed without changes.
0 ...2/src/test/ee10/groovy/JettyServer.groovy → ...0/src/test/ee10/groovy/JettyServer.groovy
View file
Open in desktop
File renamed without changes.
0 ...12/src/test/ee8/groovy/Jetty12Test.groovy → ....0/src/test/ee8/groovy/Jetty12Test.groovy
View file
Open in desktop
File renamed without changes.
0 ...12/src/test/ee8/groovy/JettyServer.groovy → ....0/src/test/ee8/groovy/JettyServer.groovy
View file
Open in desktop
File renamed without changes.
0 ...12/src/test/ee9/groovy/Jetty12Test.groovy → ....0/src/test/ee9/groovy/Jetty12Test.groovy
View file
Open in desktop
File renamed without changes.
0 ...12/src/test/ee9/groovy/JettyServer.groovy → ....0/src/test/ee9/groovy/JettyServer.groovy
View file
Open in desktop
File renamed without changes.
Loading