rename to match actual version

vandonr · vandonr · commit 4e04a3b3b893 · 2025-02-28T14:15:31.000+01:00
diff --git a/dd-java-agent/instrumentation/vertx-pg-client-4/build.gradle b/dd-java-agent/instrumentation/vertx-pg-client-4/build.gradle
@@ -5,7 +5,7 @@ muzzle {
   pass {
     group = 'io.vertx'
     module = 'vertx-pg-client'
-    versions = '[4.2.0,5)'
+    versions = '[4.0.0,5)'
     assertInverse = true
   }
 }
@@ -20,9 +20,9 @@ latestDepTest {
 }
 
 dependencies {
-  compileOnly group: 'io.vertx', name: 'vertx-pg-client', version: '4.2.0'
+  compileOnly group: 'io.vertx', name: 'vertx-pg-client', version: '4.0.0'
 
-  testImplementation group: 'io.vertx', name: 'vertx-pg-client', version: '4.2.0'
+  testImplementation group: 'io.vertx', name: 'vertx-pg-client', version: '4.0.0'
   testImplementation project(':dd-java-agent:instrumentation:vertx-sql-common')
 
   // This is needed for the test container to start
diff --git a/dd-java-agent/instrumentation/vertx-pg-client-4/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionFactoryConstructorAdvice.java b/dd-java-agent/instrumentation/vertx-pg-client-4/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionFactoryConstructorAdvice.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.vertx_pg_client_4_2_0;
+package datadog.trace.instrumentation.vertx_pg_client_4;
 
 import datadog.trace.bootstrap.InstrumentationContext;
 import datadog.trace.bootstrap.instrumentation.jdbc.DBInfo;
diff --git a/dd-java-agent/instrumentation/vertx-pg-client-4/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionFactoryInstrumentation.java b/dd-java-agent/instrumentation/vertx-pg-client-4/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionFactoryInstrumentation.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.vertx_pg_client_4_2_0;
+package datadog.trace.instrumentation.vertx_pg_client_4;
 
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
 import static java.util.Collections.singletonMap;
diff --git a/dd-java-agent/instrumentation/vertx-pg-client-4/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionImplConstructorAdvice.java b/dd-java-agent/instrumentation/vertx-pg-client-4/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionImplConstructorAdvice.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.vertx_pg_client_4_2_0;
+package datadog.trace.instrumentation.vertx_pg_client_4;
 
 import datadog.trace.bootstrap.InstrumentationContext;
 import datadog.trace.bootstrap.instrumentation.jdbc.DBInfo;
diff --git a/dd-java-agent/instrumentation/vertx-pg-client-4/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-pg-client-4/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgConnectionImplInstrumentation.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.vertx_pg_client_4_2_0;
+package datadog.trace.instrumentation.vertx_pg_client_4;
 
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
diff --git a/dd-java-agent/instrumentation/vertx-pg-client-4/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgPoolImplAdvice.java b/dd-java-agent/instrumentation/vertx-pg-client-4/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgPoolImplAdvice.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.vertx_pg_client_4_2_0;
+package datadog.trace.instrumentation.vertx_pg_client_4;
 
 import datadog.trace.bootstrap.InstrumentationContext;
 import datadog.trace.bootstrap.instrumentation.jdbc.DBInfo;
diff --git a/dd-java-agent/instrumentation/vertx-pg-client-4/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgPoolImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-pg-client-4/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgPoolImplInstrumentation.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.vertx_pg_client_4_2_0;
+package datadog.trace.instrumentation.vertx_pg_client_4;
 
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
 import static java.util.Collections.singletonMap;
diff --git a/dd-java-agent/instrumentation/vertx-pg-client-4/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PreparedStatementImplInstrumentation.java b/dd-java-agent/instrumentation/vertx-pg-client-4/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PreparedStatementImplInstrumentation.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.vertx_pg_client_4_2_0;
+package datadog.trace.instrumentation.vertx_pg_client_4;
 
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.*;
diff --git a/dd-java-agent/instrumentation/vertx-pg-client-4/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PreparedStatementQueryAdvice.java b/dd-java-agent/instrumentation/vertx-pg-client-4/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PreparedStatementQueryAdvice.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.vertx_pg_client_4_2_0;
+package datadog.trace.instrumentation.vertx_pg_client_4;
 
 import datadog.trace.api.Pair;
 import datadog.trace.bootstrap.InstrumentationContext;
diff --git a/dd-java-agent/instrumentation/vertx-pg-client-4/src/test/groovy/VertxPostgresSqlClientForkedTest.groovy b/dd-java-agent/instrumentation/vertx-pg-client-4/src/test/groovy/VertxPostgresSqlClientForkedTest.groovy
diff --git a/dd-java-agent/instrumentation/vertx-pg-client-4/src/test/java/TestDatabases.java b/dd-java-agent/instrumentation/vertx-pg-client-4/src/test/java/TestDatabases.java
diff --git a/settings.gradle b/settings.gradle
@@ -501,7 +501,7 @@ include ':dd-java-agent:instrumentation:velocity'
 include ':dd-java-agent:instrumentation:vertx-mysql-client-3.9'
 include ':dd-java-agent:instrumentation:vertx-mysql-client-4.0'
 include ':dd-java-agent:instrumentation:vertx-mysql-client-4.4.2'
-include ':dd-java-agent:instrumentation:vertx-pg-client-4.2.0'
+include ':dd-java-agent:instrumentation:vertx-pg-client-4'
 include ':dd-java-agent:instrumentation:vertx-redis-client-3.9'
 include ':dd-java-agent:instrumentation:vertx-redis-client-3.9:stubs'
 include ':dd-java-agent:instrumentation:vertx-rx-3.5'

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ muzzle {`
`5`	`5`	`pass {`
`6`	`6`	`group = 'io.vertx'`
`7`	`7`	`module = 'vertx-pg-client'`
`8`		`- versions = '[4.2.0,5)'`
	`8`	`+ versions = '[4.0.0,5)'`
`9`	`9`	`assertInverse = true`
`10`	`10`	`}`
`11`	`11`	`}`
`@@ -20,9 +20,9 @@ latestDepTest {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`dependencies {`
`23`		`- compileOnly group: 'io.vertx', name: 'vertx-pg-client', version: '4.2.0'`
	`23`	`+ compileOnly group: 'io.vertx', name: 'vertx-pg-client', version: '4.0.0'`
`24`	`24`
`25`		`- testImplementation group: 'io.vertx', name: 'vertx-pg-client', version: '4.2.0'`
	`25`	`+ testImplementation group: 'io.vertx', name: 'vertx-pg-client', version: '4.0.0'`
`26`	`26`	`testImplementation project(':dd-java-agent:instrumentation:vertx-sql-common')`
`27`	`27`
`28`	`28`	`// This is needed for the test container to start`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package datadog.trace.instrumentation.vertx_pg_client_4_2_0;`
	`1`	`+package datadog.trace.instrumentation.vertx_pg_client_4;`
`2`	`2`
`3`	`3`	`import datadog.trace.bootstrap.InstrumentationContext;`
`4`	`4`	`import datadog.trace.bootstrap.instrumentation.jdbc.DBInfo;`