Skip to content

Commit a93d50e

Browse files
jaydelucajaydeluca
committed
batch 8
1 parent 9a3eabc commit a93d50e

File tree

10 files changed

+176
-77
lines changed

10 files changed

+176
-77
lines changed

‎instrumentation/jms/jms-1.1/javaagent/build.gradle.kts‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,19 @@ testing {
4545
}
4646
}
4747
}
48+
49+
val testReceiveSpansDisabled by registering(JvmTestSuite::class) {
50+
targets {
51+
all {
52+
testTask.configure {
53+
filter {
54+
includeTestsMatching("Jms1SuppressReceiveSpansTest")
55+
}
56+
include("**/Jms1SuppressReceiveSpansTest.*")
57+
}
58+
}
59+
}
60+
}
4861
}
4962
}
5063

@@ -53,13 +66,6 @@ tasks {
5366
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
5467
}
5568

56-
val testReceiveSpansDisabled by registering(Test::class) {
57-
filter {
58-
includeTestsMatching("Jms1SuppressReceiveSpansTest")
59-
}
60-
include("**/Jms1SuppressReceiveSpansTest.*")
61-
}
62-
6369
test {
6470
filter {
6571
excludeTestsMatching("Jms1SuppressReceiveSpansTest")
@@ -69,7 +75,6 @@ tasks {
6975

7076
check {
7177
dependsOn(testing.suites)
72-
dependsOn(testReceiveSpansDisabled)
7378
}
7479
}
7580

‎instrumentation/jms/jms-3.0/javaagent/build.gradle.kts‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,23 @@ dependencies {
2929
testImplementation("org.apache.activemq:artemis-jakarta-client:2.27.1")
3030
}
3131

32+
testing {
33+
suites {
34+
val testReceiveSpansDisabled by registering(JvmTestSuite::class) {
35+
targets {
36+
all {
37+
testTask.configure {
38+
filter {
39+
includeTestsMatching("Jms3SuppressReceiveSpansTest")
40+
}
41+
include("**/Jms3SuppressReceiveSpansTest.*")
42+
}
43+
}
44+
}
45+
}
46+
}
47+
}
48+
3249
otelJava {
3350
minJavaVersionSupported.set(JavaVersion.VERSION_11)
3451
}
@@ -38,13 +55,6 @@ tasks {
3855
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
3956
}
4057

41-
val testReceiveSpansDisabled by registering(Test::class) {
42-
filter {
43-
includeTestsMatching("Jms3SuppressReceiveSpansTest")
44-
}
45-
include("**/Jms3SuppressReceiveSpansTest.*")
46-
}
47-
4858
test {
4959
filter {
5060
excludeTestsMatching("Jms3SuppressReceiveSpansTest")
@@ -53,6 +63,6 @@ tasks {
5363
}
5464

5565
check {
56-
dependsOn(testReceiveSpansDisabled)
66+
dependsOn(testing.suites.named("testReceiveSpansDisabled"))
5767
}
5868
}

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,20 @@ dependencies {
1717
latestDepTestLibrary("biz.paluch.redis:lettuce:4.+") // see lettuce-5.0 module
1818
}
1919

20+
testing {
21+
suites {
22+
val testStableSemconv by registering(JvmTestSuite::class) {
23+
targets {
24+
all {
25+
testTask.configure {
26+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
27+
}
28+
}
29+
}
30+
}
31+
}
32+
}
33+
2034
tasks {
2135
withType<Test>().configureEach {
2236
// TODO run tests both with and without experimental span attributes
@@ -25,11 +39,7 @@ tasks {
2539
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
2640
}
2741

28-
val testStableSemconv by registering(Test::class) {
29-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
30-
}
31-
3242
check {
33-
dependsOn(testStableSemconv)
43+
dependsOn(testing.suites.named("testStableSemconv"))
3444
}
3545
}

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,20 @@ dependencies {
2424
latestDepTestLibrary("io.lettuce:lettuce-core:5.0.+") // see lettuce-5.1 module
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
// TODO run tests both with and without experimental span attributes
@@ -32,11 +46,7 @@ tasks {
3246
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
3347
}
3448

35-
val testStableSemconv by registering(Test::class) {
36-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
37-
}
38-
3949
check {
40-
dependsOn(testStableSemconv)
50+
dependsOn(testing.suites.named("testStableSemconv"))
4151
}
4252
}

‎instrumentation/lettuce/lettuce-5.1/javaagent/build.gradle.kts‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,27 @@ dependencies {
2323
testInstrumentation(project(":instrumentation:reactor:reactor-3.1:javaagent"))
2424
}
2525

26+
testing {
27+
suites {
28+
val testStableSemconv by registering(JvmTestSuite::class) {
29+
targets {
30+
all {
31+
testTask.configure {
32+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
33+
}
34+
}
35+
}
36+
}
37+
}
38+
}
39+
2640
tasks {
2741
withType<Test>().configureEach {
2842
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
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/lettuce/lettuce-5.1/library/build.gradle.kts‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,27 @@ dependencies {
1212
testImplementation(project(":instrumentation:reactor:reactor-3.1:library"))
1313
}
1414

15+
testing {
16+
suites {
17+
val testStableSemconv by registering(JvmTestSuite::class) {
18+
targets {
19+
all {
20+
testTask.configure {
21+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
22+
}
23+
}
24+
}
25+
}
26+
}
27+
}
28+
1529
tasks {
1630
withType<Test>().configureEach {
1731
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
1832
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
1933
}
2034

21-
val testStableSemconv by registering(Test::class) {
22-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
23-
}
24-
2535
check {
26-
dependsOn(testStableSemconv)
36+
dependsOn(testing.suites.named("testStableSemconv"))
2737
}
2838
}

‎instrumentation/oshi/javaagent/build.gradle.kts‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,28 @@ dependencies {
2222
testImplementation(project(":instrumentation:oshi:testing"))
2323
}
2424

25+
testing {
26+
suites {
27+
val testExperimental by registering(JvmTestSuite::class) {
28+
targets {
29+
all {
30+
testTask.configure {
31+
jvmArgs("-Dotel.instrumentation.oshi.experimental-metrics.enabled=true")
32+
systemProperty("testExperimental", "true")
33+
systemProperty("metadataConfig", "otel.instrumentation.oshi.experimental-metrics.enabled=true")
34+
}
35+
}
36+
}
37+
}
38+
}
39+
}
40+
2541
tasks {
2642
withType<Test>().configureEach {
2743
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
2844
}
2945

30-
val testExperimental by registering(Test::class) {
31-
jvmArgs("-Dotel.instrumentation.oshi.experimental-metrics.enabled=true")
32-
systemProperty("testExperimental", "true")
33-
systemProperty("metadataConfig", "otel.instrumentation.oshi.experimental-metrics.enabled=true")
34-
}
35-
3646
check {
37-
dependsOn(testExperimental)
47+
dependsOn(testing.suites.named("testExperimental"))
3848
}
3949
}

‎instrumentation/tomcat/tomcat-jdbc/javaagent/build.gradle.kts‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,28 @@ dependencies {
1818

1919
val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false"
2020

21-
tasks {
22-
val testStableSemconv by registering(Test::class) {
23-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
24-
25-
systemProperty("collectMetadata", collectMetadata)
26-
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
21+
testing {
22+
suites {
23+
val testStableSemconv by registering(JvmTestSuite::class) {
24+
targets {
25+
all {
26+
testTask.configure {
27+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
28+
systemProperty("collectMetadata", collectMetadata)
29+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
30+
}
31+
}
32+
}
33+
}
2734
}
35+
}
2836

37+
tasks {
2938
test {
3039
systemProperty("collectMetadata", collectMetadata)
3140
}
3241

3342
check {
34-
dependsOn(testStableSemconv)
43+
dependsOn(testing.suites.named("testStableSemconv"))
3544
}
3645
}

‎instrumentation/vertx/vertx-redis-client-4.0/javaagent/build.gradle.kts‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,29 @@ dependencies {
2222

2323
val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false"
2424

25+
testing {
26+
suites {
27+
val testStableSemconv by registering(JvmTestSuite::class) {
28+
targets {
29+
all {
30+
testTask.configure {
31+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
32+
systemProperty("collectMetadata", collectMetadata)
33+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
34+
}
35+
}
36+
}
37+
}
38+
}
39+
}
40+
2541
tasks {
2642
withType<Test>().configureEach {
2743
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
2844
systemProperty("collectMetadata", collectMetadata)
2945
}
3046

31-
val testStableSemconv by registering(Test::class) {
32-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
33-
34-
systemProperty("collectMetadata", collectMetadata)
35-
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
36-
}
37-
3847
check {
39-
dependsOn(testStableSemconv)
48+
dependsOn(testing.suites.named("testStableSemconv"))
4049
}
4150
}

0 commit comments

Comments
 (0)