Skip to content

Commit bc14f5f

Browse files
committed
fix gradle
1 parent 7490037 commit bc14f5f

File tree

7 files changed

+20
-12
lines changed

7 files changed

+20
-12
lines changed

instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ tasks {
4040
}
4141

4242
val testStableSemconv by registering(Test::class) {
43+
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
44+
jvmArgs("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED")
45+
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
4346
jvmArgs("-Dotel.semconv-stability.opt-in=database")
4447
}
4548

instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ tasks {
4545
}
4646

4747
val testStableSemconv by registering(Test::class) {
48+
jvmArgs("-Dotel.instrumentation.couchbase.experimental-span-attributes=true")
49+
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
50+
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
4851
jvmArgs("-Dotel.semconv-stability.opt-in=database")
4952
}
5053

instrumentation/influxdb-2.4/javaagent/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ tasks {
5555
}
5656

5757
val testStableSemconv by registering(Test::class) {
58+
jvmArgs("-Dotel.instrumentation.okhttp.enabled=false")
5859
jvmArgs("-Dotel.semconv-stability.opt-in=database")
5960
}
6061

instrumentation/jedis/jedis-1.4/javaagent/build.gradle.kts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,16 @@ testing {
3939
}
4040

4141
tasks {
42-
withType<Test>().configureEach {
42+
test {
4343
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
4444
}
4545

46-
check {
47-
dependsOn(testing.suites)
48-
}
49-
5046
val testStableSemconv by registering(Test::class) {
5147
jvmArgs("-Dotel.semconv-stability.opt-in=database")
5248
}
5349

5450
check {
51+
dependsOn(testing.suites)
5552
dependsOn(testStableSemconv)
5653
}
5754
}

instrumentation/lettuce/lettuce-4.0/javaagent/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ dependencies {
1919

2020
tasks {
2121
test {
22-
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
2322
// TODO run tests both with and without experimental span attributes
2423
jvmArgs("-Dotel.instrumentation.lettuce.experimental-span-attributes=true")
2524
jvmArgs("-Dotel.instrumentation.lettuce.connection-telemetry.enabled=true")
25+
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
2626
}
2727

2828
val testStableSemconv by registering(Test::class) {
29+
jvmArgs("-Dotel.instrumentation.lettuce.experimental-span-attributes=true")
30+
jvmArgs("-Dotel.instrumentation.lettuce.connection-telemetry.enabled=true")
2931
jvmArgs("-Dotel.semconv-stability.opt-in=database")
3032
}
3133

instrumentation/lettuce/lettuce-5.0/javaagent/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,15 @@ dependencies {
2424

2525
tasks {
2626
test {
27-
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
2827
// TODO run tests both with and without experimental span attributes
2928
jvmArgs("-Dotel.instrumentation.lettuce.experimental-span-attributes=true")
3029
jvmArgs("-Dotel.instrumentation.lettuce.connection-telemetry.enabled=true")
30+
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
3131
}
3232

3333
val testStableSemconv by registering(Test::class) {
34+
jvmArgs("-Dotel.instrumentation.lettuce.experimental-span-attributes=true")
35+
jvmArgs("-Dotel.instrumentation.lettuce.connection-telemetry.enabled=true")
3436
jvmArgs("-Dotel.semconv-stability.opt-in=database")
3537
}
3638

instrumentation/redisson/redisson-3.17/javaagent/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ dependencies {
2525
}
2626

2727
tasks {
28-
val testStableSemconv by registering(Test::class) {
29-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
30-
}
31-
32-
withType<Test>().configureEach {
28+
test {
3329
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
3430
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
3531
}
3632

33+
val testStableSemconv by registering(Test::class) {
34+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
35+
}
36+
3737
check {
3838
dependsOn(testStableSemconv)
3939
}

0 commit comments

Comments
 (0)