Skip to content

Commit 4e8d69f

Browse files
vandonrvandonr
authored
support for vertx 5.1 in tracing (#11655)
fix muzzle guard in vertx5 to not exclude 5.1 also exclude iast forked latest tests Merge branch 'master' into vandonr/vertx51 Co-authored-by: raphael.vandon <raphael.vandon@datadoghq.com>
1 parent 553bc3e commit 4e8d69f

3 files changed

Lines changed: 40 additions & 25 deletions

File tree

‎dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxVersionMatcher.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
public class VertxVersionMatcher {
77
// added in 4.0
88
public static final Reference HTTP_1X_SERVER_RESPONSE =
9-
new Reference.Builder("io.vertx.core.http.impl.Http1xServerResponse").build();
9+
new Reference.Builder("io.vertx.core.http.impl.headers.HeadersAdaptor").build();
1010
}

‎dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,14 @@ tasks.named("compileJava", JavaCompile) {
6060
configureCompiler(it, 11, JavaVersion.VERSION_1_8)
6161
}
6262

63+
// TEMPORARILY exclude iast tests from latest Dep at the compile level because it fails with vertx 5.1
64+
// (types HeadersMultiMap and Http2HeadersAdaptor were (re)moved)
65+
// TODO for AppSec team: remove this section, run `./gradlew :dd-java-agent:instrumentation:vertx:vertx-web:vertx-web-5.0:latestDepTest`, see errors and fix them.
66+
["compileLatestDepTestGroovy", "compileLatestDepForkedTestGroovy"].each {
67+
tasks.named(it, GroovyCompile) {
68+
exclude("core/MultiMapInstrumentationTest.groovy")
69+
exclude("core/BufferInstrumentationTest.groovy")
70+
exclude("server/Iast*.groovy")
71+
}
72+
}
73+

‎dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/gradle.lockfile‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compil
1313
com.datadoghq:java-dogstatsd-client:4.4.5=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
1414
com.datadoghq:sketches-java:0.8.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
1515
com.fasterxml.jackson.core:jackson-core:2.16.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
16-
com.fasterxml.jackson.core:jackson-core:2.18.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
16+
com.fasterxml.jackson.core:jackson-core:2.21.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
1717
com.fasterxml.jackson:jackson-bom:2.16.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
18-
com.fasterxml.jackson:jackson-bom:2.18.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
18+
com.fasterxml.jackson:jackson-bom:2.21.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
1919
com.github.javaparser:javaparser-core:3.25.6=codenarc
2020
com.github.jnr:jffi:1.3.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
2121
com.github.jnr:jnr-a64asm:1.0.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
@@ -52,53 +52,57 @@ commons-io:commons-io:2.20.0=spotbugs
5252
de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
5353
io.leangen.geantyref:geantyref:1.3.16=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
5454
io.netty:netty-buffer:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath
55-
io.netty:netty-buffer:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
55+
io.netty:netty-buffer:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
5656
io.netty:netty-codec-base:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath
57-
io.netty:netty-codec-base:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
57+
io.netty:netty-codec-base:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
58+
io.netty:netty-codec-classes-quic:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
5859
io.netty:netty-codec-compression:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath
59-
io.netty:netty-codec-compression:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
60+
io.netty:netty-codec-compression:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6061
io.netty:netty-codec-dns:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath
61-
io.netty:netty-codec-dns:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
62+
io.netty:netty-codec-dns:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6263
io.netty:netty-codec-http2:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath
63-
io.netty:netty-codec-http2:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
64+
io.netty:netty-codec-http2:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
65+
io.netty:netty-codec-http3:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6466
io.netty:netty-codec-http:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath
65-
io.netty:netty-codec-http:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
67+
io.netty:netty-codec-http:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6668
io.netty:netty-codec-marshalling:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath
6769
io.netty:netty-codec-protobuf:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath
6870
io.netty:netty-codec-socks:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath
69-
io.netty:netty-codec-socks:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
71+
io.netty:netty-codec-socks:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7072
io.netty:netty-codec:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath
7173
io.netty:netty-common:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath
72-
io.netty:netty-common:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
74+
io.netty:netty-common:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7375
io.netty:netty-handler-proxy:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath
74-
io.netty:netty-handler-proxy:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
76+
io.netty:netty-handler-proxy:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7577
io.netty:netty-handler:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath
76-
io.netty:netty-handler:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
78+
io.netty:netty-handler:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7779
io.netty:netty-resolver-dns:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath
78-
io.netty:netty-resolver-dns:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
80+
io.netty:netty-resolver-dns:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7981
io.netty:netty-resolver:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath
80-
io.netty:netty-resolver:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
82+
io.netty:netty-resolver:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
83+
io.netty:netty-tcnative-classes:2.0.77.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
8184
io.netty:netty-transport-native-unix-common:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath
82-
io.netty:netty-transport-native-unix-common:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
85+
io.netty:netty-transport-native-unix-common:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
8386
io.netty:netty-transport:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath
84-
io.netty:netty-transport:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
87+
io.netty:netty-transport:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
8588
io.sqreen:libsqreen:17.3.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
8689
io.vertx:vertx-auth-common:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath
87-
io.vertx:vertx-auth-common:5.0.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
90+
io.vertx:vertx-auth-common:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
8891
io.vertx:vertx-bridge-common:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath
89-
io.vertx:vertx-bridge-common:5.0.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
92+
io.vertx:vertx-bridge-common:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
9093
io.vertx:vertx-core-logging:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath
91-
io.vertx:vertx-core-logging:5.0.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
94+
io.vertx:vertx-core-logging:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
9295
io.vertx:vertx-core:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath
93-
io.vertx:vertx-core:5.0.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
96+
io.vertx:vertx-core:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
97+
io.vertx:vertx-eventbus-bridge-common:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
9498
io.vertx:vertx-uri-template:5.0.0.CR3=testCompileClasspath,testRuntimeClasspath
95-
io.vertx:vertx-uri-template:5.0.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
99+
io.vertx:vertx-uri-template:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
96100
io.vertx:vertx-web-client:5.0.0.CR3=testCompileClasspath,testRuntimeClasspath
97-
io.vertx:vertx-web-client:5.0.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
101+
io.vertx:vertx-web-client:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
98102
io.vertx:vertx-web-common:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath
99-
io.vertx:vertx-web-common:5.0.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
103+
io.vertx:vertx-web-common:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
100104
io.vertx:vertx-web:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath
101-
io.vertx:vertx-web:5.0.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
105+
io.vertx:vertx-web:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
102106
javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
103107
jaxen:jaxen:2.0.0=spotbugs
104108
junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath

0 commit comments

Comments
 (0)