Skip to content

Commit 8664270

Browse files
committed
Instead skip vertx-pg-client-4.0 entirely for JDK 22+
1 parent 5bd74f7 commit 8664270

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
apply from: "$rootDir/gradle/java.gradle"
23

34
muzzle {
@@ -6,18 +7,14 @@ muzzle {
67
module = 'vertx-pg-client'
78
// 4.1.1 is the first version where PgConnectionFactory is public
89
// see https://github.com/eclipse-vertx/vertx-sql-client/pull/986
9-
// 4.5.1 addresses a change in parsing PostgreSQL timestamp that was introduced in JDK 22
10-
// see https://github.com/eclipse-vertx/vertx-sql-client/pull/1394
11-
versions = '[4.5.1,5)'
10+
versions = '[4.1.1,5)'
1211
}
1312
fail {
1413
group = 'io.vertx'
1514
module = 'vertx-pg-client'
1615
// 4.1.1 is the first version where PgConnectionFactory is public
1716
// see https://github.com/eclipse-vertx/vertx-sql-client/pull/986
18-
// 4.5.1 addresses a change in parsing PostgreSQL timestamp that was introduced in JDK 22
19-
// see https://github.com/eclipse-vertx/vertx-sql-client/pull/1394
20-
versions = '(,4.5.1)'
17+
versions = '(,4.1.1)'
2118
}
2219
}
2320

@@ -31,9 +28,9 @@ latestDepTest {
3128
}
3229

3330
dependencies {
34-
compileOnly group: 'io.vertx', name: 'vertx-pg-client', version: '4.5.1'
31+
compileOnly group: 'io.vertx', name: 'vertx-pg-client', version: '4.1.1'
3532

36-
testImplementation group: 'io.vertx', name: 'vertx-pg-client', version: '4.5.1'
33+
testImplementation group: 'io.vertx', name: 'vertx-pg-client', version: '4.1.1'
3734
testRuntimeOnly project(':dd-java-agent:instrumentation:vertx-sql-client-3.9')
3835
testRuntimeOnly project(':dd-java-agent:instrumentation:vertx-pg-client-4.4.2')
3936
// to test possible interferences

dd-java-agent/instrumentation/vertx-pg-client-4.0/src/test/groovy/VertxPostgresSqlClientForkedTest.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,18 @@ import io.vertx.pgclient.PgPool
1111
import io.vertx.sqlclient.*
1212
import spock.lang.AutoCleanup
1313
import spock.lang.Shared
14+
import spock.lang.IgnoreIf
1415

1516
import java.util.concurrent.CountDownLatch
1617
import java.util.concurrent.TimeUnit
1718

1819
import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
1920
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
21+
import datadog.trace.api.Platform
2022

23+
@IgnoreIf(reason = "A change in Locale.ROOT that was introduced in JDK 22 is not fixed until vertx-pg-client v4.5.1: https://github.com/eclipse-vertx/vertx-sql-client/pull/1394", value = {
24+
Platform.isJavaVersionAtLeast(22)
25+
})
2126
class VertxPostgresSqlClientForkedTest extends AgentTestRunner {
2227
@AutoCleanup
2328
@Shared

0 commit comments

Comments
 (0)