Skip to content

Commit 7b03ed5

Browse files
jaydelucajaydeluca
committed
batch 6
1 parent c357876 commit 7b03ed5

File tree

10 files changed

+197
-86
lines changed

10 files changed

+197
-86
lines changed

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

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,28 @@ dependencies {
4040
// Requires old Guava. Can't use enforcedPlatform since predates BOM
4141
configurations.testRuntimeClasspath.get().resolutionStrategy.force("com.google.guava:guava:19.0")
4242

43+
testing {
44+
suites {
45+
val testStableSemconv by registering(JvmTestSuite::class) {
46+
targets {
47+
all {
48+
testTask.configure {
49+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
50+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
51+
}
52+
}
53+
}
54+
}
55+
}
56+
}
57+
4358
tasks {
4459
withType<Test>().configureEach {
4560
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
4661
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
4762
}
4863

49-
val testStableSemconv by registering(Test::class) {
50-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
51-
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
52-
}
53-
5464
check {
55-
dependsOn(testStableSemconv)
65+
dependsOn(testing.suites.named("testStableSemconv"))
5666
}
5767
}

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

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,28 @@ dependencies {
2323
testInstrumentation(project(":instrumentation:cassandra:cassandra-4.4: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+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
34+
}
35+
}
36+
}
37+
}
38+
}
39+
}
40+
2641
tasks {
2742
withType<Test>().configureEach {
2843
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
2944
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
3045
}
3146

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

‎instrumentation/cassandra/cassandra-4.4/javaagent/build.gradle.kts‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,28 @@ dependencies {
2626
testInstrumentation(project(":instrumentation:cassandra:cassandra-4.0:javaagent"))
2727
}
2828

29+
testing {
30+
suites {
31+
val testStableSemconv by registering(JvmTestSuite::class) {
32+
targets {
33+
all {
34+
testTask.configure {
35+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
36+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
37+
}
38+
}
39+
}
40+
}
41+
}
42+
}
43+
2944
tasks {
3045
withType<Test>().configureEach {
3146
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
3247
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
3348
}
3449

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

‎instrumentation/cassandra/cassandra-4.4/library/build.gradle.kts‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,26 @@ dependencies {
1111
testImplementation(project(":instrumentation:cassandra:cassandra-4.4:testing"))
1212
}
1313

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

19-
val testStableSemconv by registering(Test::class) {
20-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
21-
}
22-
2333
check {
24-
dependsOn(testStableSemconv)
34+
dependsOn(testing.suites.named("testStableSemconv"))
2535
}
2636
}

‎instrumentation/clickhouse-client-0.5/javaagent/build.gradle.kts‎

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

2525
val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false"
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+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
35+
systemProperty("collectMetadata", collectMetadata)
36+
}
37+
}
38+
}
39+
}
40+
}
41+
}
42+
2743
tasks {
2844
test {
2945
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
3046
systemProperty("collectMetadata", collectMetadata)
3147
}
3248

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

‎instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,26 @@ dependencies {
3838
latestDepTestLibrary("com.couchbase.client:java-client:3.1.+") // see couchbase-3.2 module
3939
}
4040

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

46-
val testStableSemconv by registering(Test::class) {
47-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
48-
}
49-
5060
check {
51-
dependsOn(testStableSemconv)
61+
dependsOn(testing.suites.named("testStableSemconv"))
5262
}
5363
}

‎instrumentation/external-annotations/javaagent/build.gradle.kts‎

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,25 +34,41 @@ dependencies {
3434
testCompileOnly("org.springframework:spring-core:4.3.30.RELEASE")
3535
}
3636

37-
tasks {
38-
val testIncludeProperty by registering(Test::class) {
39-
filter {
40-
includeTestsMatching("ConfiguredTraceAnnotationsTest")
37+
testing {
38+
suites {
39+
val testIncludeProperty by registering(JvmTestSuite::class) {
40+
targets {
41+
all {
42+
testTask.configure {
43+
filter {
44+
includeTestsMatching("ConfiguredTraceAnnotationsTest")
45+
}
46+
include("**/ConfiguredTraceAnnotationsTest.*")
47+
jvmArgs("-Dotel.instrumentation.external-annotations.include=io.opentelemetry.javaagent.instrumentation.extannotations.OuterClass\$InterestingMethod")
48+
}
49+
}
50+
}
4151
}
42-
include("**/ConfiguredTraceAnnotationsTest.*")
43-
jvmArgs("-Dotel.instrumentation.external-annotations.include=io.opentelemetry.javaagent.instrumentation.extannotations.OuterClass\$InterestingMethod")
44-
}
4552

46-
val testExcludeMethodsProperty by registering(Test::class) {
47-
filter {
48-
includeTestsMatching("TracedMethodsExclusionTest")
53+
val testExcludeMethodsProperty by registering(JvmTestSuite::class) {
54+
targets {
55+
all {
56+
testTask.configure {
57+
filter {
58+
includeTestsMatching("TracedMethodsExclusionTest")
59+
}
60+
include("**/TracedMethodsExclusionTest.*")
61+
jvmArgs(
62+
"-Dotel.instrumentation.external-annotations.exclude-methods=io.opentelemetry.javaagent.instrumentation.extannotations.TracedMethodsExclusionTest\$TestClass[excluded,annotatedButExcluded]"
63+
)
64+
}
65+
}
66+
}
4967
}
50-
include("**/TracedMethodsExclusionTest.*")
51-
jvmArgs(
52-
"-Dotel.instrumentation.external-annotations.exclude-methods=io.opentelemetry.javaagent.instrumentation.extannotations.TracedMethodsExclusionTest\$TestClass[excluded,annotatedButExcluded]"
53-
)
5468
}
69+
}
5570

71+
tasks {
5672
test {
5773
filter {
5874
excludeTestsMatching("ConfiguredTraceAnnotationsTest")
@@ -61,7 +77,7 @@ tasks {
6177
}
6278

6379
check {
64-
dependsOn(testIncludeProperty)
65-
dependsOn(testExcludeMethodsProperty)
80+
dependsOn(testing.suites.named("testIncludeProperty"))
81+
dependsOn(testing.suites.named("testExcludeMethodsProperty"))
6682
}
6783
}

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

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,37 @@ 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+
2859
tasks {
2960
withType<Test>().configureEach {
3061
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
@@ -35,21 +66,6 @@ tasks {
3566
jvmArgs("-Dotel.instrumentation.kafka.experimental-span-attributes=true")
3667
}
3768

38-
val testPropagationDisabled by registering(Test::class) {
39-
filter {
40-
includeTestsMatching("KafkaClientPropagationDisabledTest")
41-
}
42-
include("**/KafkaClientPropagationDisabledTest.*")
43-
jvmArgs("-Dotel.instrumentation.kafka.producer-propagation.enabled=false")
44-
}
45-
46-
val testReceiveSpansDisabled by registering(Test::class) {
47-
filter {
48-
includeTestsMatching("KafkaClientSuppressReceiveSpansTest")
49-
}
50-
include("**/KafkaClientSuppressReceiveSpansTest.*")
51-
}
52-
5369
test {
5470
filter {
5571
excludeTestsMatching("KafkaClientPropagationDisabledTest")
@@ -59,7 +75,7 @@ tasks {
5975
}
6076

6177
check {
62-
dependsOn(testPropagationDisabled)
63-
dependsOn(testReceiveSpansDisabled)
78+
dependsOn(testing.suites.named("testPropagationDisabled"))
79+
dependsOn(testing.suites.named("testReceiveSpansDisabled"))
6480
}
6581
}

‎instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/build.gradle.kts‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,30 @@ dependencies {
1616
testAnnotationProcessor("com.google.auto.value:auto-value")
1717
}
1818

19+
testing {
20+
suites {
21+
val testReceiveSpansDisabled by registering(JvmTestSuite::class) {
22+
targets {
23+
all {
24+
testTask.configure {
25+
filter {
26+
includeTestsMatching("InterceptorsSuppressReceiveSpansTest")
27+
includeTestsMatching("WrapperSuppressReceiveSpansTest")
28+
}
29+
include("**/InterceptorsSuppressReceiveSpansTest.*", "**/WrapperSuppressReceiveSpansTest.*")
30+
}
31+
}
32+
}
33+
}
34+
}
35+
}
36+
1937
tasks {
2038
withType<Test>().configureEach {
2139
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
2240
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
2341
}
2442

25-
val testReceiveSpansDisabled by registering(Test::class) {
26-
filter {
27-
includeTestsMatching("InterceptorsSuppressReceiveSpansTest")
28-
includeTestsMatching("WrapperSuppressReceiveSpansTest")
29-
}
30-
include("**/InterceptorsSuppressReceiveSpansTest.*", "**/WrapperSuppressReceiveSpansTest.*")
31-
}
32-
3343
test {
3444
filter {
3545
excludeTestsMatching("InterceptorsSuppressReceiveSpansTest")
@@ -40,6 +50,6 @@ tasks {
4050
}
4151

4252
check {
43-
dependsOn(testReceiveSpansDisabled)
53+
dependsOn(testing.suites.named("testReceiveSpansDisabled"))
4454
}
4555
}

0 commit comments

Comments
 (0)