Skip to content

Commit 9a3eabc

Browse files
jaydelucajaydeluca
committed
batch 7
1 parent 7b03ed5 commit 9a3eabc

File tree

9 files changed

+197
-99
lines changed

9 files changed

+197
-99
lines changed

‎instrumentation/logback/logback-appender-1.0/library/build.gradle.kts‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -121,23 +121,33 @@ testing {
121121
}
122122
}
123123
}
124-
}
125-
}
126124

127-
tasks {
125+
val testStableSemconv by registering(JvmTestSuite::class) {
126+
targets {
127+
all {
128+
testTask.configure {
129+
jvmArgs("-Dotel.semconv-stability.opt-in=code")
130+
}
131+
}
132+
}
133+
}
128134

129-
val testStableSemconv by registering(Test::class) {
130-
jvmArgs("-Dotel.semconv-stability.opt-in=code")
135+
val testBothSemconv by registering(JvmTestSuite::class) {
136+
targets {
137+
all {
138+
testTask.configure {
139+
jvmArgs("-Dotel.semconv-stability.opt-in=code/dup")
140+
}
141+
}
142+
}
143+
}
131144
}
145+
}
132146

133-
val testBothSemconv by registering(Test::class) {
134-
jvmArgs("-Dotel.semconv-stability.opt-in=code/dup")
135-
}
147+
tasks {
136148

137149
check {
138150
dependsOn(testing.suites)
139-
dependsOn(testStableSemconv)
140-
dependsOn(testBothSemconv)
141151
}
142152
}
143153

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

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,27 @@ dependencies {
3535
latestDepTestLibrary("io.netty:netty-codec-http:4.0.+") // see netty-4.1 module
3636
}
3737

38-
tasks {
39-
val testConnectionSpan by registering(Test::class) {
40-
filter {
41-
includeTestsMatching("Netty40ConnectionSpanTest")
42-
includeTestsMatching("Netty40ClientSslTest")
38+
testing {
39+
suites {
40+
val testConnectionSpan by registering(JvmTestSuite::class) {
41+
targets {
42+
all {
43+
testTask.configure {
44+
filter {
45+
includeTestsMatching("Netty40ConnectionSpanTest")
46+
includeTestsMatching("Netty40ClientSslTest")
47+
}
48+
include("**/Netty40ConnectionSpanTest.*", "**/Netty40ClientSslTest.*")
49+
jvmArgs("-Dotel.instrumentation.netty.connection-telemetry.enabled=true")
50+
jvmArgs("-Dotel.instrumentation.netty.ssl-telemetry.enabled=true")
51+
}
52+
}
53+
}
4354
}
44-
include("**/Netty40ConnectionSpanTest.*", "**/Netty40ClientSslTest.*")
45-
46-
jvmArgs("-Dotel.instrumentation.netty.connection-telemetry.enabled=true")
47-
jvmArgs("-Dotel.instrumentation.netty.ssl-telemetry.enabled=true")
4855
}
56+
}
4957

58+
tasks {
5059
test {
5160
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
5261

@@ -57,7 +66,7 @@ tasks {
5766
}
5867

5968
check {
60-
dependsOn(testConnectionSpan)
69+
dependsOn(testing.suites.named("testConnectionSpan"))
6170
}
6271
}
6372

‎instrumentation/netty/netty-4.1/javaagent/build.gradle.kts‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,27 @@ dependencies {
4242
testCompileOnly("io.netty:netty-transport-native-kqueue:4.1.11.Final:osx-x86_64")
4343
}
4444

45-
tasks {
46-
val testConnectionSpan by registering(Test::class) {
47-
filter {
48-
includeTestsMatching("Netty41ConnectionSpanTest")
49-
includeTestsMatching("Netty41ClientSslTest")
45+
testing {
46+
suites {
47+
val testConnectionSpan by registering(JvmTestSuite::class) {
48+
targets {
49+
all {
50+
testTask.configure {
51+
filter {
52+
includeTestsMatching("Netty41ConnectionSpanTest")
53+
includeTestsMatching("Netty41ClientSslTest")
54+
}
55+
include("**/Netty41ConnectionSpanTest.*", "**/Netty41ClientSslTest.*")
56+
jvmArgs("-Dotel.instrumentation.netty.connection-telemetry.enabled=true")
57+
jvmArgs("-Dotel.instrumentation.netty.ssl-telemetry.enabled=true")
58+
}
59+
}
60+
}
5061
}
51-
include("**/Netty41ConnectionSpanTest.*", "**/Netty41ClientSslTest.*")
52-
53-
jvmArgs("-Dotel.instrumentation.netty.connection-telemetry.enabled=true")
54-
jvmArgs("-Dotel.instrumentation.netty.ssl-telemetry.enabled=true")
5562
}
63+
}
5664

65+
tasks {
5766
test {
5867
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
5968
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
@@ -65,7 +74,7 @@ tasks {
6574
}
6675

6776
check {
68-
dependsOn(testConnectionSpan)
77+
dependsOn(testing.suites.named("testConnectionSpan"))
6978
}
7079
}
7180

‎instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,22 +53,32 @@ testing {
5353
implementation("io.projectreactor:reactor-test:$version")
5454
}
5555
}
56-
}
57-
}
5856

59-
tasks {
57+
val testStableSemconv by registering(JvmTestSuite::class) {
58+
targets {
59+
all {
60+
testTask.configure {
61+
jvmArgs("-Dotel.semconv-stability.opt-in=code")
62+
}
63+
}
64+
}
65+
}
6066

61-
val testStableSemconv by registering(Test::class) {
62-
jvmArgs("-Dotel.semconv-stability.opt-in=code")
67+
val testBothSemconv by registering(JvmTestSuite::class) {
68+
targets {
69+
all {
70+
testTask.configure {
71+
jvmArgs("-Dotel.semconv-stability.opt-in=code/dup")
72+
}
73+
}
74+
}
75+
}
6376
}
77+
}
6478

65-
val testBothSemconv by registering(Test::class) {
66-
jvmArgs("-Dotel.semconv-stability.opt-in=code/dup")
67-
}
79+
tasks {
6880

6981
check {
7082
dependsOn(testing.suites)
71-
dependsOn(testStableSemconv)
72-
dependsOn(testBothSemconv)
7383
}
7484
}

‎instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,26 @@ dependencies {
3131
latestDepTestLibrary("io.projectreactor.netty:reactor-netty:0.+") // see reactor-netty-1.0 modules
3232
}
3333

34-
tasks {
35-
val testConnectionSpan by registering(Test::class) {
36-
filter {
37-
includeTestsMatching("ReactorNettyConnectionSpanTest")
34+
testing {
35+
suites {
36+
val testConnectionSpan by registering(JvmTestSuite::class) {
37+
targets {
38+
all {
39+
testTask.configure {
40+
filter {
41+
includeTestsMatching("ReactorNettyConnectionSpanTest")
42+
}
43+
include("**/ReactorNettyConnectionSpanTest.*")
44+
jvmArgs("-Dotel.instrumentation.netty.connection-telemetry.enabled=true")
45+
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
46+
}
47+
}
48+
}
3849
}
39-
include("**/ReactorNettyConnectionSpanTest.*")
40-
jvmArgs("-Dotel.instrumentation.netty.connection-telemetry.enabled=true")
41-
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
4250
}
51+
}
4352

53+
tasks {
4454
test {
4555
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
4656

@@ -50,6 +60,6 @@ tasks {
5060
}
5161

5262
check {
53-
dependsOn(testConnectionSpan)
63+
dependsOn(testing.suites.named("testConnectionSpan"))
5464
}
5565
}

‎instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,28 @@ dependencies {
4343
testImplementation(project(":instrumentation-annotations"))
4444
}
4545

46-
tasks {
47-
val testConnectionSpan by registering(Test::class) {
48-
filter {
49-
includeTestsMatching("ReactorNettyConnectionSpanTest")
50-
includeTestsMatching("ReactorNettyClientSslTest")
46+
testing {
47+
suites {
48+
val testConnectionSpan by registering(JvmTestSuite::class) {
49+
targets {
50+
all {
51+
testTask.configure {
52+
filter {
53+
includeTestsMatching("ReactorNettyConnectionSpanTest")
54+
includeTestsMatching("ReactorNettyClientSslTest")
55+
}
56+
include("**/ReactorNettyConnectionSpanTest.*", "**/ReactorNettyClientSslTest.*")
57+
jvmArgs("-Dotel.instrumentation.netty.ssl-telemetry.enabled=true")
58+
jvmArgs("-Dotel.instrumentation.reactor-netty.connection-telemetry.enabled=true")
59+
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
60+
}
61+
}
62+
}
5163
}
52-
include("**/ReactorNettyConnectionSpanTest.*", "**/ReactorNettyClientSslTest.*")
53-
jvmArgs("-Dotel.instrumentation.netty.ssl-telemetry.enabled=true")
54-
jvmArgs("-Dotel.instrumentation.reactor-netty.connection-telemetry.enabled=true")
55-
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
5664
}
65+
}
5766

67+
tasks {
5868
test {
5969
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
6070

@@ -65,6 +75,6 @@ tasks {
6575
}
6676

6777
check {
68-
dependsOn(testConnectionSpan)
78+
dependsOn(testing.suites.named("testConnectionSpan"))
6979
}
7080
}

‎instrumentation/runtime-telemetry/runtime-telemetry-java17/library/build.gradle.kts‎

Lines changed: 49 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,52 @@ dependencies {
1111
testImplementation("io.github.netmikey.logunit:logunit-jul:1.1.3")
1212
}
1313

14+
testing {
15+
suites {
16+
val testG1 by registering(JvmTestSuite::class) {
17+
targets {
18+
all {
19+
testTask.configure {
20+
filter {
21+
includeTestsMatching("*G1GcMemoryMetricTest*")
22+
}
23+
include("**/*G1GcMemoryMetricTest.*")
24+
jvmArgs("-XX:+UseG1GC")
25+
}
26+
}
27+
}
28+
}
29+
30+
val testPS by registering(JvmTestSuite::class) {
31+
targets {
32+
all {
33+
testTask.configure {
34+
filter {
35+
includeTestsMatching("*PsGcMemoryMetricTest*")
36+
}
37+
include("**/*PsGcMemoryMetricTest.*")
38+
jvmArgs("-XX:+UseParallelGC")
39+
}
40+
}
41+
}
42+
}
43+
44+
val testSerial by registering(JvmTestSuite::class) {
45+
targets {
46+
all {
47+
testTask.configure {
48+
filter {
49+
includeTestsMatching("*SerialGcMemoryMetricTest*")
50+
}
51+
include("**/*SerialGcMemoryMetricTest.*")
52+
jvmArgs("-XX:+UseSerialGC")
53+
}
54+
}
55+
}
56+
}
57+
}
58+
}
59+
1460
tasks.register("generateDocs", JavaExec::class) {
1561
group = "build"
1662
description = "Generate table for README.md"
@@ -20,30 +66,6 @@ tasks.register("generateDocs", JavaExec::class) {
2066
}
2167

2268
tasks {
23-
val testG1 by registering(Test::class) {
24-
filter {
25-
includeTestsMatching("*G1GcMemoryMetricTest*")
26-
}
27-
include("**/*G1GcMemoryMetricTest.*")
28-
jvmArgs("-XX:+UseG1GC")
29-
}
30-
31-
val testPS by registering(Test::class) {
32-
filter {
33-
includeTestsMatching("*PsGcMemoryMetricTest*")
34-
}
35-
include("**/*PsGcMemoryMetricTest.*")
36-
jvmArgs("-XX:+UseParallelGC")
37-
}
38-
39-
val testSerial by registering(Test::class) {
40-
filter {
41-
includeTestsMatching("*SerialGcMemoryMetricTest*")
42-
}
43-
include("**/*SerialGcMemoryMetricTest.*")
44-
jvmArgs("-XX:+UseSerialGC")
45-
}
46-
4769
test {
4870
filter {
4971
excludeTestsMatching("*G1GcMemoryMetricTest")
@@ -53,9 +75,9 @@ tasks {
5375
}
5476

5577
check {
56-
dependsOn(testG1)
57-
dependsOn(testPS)
58-
dependsOn(testSerial)
78+
dependsOn(testing.suites.named("testG1"))
79+
dependsOn(testing.suites.named("testPS"))
80+
dependsOn(testing.suites.named("testSerial"))
5981
}
6082

6183
compileJava {

0 commit comments

Comments
 (0)