Skip to content

Commit 7b13a3b

Browse files
committed
batch 9 partial
1 parent a93d50e commit 7b13a3b

File tree

3 files changed

+27
-15
lines changed

3 files changed

+27
-15
lines changed

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,16 @@ testing {
3232
implementation("org.testcontainers:testcontainers")
3333
}
3434
}
35+
36+
val testStableSemconv by registering(JvmTestSuite::class) {
37+
targets {
38+
all {
39+
testTask.configure {
40+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
41+
}
42+
}
43+
}
44+
}
3545
}
3646
}
3747

@@ -49,11 +59,7 @@ tasks {
4959
}
5060
}
5161

52-
val testStableSemconv by registering(Test::class) {
53-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
54-
}
55-
5662
check {
57-
dependsOn(testStableSemconv)
63+
dependsOn(testing.suites)
5864
}
5965
}

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,28 @@ dependencies {
2424
testInstrumentation(project(":instrumentation:jedis:jedis-3.0:javaagent"))
2525
}
2626

27+
testing {
28+
suites {
29+
val testStableSemconv by registering(JvmTestSuite::class) {
30+
targets {
31+
all {
32+
testTask.configure {
33+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
34+
}
35+
}
36+
}
37+
}
38+
}
39+
}
40+
2741
tasks {
2842
withType<Test>().configureEach {
2943
// latest dep test fails because peer ip is 0:0:0:0:0:0:0:1 instead of 127.0.0.1
3044
jvmArgs("-Djava.net.preferIPv4Stack=true")
3145
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
3246
}
3347

34-
val testStableSemconv by registering(Test::class) {
35-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
36-
}
37-
3848
check {
39-
dependsOn(testStableSemconv)
49+
dependsOn(testing.suites.named("testStableSemconv"))
4050
}
4151
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@ tasks {
3434
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
3535
}
3636

37-
val testStableSemconv by registering(Test::class) {
38-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
39-
}
40-
4137
check {
42-
dependsOn(testStableSemconv)
38+
dependsOn(testing.suites.named("testStableSemconv"))
4339
}
4440
}

0 commit comments

Comments
 (0)