Skip to content

Commit d90027b

Browse files
committed
muzzle fix
1 parent 4e04a3b commit d90027b

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

dd-java-agent/instrumentation/vertx-pg-client-4/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ muzzle {
55
pass {
66
group = 'io.vertx'
77
module = 'vertx-pg-client'
8-
versions = '[4.0.0,5)'
8+
// 4.1.1 is the first version where PgConnectionFactory is public
9+
// see https://github.com/eclipse-vertx/vertx-sql-client/pull/986
10+
versions = '[4.1.1,5)'
911
assertInverse = true
1012
}
1113
}
@@ -20,9 +22,9 @@ latestDepTest {
2022
}
2123

2224
dependencies {
23-
compileOnly group: 'io.vertx', name: 'vertx-pg-client', version: '4.0.0'
25+
compileOnly group: 'io.vertx', name: 'vertx-pg-client', version: '4.1.1'
2426

25-
testImplementation group: 'io.vertx', name: 'vertx-pg-client', version: '4.0.0'
27+
testImplementation group: 'io.vertx', name: 'vertx-pg-client', version: '4.1.1'
2628
testImplementation project(':dd-java-agent:instrumentation:vertx-sql-common')
2729

2830
// This is needed for the test container to start

dd-java-agent/instrumentation/vertx-pg-client-4/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PgPoolImplAdvice.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import datadog.trace.bootstrap.InstrumentationContext;
44
import datadog.trace.bootstrap.instrumentation.jdbc.DBInfo;
5+
import io.vertx.core.Context;
56
import io.vertx.pgclient.PgConnectOptions;
7+
import io.vertx.pgclient.impl.PgConnectionFactory;
68
import io.vertx.sqlclient.SqlClient;
79
import net.bytebuddy.asm.Advice;
810

@@ -22,4 +24,8 @@ public static void afterCreate(
2224
.build();
2325
InstrumentationContext.get(SqlClient.class, DBInfo.class).put(zis, info);
2426
}
27+
28+
private static void muzzleCheck(PgConnectionFactory f) {
29+
f.connect((Context) null);
30+
}
2531
}

dd-java-agent/instrumentation/vertx-pg-client-4/src/main/java/datadog/trace/instrumentation/vertx_pg_client_4/PreparedStatementQueryAdvice.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import datadog.trace.api.Pair;
44
import datadog.trace.bootstrap.InstrumentationContext;
5+
import io.vertx.core.Context;
6+
import io.vertx.pgclient.impl.PgConnectionFactory;
57
import io.vertx.sqlclient.PreparedStatement;
68
import io.vertx.sqlclient.Query;
79
import net.bytebuddy.asm.Advice;
@@ -13,4 +15,8 @@ public static void afterQuery(
1315
InstrumentationContext.get(Query.class, Pair.class)
1416
.put(query, InstrumentationContext.get(PreparedStatement.class, Pair.class).get(zis));
1517
}
18+
19+
private static void muzzleCheck(PgConnectionFactory f) {
20+
f.connect((Context) null);
21+
}
1622
}

0 commit comments

Comments
 (0)