From dddf806a58e1531643213742cd3b1690d5b0ae47 Mon Sep 17 00:00:00 2001 From: Matthew Li Date: Mon, 19 May 2025 13:57:19 +0200 Subject: [PATCH 1/8] removing limits for version 5.0.0 on muzzle --- dd-java-agent/instrumentation/vertx-pg-client-4.0/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-java-agent/instrumentation/vertx-pg-client-4.0/build.gradle b/dd-java-agent/instrumentation/vertx-pg-client-4.0/build.gradle index cfa4eba8fa5..11890d3f763 100644 --- a/dd-java-agent/instrumentation/vertx-pg-client-4.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx-pg-client-4.0/build.gradle @@ -7,7 +7,7 @@ muzzle { module = 'vertx-pg-client' // 4.1.1 is the first version where PgConnectionFactory is public // see https://github.com/eclipse-vertx/vertx-sql-client/pull/986 - versions = '[4.1.1,5)' + versions = '[4.1.1,)' assertInverse = true } } From dd9c7dc5d2ab5a6b6ebe7f9d60dd88b4c17df4d8 Mon Sep 17 00:00:00 2001 From: Matthew Li Date: Mon, 19 May 2025 13:58:10 +0200 Subject: [PATCH 2/8] add vertx-pg-client-4.4.2 --- .../instrumentation/vertx-pg-client-4.4.2/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-java-agent/instrumentation/vertx-pg-client-4.4.2/build.gradle b/dd-java-agent/instrumentation/vertx-pg-client-4.4.2/build.gradle index fa167b7090d..fdc8fe1e71c 100644 --- a/dd-java-agent/instrumentation/vertx-pg-client-4.4.2/build.gradle +++ b/dd-java-agent/instrumentation/vertx-pg-client-4.4.2/build.gradle @@ -4,7 +4,7 @@ muzzle { pass { group = 'io.vertx' module = 'vertx-pg-client' - versions = '[4.4.2,4.6.0)' + versions = '[4.4.2,)' assertInverse = true } } From 15544dddadb057b8929c0a109909535fc35aaf10 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Mon, 19 May 2025 14:58:35 +0200 Subject: [PATCH 3/8] workaround --- .../instrumentation/vertx-pg-client-4.0/build.gradle | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/instrumentation/vertx-pg-client-4.0/build.gradle b/dd-java-agent/instrumentation/vertx-pg-client-4.0/build.gradle index 11890d3f763..3b887b4a269 100644 --- a/dd-java-agent/instrumentation/vertx-pg-client-4.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx-pg-client-4.0/build.gradle @@ -7,8 +7,14 @@ muzzle { module = 'vertx-pg-client' // 4.1.1 is the first version where PgConnectionFactory is public // see https://github.com/eclipse-vertx/vertx-sql-client/pull/986 - versions = '[4.1.1,)' - assertInverse = true + versions = '[4.1.1,5)' + } + fail { + group = 'io.vertx' + module = 'vertx-pg-client' + // 4.1.1 is the first version where PgConnectionFactory is public + // see https://github.com/eclipse-vertx/vertx-sql-client/pull/986 + versions = '(,4.1.1)' } } From 333bd0a5d76b85166bcf40ad38f91d9fec7d1a57 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Mon, 19 May 2025 23:02:15 +0200 Subject: [PATCH 4/8] use java 11 for vertx mysql client muzzle --- .../instrumentation/vertx-mysql-client-3.9/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/build.gradle b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/build.gradle index 0a8136a7ea0..14071efc063 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/build.gradle +++ b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/build.gradle @@ -6,6 +6,7 @@ muzzle { group = 'io.vertx' module = 'vertx-mysql-client' versions = '[3.9.0,4)' + javaVersion = '11' assertInverse = true } } From 47098d08ef063bde6231d990d03b573424f244ea Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Tue, 20 May 2025 08:40:48 +0200 Subject: [PATCH 5/8] use java 11 for all the vertx 3.9 checking 5+ --- .../instrumentation/vertx-redis-client-3.9/build.gradle | 1 + dd-java-agent/instrumentation/vertx-sql-client-3.9/build.gradle | 1 + 2 files changed, 2 insertions(+) diff --git a/dd-java-agent/instrumentation/vertx-redis-client-3.9/build.gradle b/dd-java-agent/instrumentation/vertx-redis-client-3.9/build.gradle index 62c07d97b7f..e058b993307 100644 --- a/dd-java-agent/instrumentation/vertx-redis-client-3.9/build.gradle +++ b/dd-java-agent/instrumentation/vertx-redis-client-3.9/build.gradle @@ -3,6 +3,7 @@ muzzle { group = 'io.vertx' module = 'vertx-redis-client' versions = '[3.9.0,)' + javaVersion = '11' assertInverse = true } } diff --git a/dd-java-agent/instrumentation/vertx-sql-client-3.9/build.gradle b/dd-java-agent/instrumentation/vertx-sql-client-3.9/build.gradle index b0da108ffc6..9dfcd4d305c 100644 --- a/dd-java-agent/instrumentation/vertx-sql-client-3.9/build.gradle +++ b/dd-java-agent/instrumentation/vertx-sql-client-3.9/build.gradle @@ -5,6 +5,7 @@ muzzle { group = "io.vertx" module = "vertx-sql-client" versions = "[3.9.0,)" + javaVersion = "11" } } From 692d16af569108ec292db5a8c5fb8fddec2f8c69 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Tue, 20 May 2025 09:57:33 +0200 Subject: [PATCH 6/8] fix muzzle for vertx-web --- dd-java-agent/instrumentation/vertx-web-3.9/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dd-java-agent/instrumentation/vertx-web-3.9/build.gradle b/dd-java-agent/instrumentation/vertx-web-3.9/build.gradle index fb2b97a06b8..5861f0980eb 100644 --- a/dd-java-agent/instrumentation/vertx-web-3.9/build.gradle +++ b/dd-java-agent/instrumentation/vertx-web-3.9/build.gradle @@ -10,7 +10,8 @@ muzzle { pass { group = 'io.vertx' module = "vertx-web" - versions = "[3.8.1,5)" + versions = "[3.8.1,)" // it won't fail on 5+ since won't apply + javaVersion = "11" assertInverse = true } } From f4456cb775f6f6066ef87ee6e0b2d081f7e587d7 Mon Sep 17 00:00:00 2001 From: Matthew Li Date: Tue, 20 May 2025 11:16:24 +0200 Subject: [PATCH 7/8] modifying vertx-web-4.0 --- dd-java-agent/instrumentation/vertx-web-4.0/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle b/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle index b18d87758bb..4a9cbac347f 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle @@ -15,7 +15,8 @@ muzzle { pass { group = 'io.vertx' module = "vertx-web" - versions = "[4.0.0,5)" + versions = "[4.0.0,)" + javaVersion = "11" assertInverse = true } } From 1e12ac4812493368b42800b203d978ddca89bb72 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Tue, 20 May 2025 11:23:47 +0200 Subject: [PATCH 8/8] skip assertInverse for muzzle vertx web 4 --- dd-java-agent/instrumentation/vertx-web-4.0/build.gradle | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle b/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle index 4a9cbac347f..0b0ebe88d4f 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle @@ -15,9 +15,12 @@ muzzle { pass { group = 'io.vertx' module = "vertx-web" - versions = "[4.0.0,)" - javaVersion = "11" - assertInverse = true + versions = "[4.0.0,5)" + } + fail { + group = 'io.vertx' + module = "vertx-web" + versions = "(,4.0.0)" } }