Skip to content

Commit 130e72b

Browse files
jaydelucajaydeluca
committed
batch 9
1 parent 7b13a3b commit 130e72b

File tree

10 files changed

+231
-100
lines changed

10 files changed

+231
-100
lines changed

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,16 @@ testing {
3535
implementation(project(":instrumentation:jedis:jedis-1.4:testing"))
3636
}
3737
}
38+
39+
val testStableSemconv by registering(JvmTestSuite::class) {
40+
targets {
41+
all {
42+
testTask.configure {
43+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
44+
}
45+
}
46+
}
47+
}
3848
}
3949
}
4050

@@ -43,12 +53,7 @@ tasks {
4353
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
4454
}
4555

46-
val testStableSemconv by registering(Test::class) {
47-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
48-
}
49-
5056
check {
5157
dependsOn(testing.suites)
52-
dependsOn(testStableSemconv)
5358
}
5459
}

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,26 @@ dependencies {
2828
latestDepTestLibrary("redis.clients:jedis:3.+") // see jedis-4.0 module
2929
}
3030

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

36-
val testStableSemconv by registering(Test::class) {
37-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
38-
}
39-
4050
check {
41-
dependsOn(testStableSemconv)
51+
dependsOn(testing.suites.named("testStableSemconv"))
4252
}
4353
}

‎instrumentation/log4j/log4j-appender-2.17/javaagent/build.gradle.kts‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,23 @@ tasks.withType<Test>().configureEach {
4545
systemProperty("testLatestDeps", testLatestDeps)
4646
}
4747

48-
tasks {
49-
val testAsync by registering(Test::class) {
50-
jvmArgs("-DLog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector")
48+
testing {
49+
suites {
50+
val testAsync by registering(JvmTestSuite::class) {
51+
targets {
52+
all {
53+
testTask.configure {
54+
jvmArgs("-DLog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector")
55+
}
56+
}
57+
}
58+
}
5159
}
60+
}
5261

62+
tasks {
5363
check {
54-
dependsOn(testAsync)
64+
dependsOn(testing.suites.named("testAsync"))
5565
}
5666
}
5767

‎instrumentation/log4j/log4j-appender-2.17/library/build.gradle.kts‎

Lines changed: 37 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,49 @@ dependencies {
1717
}
1818
}
1919

20-
tasks {
21-
withType<Test>().configureEach {
22-
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
23-
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
24-
}
20+
testing {
21+
suites {
22+
val testAsyncLogger by registering(JvmTestSuite::class) {
23+
targets {
24+
all {
25+
testTask.configure {
26+
jvmArgs("-DLog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector")
27+
}
28+
}
29+
}
30+
}
2531

26-
val testAsyncLogger by registering(Test::class) {
27-
jvmArgs("-DLog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector")
28-
}
32+
val testStableSemconv by registering(JvmTestSuite::class) {
33+
targets {
34+
all {
35+
testTask.configure {
36+
jvmArgs("-Dotel.semconv-stability.opt-in=code")
37+
}
38+
}
39+
}
40+
}
2941

30-
val testStableSemconv by registering(Test::class) {
31-
jvmArgs("-Dotel.semconv-stability.opt-in=code")
42+
val testBothSemconv by registering(JvmTestSuite::class) {
43+
targets {
44+
all {
45+
testTask.configure {
46+
jvmArgs("-Dotel.semconv-stability.opt-in=code/dup")
47+
}
48+
}
49+
}
50+
}
3251
}
52+
}
3353

34-
val testBothSemconv by registering(Test::class) {
35-
jvmArgs("-Dotel.semconv-stability.opt-in=code/dup")
54+
tasks {
55+
withType<Test>().configureEach {
56+
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
57+
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
3658
}
3759

3860
check {
39-
dependsOn(testAsyncLogger)
40-
dependsOn(testStableSemconv)
41-
dependsOn(testBothSemconv)
61+
dependsOn(testing.suites.named("testAsyncLogger"))
62+
dependsOn(testing.suites.named("testStableSemconv"))
63+
dependsOn(testing.suites.named("testBothSemconv"))
4264
}
4365
}

‎instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/library-autoconfigure/build.gradle.kts‎

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,48 @@ dependencies {
1111
testImplementation(project(":instrumentation:log4j:log4j-context-data:log4j-context-data-common:testing"))
1212
}
1313

14-
tasks {
15-
test {
16-
filter {
17-
excludeTestsMatching("LibraryLog4j2BaggageTest")
18-
excludeTestsMatching("LibraryLog4j2LoggingKeysTest")
14+
testing {
15+
suites {
16+
val testAddBaggage by registering(JvmTestSuite::class) {
17+
targets {
18+
all {
19+
testTask.configure {
20+
filter {
21+
includeTestsMatching("LibraryLog4j2BaggageTest")
22+
}
23+
jvmArgs("-Dotel.instrumentation.log4j-context-data.add-baggage=true")
24+
}
25+
}
26+
}
1927
}
20-
}
2128

22-
val testAddBaggage by registering(Test::class) {
23-
filter {
24-
includeTestsMatching("LibraryLog4j2BaggageTest")
29+
val testLoggingKeys by registering(JvmTestSuite::class) {
30+
targets {
31+
all {
32+
testTask.configure {
33+
filter {
34+
includeTestsMatching("LibraryLog4j2LoggingKeysTest")
35+
}
36+
jvmArgs("-Dotel.instrumentation.common.logging.trace-id=trace_id_test")
37+
jvmArgs("-Dotel.instrumentation.common.logging.span-id=span_id_test")
38+
jvmArgs("-Dotel.instrumentation.common.logging.trace-flags=trace_flags_test")
39+
}
40+
}
41+
}
2542
}
26-
jvmArgs("-Dotel.instrumentation.log4j-context-data.add-baggage=true")
2743
}
44+
}
2845

29-
val testLoggingKeys by registering(Test::class) {
46+
tasks {
47+
test {
3048
filter {
31-
includeTestsMatching("LibraryLog4j2LoggingKeysTest")
49+
excludeTestsMatching("LibraryLog4j2BaggageTest")
50+
excludeTestsMatching("LibraryLog4j2LoggingKeysTest")
3251
}
33-
jvmArgs("-Dotel.instrumentation.common.logging.trace-id=trace_id_test")
34-
jvmArgs("-Dotel.instrumentation.common.logging.span-id=span_id_test")
35-
jvmArgs("-Dotel.instrumentation.common.logging.trace-flags=trace_flags_test")
3652
}
3753

3854
named("check") {
39-
dependsOn(testAddBaggage)
40-
dependsOn(testLoggingKeys)
55+
dependsOn(testing.suites.named("testAddBaggage"))
56+
dependsOn(testing.suites.named("testLoggingKeys"))
4157
}
4258
}

‎instrumentation/log4j/log4j-context-data/log4j-context-data-2.7/javaagent/build.gradle.kts‎

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,33 +21,49 @@ dependencies {
2121
latestDepTestLibrary("org.apache.logging.log4j:log4j-core:2.16.+") // see log4j-context-data-2.17 module
2222
}
2323

24-
tasks {
25-
test {
26-
filter {
27-
excludeTestsMatching("Log4j27BaggageTest")
28-
excludeTestsMatching("Log4j27LoggingKeysTest")
24+
testing {
25+
suites {
26+
val testAddBaggage by registering(JvmTestSuite::class) {
27+
targets {
28+
all {
29+
testTask.configure {
30+
filter {
31+
includeTestsMatching("Log4j27BaggageTest")
32+
}
33+
jvmArgs("-Dotel.instrumentation.log4j-context-data.add-baggage=true")
34+
}
35+
}
36+
}
2937
}
30-
jvmArgs("-Dotel.instrumentation.common.mdc.resource-attributes=service.name,telemetry.sdk.language")
31-
}
3238

33-
val testAddBaggage by registering(Test::class) {
34-
filter {
35-
includeTestsMatching("Log4j27BaggageTest")
39+
val testLoggingKeys by registering(JvmTestSuite::class) {
40+
targets {
41+
all {
42+
testTask.configure {
43+
filter {
44+
includeTestsMatching("Log4j27LoggingKeysTest")
45+
}
46+
jvmArgs("-Dotel.instrumentation.common.logging.trace-id=trace_id_test")
47+
jvmArgs("-Dotel.instrumentation.common.logging.span-id=span_id_test")
48+
jvmArgs("-Dotel.instrumentation.common.logging.trace-flags=trace_flags_test")
49+
}
50+
}
51+
}
3652
}
37-
jvmArgs("-Dotel.instrumentation.log4j-context-data.add-baggage=true")
3853
}
54+
}
3955

40-
val testLoggingKeys by registering(Test::class) {
56+
tasks {
57+
test {
4158
filter {
42-
includeTestsMatching("Log4j27LoggingKeysTest")
59+
excludeTestsMatching("Log4j27BaggageTest")
60+
excludeTestsMatching("Log4j27LoggingKeysTest")
4361
}
44-
jvmArgs("-Dotel.instrumentation.common.logging.trace-id=trace_id_test")
45-
jvmArgs("-Dotel.instrumentation.common.logging.span-id=span_id_test")
46-
jvmArgs("-Dotel.instrumentation.common.logging.trace-flags=trace_flags_test")
62+
jvmArgs("-Dotel.instrumentation.common.mdc.resource-attributes=service.name,telemetry.sdk.language")
4763
}
4864

4965
named("check") {
50-
dependsOn(testAddBaggage)
51-
dependsOn(testLoggingKeys)
66+
dependsOn(testing.suites.named("testAddBaggage"))
67+
dependsOn(testing.suites.named("testLoggingKeys"))
5268
}
5369
}

‎instrumentation/micrometer/micrometer-1.5/javaagent/build.gradle.kts‎

Lines changed: 43 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,53 @@ dependencies {
1919
testImplementation(project(":instrumentation:micrometer:micrometer-1.5:testing"))
2020
}
2121

22-
tasks {
23-
val testPrometheusMode by registering(Test::class) {
24-
filter {
25-
includeTestsMatching("*PrometheusModeTest")
22+
testing {
23+
suites {
24+
val testPrometheusMode by registering(JvmTestSuite::class) {
25+
targets {
26+
all {
27+
testTask.configure {
28+
filter {
29+
includeTestsMatching("*PrometheusModeTest")
30+
}
31+
include("**/*PrometheusModeTest.*")
32+
jvmArgs("-Dotel.instrumentation.micrometer.prometheus-mode.enabled=true")
33+
}
34+
}
35+
}
2636
}
27-
include("**/*PrometheusModeTest.*")
28-
jvmArgs("-Dotel.instrumentation.micrometer.prometheus-mode.enabled=true")
29-
}
3037

31-
val testBaseTimeUnit by registering(Test::class) {
32-
filter {
33-
includeTestsMatching("*TimerMillisecondsTest")
38+
val testBaseTimeUnit by registering(JvmTestSuite::class) {
39+
targets {
40+
all {
41+
testTask.configure {
42+
filter {
43+
includeTestsMatching("*TimerMillisecondsTest")
44+
}
45+
include("**/*TimerMillisecondsTest.*")
46+
jvmArgs("-Dotel.instrumentation.micrometer.base-time-unit=milliseconds")
47+
}
48+
}
49+
}
3450
}
35-
include("**/*TimerMillisecondsTest.*")
36-
jvmArgs("-Dotel.instrumentation.micrometer.base-time-unit=milliseconds")
37-
}
3851

39-
val testHistogramGauges by registering(Test::class) {
40-
filter {
41-
includeTestsMatching("*HistogramGaugesTest")
52+
val testHistogramGauges by registering(JvmTestSuite::class) {
53+
targets {
54+
all {
55+
testTask.configure {
56+
filter {
57+
includeTestsMatching("*HistogramGaugesTest")
58+
}
59+
include("**/*HistogramGaugesTest.*")
60+
jvmArgs("-Dotel.instrumentation.micrometer.histogram-gauges.enabled=true")
61+
}
62+
}
63+
}
4264
}
43-
include("**/*HistogramGaugesTest.*")
44-
jvmArgs("-Dotel.instrumentation.micrometer.histogram-gauges.enabled=true")
4565
}
66+
}
4667

68+
tasks {
4769
test {
4870
filter {
4971
excludeTestsMatching("*TimerMillisecondsTest")
@@ -53,9 +75,9 @@ tasks {
5375
}
5476

5577
check {
56-
dependsOn(testBaseTimeUnit)
57-
dependsOn(testPrometheusMode)
58-
dependsOn(testHistogramGauges)
78+
dependsOn(testing.suites.named("testBaseTimeUnit"))
79+
dependsOn(testing.suites.named("testPrometheusMode"))
80+
dependsOn(testing.suites.named("testHistogramGauges"))
5981
}
6082

6183
withType<Test>().configureEach {

0 commit comments

Comments
 (0)