Skip to content

Commit 9536144

Browse files
jaydelucajaydeluca
committed
the rest
1 parent caf0169 commit 9536144

File tree

51 files changed

+549
-993
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+549
-993
lines changed

‎instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/build.gradle.kts‎

Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,37 +25,6 @@ dependencies {
2525
testImplementation(project(":instrumentation:kafka:kafka-clients:kafka-clients-0.11:testing"))
2626
}
2727

28-
testing {
29-
suites {
30-
val testPropagationDisabled by registering(JvmTestSuite::class) {
31-
targets {
32-
all {
33-
testTask.configure {
34-
filter {
35-
includeTestsMatching("KafkaClientPropagationDisabledTest")
36-
}
37-
include("**/KafkaClientPropagationDisabledTest.*")
38-
jvmArgs("-Dotel.instrumentation.kafka.producer-propagation.enabled=false")
39-
}
40-
}
41-
}
42-
}
43-
44-
val testReceiveSpansDisabled by registering(JvmTestSuite::class) {
45-
targets {
46-
all {
47-
testTask.configure {
48-
filter {
49-
includeTestsMatching("KafkaClientSuppressReceiveSpansTest")
50-
}
51-
include("**/KafkaClientSuppressReceiveSpansTest.*")
52-
}
53-
}
54-
}
55-
}
56-
}
57-
}
58-
5928
tasks {
6029
withType<Test>().configureEach {
6130
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
@@ -66,6 +35,25 @@ tasks {
6635
jvmArgs("-Dotel.instrumentation.kafka.experimental-span-attributes=true")
6736
}
6837

38+
val testPropagationDisabled by registering(Test::class) {
39+
testClassesDirs = sourceSets.test.get().output.classesDirs
40+
classpath = sourceSets.test.get().runtimeClasspath
41+
filter {
42+
includeTestsMatching("KafkaClientPropagationDisabledTest")
43+
}
44+
include("**/KafkaClientPropagationDisabledTest.*")
45+
jvmArgs("-Dotel.instrumentation.kafka.producer-propagation.enabled=false")
46+
}
47+
48+
val testReceiveSpansDisabled by registering(Test::class) {
49+
testClassesDirs = sourceSets.test.get().output.classesDirs
50+
classpath = sourceSets.test.get().runtimeClasspath
51+
filter {
52+
includeTestsMatching("KafkaClientSuppressReceiveSpansTest")
53+
}
54+
include("**/KafkaClientSuppressReceiveSpansTest.*")
55+
}
56+
6957
test {
7058
filter {
7159
excludeTestsMatching("KafkaClientPropagationDisabledTest")
@@ -75,6 +63,6 @@ tasks {
7563
}
7664

7765
check {
78-
dependsOn(testing.suites)
66+
dependsOn(testPropagationDisabled, testReceiveSpansDisabled)
7967
}
8068
}

‎instrumentation/kafka/kafka-streams-0.11/javaagent/build.gradle.kts‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,6 @@ dependencies {
2323
testImplementation("org.testcontainers:kafka")
2424
}
2525

26-
testing {
27-
suites {
28-
val testReceiveSpansDisabled by registering(JvmTestSuite::class) {
29-
targets {
30-
all {
31-
testTask.configure {
32-
filter {
33-
includeTestsMatching("KafkaStreamsSuppressReceiveSpansTest")
34-
}
35-
include("**/KafkaStreamsSuppressReceiveSpansTest.*")
36-
}
37-
}
38-
}
39-
}
40-
}
41-
}
42-
4326
tasks {
4427
withType<Test>().configureEach {
4528
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
@@ -50,6 +33,15 @@ tasks {
5033
jvmArgs("-Dotel.instrumentation.kafka.experimental-span-attributes=true")
5134
}
5235

36+
val testReceiveSpansDisabled by registering(Test::class) {
37+
testClassesDirs = sourceSets.test.get().output.classesDirs
38+
classpath = sourceSets.test.get().runtimeClasspath
39+
filter {
40+
includeTestsMatching("KafkaStreamsSuppressReceiveSpansTest")
41+
}
42+
include("**/KafkaStreamsSuppressReceiveSpansTest.*")
43+
}
44+
5345
test {
5446
filter {
5547
excludeTestsMatching("KafkaStreamsSuppressReceiveSpansTest")
@@ -58,6 +50,6 @@ tasks {
5850
}
5951

6052
check {
61-
dependsOn(testing.suites)
53+
dependsOn(testReceiveSpansDisabled)
6254
}
6355
}

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

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,6 @@ 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-
3420
tasks {
3521
withType<Test>().configureEach {
3622
// TODO run tests both with and without experimental span attributes
@@ -39,7 +25,13 @@ tasks {
3925
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
4026
}
4127

28+
val testStableSemconv by registering(Test::class) {
29+
testClassesDirs = sourceSets.test.get().output.classesDirs
30+
classpath = sourceSets.test.get().runtimeClasspath
31+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
32+
}
33+
4234
check {
43-
dependsOn(testing.suites)
35+
dependsOn(testStableSemconv)
4436
}
4537
}

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

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,6 @@ 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-
4127
tasks {
4228
withType<Test>().configureEach {
4329
// TODO run tests both with and without experimental span attributes
@@ -46,7 +32,13 @@ tasks {
4632
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
4733
}
4834

35+
val testStableSemconv by registering(Test::class) {
36+
testClassesDirs = sourceSets.test.get().output.classesDirs
37+
classpath = sourceSets.test.get().runtimeClasspath
38+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
39+
}
40+
4941
check {
50-
dependsOn(testing.suites)
42+
dependsOn(testStableSemconv)
5143
}
5244
}

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

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,19 @@ 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-
4026
tasks {
4127
withType<Test>().configureEach {
4228
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
4329
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
4430
}
4531

32+
val testStableSemconv by registering(Test::class) {
33+
testClassesDirs = sourceSets.test.get().output.classesDirs
34+
classpath = sourceSets.test.get().runtimeClasspath
35+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
36+
}
37+
4638
check {
47-
dependsOn(testing.suites)
39+
dependsOn(testStableSemconv)
4840
}
4941
}

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

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,19 @@ 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-
2915
tasks {
3016
withType<Test>().configureEach {
3117
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
3218
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
3319
}
3420

21+
val testStableSemconv by registering(Test::class) {
22+
testClassesDirs = sourceSets.test.get().output.classesDirs
23+
classpath = sourceSets.test.get().runtimeClasspath
24+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
25+
}
26+
3527
check {
36-
dependsOn(testing.suites)
28+
dependsOn(testStableSemconv)
3729
}
3830
}

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

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

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-
}
48+
tasks {
49+
val testAsync by registering(Test::class) {
50+
testClassesDirs = sourceSets.test.get().output.classesDirs
51+
classpath = sourceSets.test.get().runtimeClasspath
52+
jvmArgs("-DLog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector")
5953
}
60-
}
6154

62-
tasks {
6355
check {
64-
dependsOn(testing.suites)
56+
dependsOn(testAsync)
6557
}
6658
}
6759

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

Lines changed: 19 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -17,47 +17,31 @@ dependencies {
1717
}
1818
}
1919

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-
}
31-
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-
}
41-
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-
}
51-
}
52-
}
53-
5420
tasks {
5521
withType<Test>().configureEach {
5622
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
5723
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
5824
}
5925

26+
val testAsyncLogger by registering(Test::class) {
27+
testClassesDirs = sourceSets.test.get().output.classesDirs
28+
classpath = sourceSets.test.get().runtimeClasspath
29+
jvmArgs("-DLog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector")
30+
}
31+
32+
val testStableSemconv by registering(Test::class) {
33+
testClassesDirs = sourceSets.test.get().output.classesDirs
34+
classpath = sourceSets.test.get().runtimeClasspath
35+
jvmArgs("-Dotel.semconv-stability.opt-in=code")
36+
}
37+
38+
val testBothSemconv by registering(Test::class) {
39+
testClassesDirs = sourceSets.test.get().output.classesDirs
40+
classpath = sourceSets.test.get().runtimeClasspath
41+
jvmArgs("-Dotel.semconv-stability.opt-in=code/dup")
42+
}
43+
6044
check {
61-
dependsOn(testing.suites)
45+
dependsOn(testAsyncLogger, testStableSemconv, testBothSemconv)
6246
}
6347
}

0 commit comments

Comments
 (0)