Skip to content

Commit fa824f4

Browse files
jaydelucajaydeluca
committed
batch 10 - final completion
1 parent 130e72b commit fa824f4

File tree

10 files changed

+157
-57
lines changed

10 files changed

+157
-57
lines changed

‎instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,26 @@ dependencies {
2424
testInstrumentation(project(":instrumentation:mongo:mongo-4.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
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
3044
}
3145

32-
val testStableSemconv by registering(Test::class) {
33-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
34-
}
35-
3646
check {
37-
dependsOn(testStableSemconv)
47+
dependsOn(testing.suites.named("testStableSemconv"))
3848
}
3949
}

‎instrumentation/opensearch/opensearch-rest-1.0/javaagent/build.gradle.kts‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,26 @@ dependencies {
3939
latestDepTestLibrary("org.opensearch.client:opensearch-rest-client:2.+") // see opensearch-rest-3.0 module
4040
}
4141

42+
testing {
43+
suites {
44+
val testStableSemconv by registering(JvmTestSuite::class) {
45+
targets {
46+
all {
47+
testTask.configure {
48+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
49+
}
50+
}
51+
}
52+
}
53+
}
54+
}
55+
4256
tasks {
4357
test {
4458
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
4559
}
4660

47-
val testStableSemconv by registering(Test::class) {
48-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
49-
}
50-
5161
check {
52-
dependsOn(testStableSemconv)
62+
dependsOn(testing.suites.named("testStableSemconv"))
5363
}
5464
}

‎instrumentation/opensearch/opensearch-rest-3.0/javaagent/build.gradle.kts‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,26 @@ dependencies {
3232
testImplementation(project(":instrumentation:opensearch:opensearch-rest-common:testing"))
3333
}
3434

35+
testing {
36+
suites {
37+
val testStableSemconv by registering(JvmTestSuite::class) {
38+
targets {
39+
all {
40+
testTask.configure {
41+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
42+
}
43+
}
44+
}
45+
}
46+
}
47+
}
48+
3549
tasks {
3650
test {
3751
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
3852
}
3953

40-
val testStableSemconv by registering(Test::class) {
41-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
42-
}
43-
4454
check {
45-
dependsOn(testStableSemconv)
55+
dependsOn(testing.suites.named("testStableSemconv"))
4656
}
4757
}

‎instrumentation/opentelemetry-instrumentation-api/javaagent/build.gradle.kts‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,26 @@ testing {
4141
implementation(project(":instrumentation:opentelemetry-instrumentation-api:testing"))
4242
}
4343
}
44+
45+
val testStableSemconv by registering(JvmTestSuite::class) {
46+
targets {
47+
all {
48+
testTask.configure {
49+
jvmArgs("-Dotel.semconv-stability.opt-in=code")
50+
}
51+
}
52+
}
53+
}
54+
55+
val testBothSemconv by registering(JvmTestSuite::class) {
56+
targets {
57+
all {
58+
testTask.configure {
59+
jvmArgs("-Dotel.semconv-stability.opt-in=code/dup")
60+
}
61+
}
62+
}
63+
}
4464
}
4565
}
4666

@@ -67,17 +87,7 @@ configurations.configureEach {
6787

6888
tasks {
6989

70-
val testStableSemconv by registering(Test::class) {
71-
jvmArgs("-Dotel.semconv-stability.opt-in=code")
72-
}
73-
74-
val testBothSemconv by registering(Test::class) {
75-
jvmArgs("-Dotel.semconv-stability.opt-in=code/dup")
76-
}
77-
7890
check {
7991
dependsOn(testing.suites)
80-
dependsOn(testStableSemconv)
81-
dependsOn(testBothSemconv)
8292
}
8393
}

‎instrumentation/pulsar/pulsar-2.8/javaagent/build.gradle.kts‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,24 @@ dependencies {
1919
testImplementation("org.apache.pulsar:pulsar-client-admin:2.8.0")
2020
}
2121

22-
tasks {
23-
val testReceiveSpanDisabled by registering(Test::class) {
24-
filter {
25-
includeTestsMatching("PulsarClientSuppressReceiveSpansTest")
22+
testing {
23+
suites {
24+
val testReceiveSpanDisabled by registering(JvmTestSuite::class) {
25+
targets {
26+
all {
27+
testTask.configure {
28+
filter {
29+
includeTestsMatching("PulsarClientSuppressReceiveSpansTest")
30+
}
31+
include("**/PulsarClientSuppressReceiveSpansTest.*")
32+
}
33+
}
34+
}
2635
}
27-
include("**/PulsarClientSuppressReceiveSpansTest.*")
2836
}
37+
}
2938

39+
tasks {
3040
test {
3141
filter {
3242
excludeTestsMatching("PulsarClientSuppressReceiveSpansTest")
@@ -35,7 +45,7 @@ tasks {
3545
}
3646

3747
check {
38-
dependsOn(testReceiveSpanDisabled)
48+
dependsOn(testing.suites.named("testReceiveSpanDisabled"))
3949
}
4050
}
4151

‎instrumentation/r2dbc-1.0/javaagent/build.gradle.kts‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,26 @@ dependencies {
3030
testInstrumentation(project(":instrumentation:reactor:reactor-3.1:javaagent"))
3131
}
3232

33+
testing {
34+
suites {
35+
val testStableSemconv by registering(JvmTestSuite::class) {
36+
targets {
37+
all {
38+
testTask.configure {
39+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
40+
}
41+
}
42+
}
43+
}
44+
}
45+
}
46+
3347
tasks {
3448
withType<Test>().configureEach {
3549
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
3650
}
3751

38-
val testStableSemconv by registering(Test::class) {
39-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
40-
}
41-
4252
check {
43-
dependsOn(testStableSemconv)
53+
dependsOn(testing.suites.named("testStableSemconv"))
4454
}
4555
}

‎instrumentation/r2dbc-1.0/library/build.gradle.kts‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,26 @@ dependencies {
1010
testImplementation(project(":instrumentation:reactor:reactor-3.1:library"))
1111
}
1212

13+
testing {
14+
suites {
15+
val testStableSemconv by registering(JvmTestSuite::class) {
16+
targets {
17+
all {
18+
testTask.configure {
19+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
20+
}
21+
}
22+
}
23+
}
24+
}
25+
}
26+
1327
tasks {
1428
withType<Test>().configureEach {
1529
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
1630
}
1731

18-
val testStableSemconv by registering(Test::class) {
19-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
20-
}
21-
2232
check {
23-
dependsOn(testStableSemconv)
33+
dependsOn(testing.suites.named("testStableSemconv"))
2434
}
2535
}

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,27 @@ dependencies {
2424
testImplementation(project(":instrumentation:redisson:redisson-common:testing"))
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
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
3044
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
3145
}
3246

33-
val testStableSemconv by registering(Test::class) {
34-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
35-
}
36-
3747
check {
38-
dependsOn(testStableSemconv)
48+
dependsOn(testing.suites.named("testStableSemconv"))
3949
}
4050
}

‎instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/build.gradle.kts‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,24 @@ dependencies {
1717
testImplementation(project(":instrumentation:rocketmq:rocketmq-client:rocketmq-client-5.0:testing"))
1818
}
1919

20-
tasks {
21-
val testReceiveSpanDisabled by registering(Test::class) {
22-
filter {
23-
includeTestsMatching("RocketMqClientSuppressReceiveSpanTest")
20+
testing {
21+
suites {
22+
val testReceiveSpanDisabled by registering(JvmTestSuite::class) {
23+
targets {
24+
all {
25+
testTask.configure {
26+
filter {
27+
includeTestsMatching("RocketMqClientSuppressReceiveSpanTest")
28+
}
29+
include("**/RocketMqClientSuppressReceiveSpanTest.*")
30+
}
31+
}
32+
}
2433
}
25-
include("**/RocketMqClientSuppressReceiveSpanTest.*")
2634
}
35+
}
2736

37+
tasks {
2838
test {
2939
filter {
3040
excludeTestsMatching("RocketMqClientSuppressReceiveSpanTest")
@@ -34,6 +44,6 @@ tasks {
3444
}
3545

3646
check {
37-
dependsOn(testReceiveSpanDisabled)
47+
dependsOn(testing.suites.named("testReceiveSpanDisabled"))
3848
}
3949
}

‎instrumentation/spymemcached-2.12/javaagent/build.gradle.kts‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,28 @@ dependencies {
2020
testImplementation("com.google.guava:guava")
2121
}
2222

23+
testing {
24+
suites {
25+
val testStableSemconv by registering(JvmTestSuite::class) {
26+
targets {
27+
all {
28+
testTask.configure {
29+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
30+
}
31+
}
32+
}
33+
}
34+
}
35+
}
36+
2337
tasks {
2438
withType<Test>().configureEach {
2539
// TODO run tests both with and without experimental span attributes
2640
jvmArgs("-Dotel.instrumentation.spymemcached.experimental-span-attributes=true")
2741
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
2842
}
2943

30-
val testStableSemconv by registering(Test::class) {
31-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
32-
}
33-
3444
check {
35-
dependsOn(testStableSemconv)
45+
dependsOn(testing.suites.named("testStableSemconv"))
3646
}
3747
}

0 commit comments

Comments
 (0)