Skip to content

Commit b77a2d7

Browse files
authored
Fix tests for vertx-kafka-client 5.0 (#13922)
1 parent 222b05d commit b77a2d7

File tree

27 files changed

+1510
-674
lines changed

27 files changed

+1510
-674
lines changed

instrumentation/vertx/vertx-kafka-client-3.6/javaagent/build.gradle.kts

Lines changed: 2 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -15,63 +15,7 @@ dependencies {
1515
bootstrap(project(":instrumentation:kafka:kafka-clients:kafka-clients-0.11:bootstrap"))
1616
implementation(project(":instrumentation:kafka:kafka-clients:kafka-clients-common-0.11:library"))
1717

18-
library("io.vertx:vertx-kafka-client:3.6.0")
18+
compileOnly("io.vertx:vertx-kafka-client:3.6.0")
1919
// vertx-codegen is needed for Xlint's annotation checking
20-
library("io.vertx:vertx-codegen:3.6.0")
21-
22-
testImplementation(project(":instrumentation:vertx:vertx-kafka-client-3.6:testing"))
23-
24-
testInstrumentation(project(":instrumentation:kafka:kafka-clients:kafka-clients-0.11:javaagent"))
25-
26-
latestDepTestLibrary("io.vertx:vertx-kafka-client:4.+") // documented limitation, 5.x not supported yet
27-
latestDepTestLibrary("io.vertx:vertx-codegen:4.+") // documented limitation, 5.x not supported yet
28-
}
29-
30-
val latestDepTest = findProperty("testLatestDeps") as Boolean
31-
32-
testing {
33-
suites {
34-
val testNoReceiveTelemetry by registering(JvmTestSuite::class) {
35-
dependencies {
36-
implementation(project(":instrumentation:vertx:vertx-kafka-client-3.6:testing"))
37-
38-
// the "library" configuration is not recognized by the test suite plugin
39-
if (latestDepTest) {
40-
implementation("io.vertx:vertx-kafka-client:4.+")
41-
implementation("io.vertx:vertx-codegen:4.+")
42-
} else {
43-
implementation("io.vertx:vertx-kafka-client:3.6.0")
44-
implementation("io.vertx:vertx-codegen:3.6.0")
45-
}
46-
}
47-
48-
targets {
49-
all {
50-
testTask.configure {
51-
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
52-
53-
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
54-
55-
jvmArgs("-Dotel.instrumentation.kafka.experimental-span-attributes=false")
56-
jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=false")
57-
}
58-
}
59-
}
60-
}
61-
}
62-
}
63-
64-
tasks {
65-
test {
66-
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
67-
68-
systemProperty("testLatestDeps", latestDepTest)
69-
70-
jvmArgs("-Dotel.instrumentation.kafka.experimental-span-attributes=true")
71-
jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true")
72-
}
73-
74-
check {
75-
dependsOn(testing.suites)
76-
}
20+
compileOnly("io.vertx:vertx-codegen:3.6.0")
7721
}

instrumentation/vertx/vertx-kafka-client-3.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/BatchRecordsVertxKafkaTest.java

Lines changed: 0 additions & 168 deletions
This file was deleted.

instrumentation/vertx/vertx-kafka-client-3.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/SingleRecordVertxKafkaTest.java

Lines changed: 0 additions & 123 deletions
This file was deleted.

0 commit comments

Comments
 (0)