Skip to content

Commit c357876

Browse files
jaydelucajaydeluca
committed
batch 5
1 parent e969310 commit c357876

File tree

11 files changed

+189
-75
lines changed

11 files changed

+189
-75
lines changed

‎instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,4 @@ tasks {
249249
include("software/amazon/awssdk/global/handlers/execution.interceptors")
250250
}
251251
}
252-
253-
254252
}

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

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,21 @@ dependencies {
3030
latestDepTestLibrary("com.couchbase.client:java-client:2.5.+") // see couchbase-2.6 module
3131
}
3232

33+
testing {
34+
suites {
35+
val testStableSemconv by registering(JvmTestSuite::class) {
36+
targets {
37+
all {
38+
testTask.configure {
39+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
40+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
41+
}
42+
}
43+
}
44+
}
45+
}
46+
}
47+
3348
tasks {
3449
withType<Test>().configureEach {
3550
// required on jdk17
@@ -40,12 +55,7 @@ tasks {
4055
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
4156
}
4257

43-
val testStableSemconv by registering(Test::class) {
44-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
45-
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
46-
}
47-
4858
check {
49-
dependsOn(testStableSemconv)
59+
dependsOn(testing.suites.named("testStableSemconv"))
5060
}
5161
}

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

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,32 @@ dependencies {
3333
latestDepTestLibrary("com.couchbase.client:java-client:2.+") // see couchbase-3.1 module
3434
}
3535

36+
testing {
37+
suites {
38+
val testStableSemconv by registering(JvmTestSuite::class) {
39+
targets {
40+
all {
41+
testTask.configure {
42+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
43+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
44+
}
45+
}
46+
}
47+
}
48+
49+
val testExperimental by registering(JvmTestSuite::class) {
50+
targets {
51+
all {
52+
testTask.configure {
53+
jvmArgs("-Dotel.instrumentation.couchbase.experimental-span-attributes=true")
54+
systemProperty("metadataConfig", "otel.instrumentation.couchbase.experimental-span-attributes=true")
55+
}
56+
}
57+
}
58+
}
59+
}
60+
}
61+
3662
tasks {
3763
withType<Test>().configureEach {
3864
// required on jdk17
@@ -42,17 +68,8 @@ tasks {
4268
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
4369
}
4470

45-
val testStableSemconv by registering(Test::class) {
46-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
47-
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
48-
}
49-
50-
val testExperimental by registering(Test::class) {
51-
jvmArgs("-Dotel.instrumentation.couchbase.experimental-span-attributes=true")
52-
systemProperty("metadataConfig", "otel.instrumentation.couchbase.experimental-span-attributes=true")
53-
}
54-
5571
check {
56-
dependsOn(testStableSemconv, testExperimental)
72+
dependsOn(testing.suites.named("testStableSemconv"))
73+
dependsOn(testing.suites.named("testExperimental"))
5774
}
5875
}

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

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

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

47-
val testStableSemconv by registering(Test::class) {
48-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
49-
}
50-
5161
check {
52-
dependsOn(testStableSemconv)
62+
dependsOn(testing.suites.named("testStableSemconv"))
5363
}
5464
}

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,27 @@ dependencies {
3636
testImplementation("org.testcontainers:couchbase")
3737
}
3838

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

45-
val testStableSemconv by registering(Test::class) {
46-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
47-
}
48-
4959
check {
50-
dependsOn(testStableSemconv)
60+
dependsOn(testing.suites.named("testStableSemconv"))
5161
}
5262
}

‎instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/build.gradle.kts‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,17 @@ testing {
7070
}
7171
}
7272
}
73+
74+
val testStableSemconv by registering(JvmTestSuite::class) {
75+
targets {
76+
all {
77+
testTask.configure {
78+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
79+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
80+
}
81+
}
82+
}
83+
}
7384
}
7485
}
7586

@@ -81,13 +92,7 @@ tasks {
8192
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
8293
}
8394

84-
val testStableSemconv by registering(Test::class) {
85-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
86-
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
87-
}
88-
8995
check {
9096
dependsOn(testing.suites)
91-
dependsOn(testStableSemconv)
9297
}
9398
}

‎instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/build.gradle.kts‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,21 @@ dependencies {
3535
latestDepTestLibrary("org.elasticsearch.client:elasticsearch-rest-client:6.3.+") // see elasticsearch-rest-6.4 module
3636
}
3737

38+
testing {
39+
suites {
40+
val testStableSemconv by registering(JvmTestSuite::class) {
41+
targets {
42+
all {
43+
testTask.configure {
44+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
45+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
46+
}
47+
}
48+
}
49+
}
50+
}
51+
}
52+
3853
tasks {
3954
withType<Test>().configureEach {
4055
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
@@ -43,12 +58,7 @@ tasks {
4358
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
4459
}
4560

46-
val testStableSemconv by registering(Test::class) {
47-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
48-
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
49-
}
50-
5161
check {
52-
dependsOn(testStableSemconv)
62+
dependsOn(testing.suites.named("testStableSemconv"))
5363
}
5464
}

‎instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/build.gradle.kts‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,28 @@ dependencies {
3535
latestDepTestLibrary("org.elasticsearch.client:elasticsearch-rest-client:6.+") // see elasticsearch-rest-7.0 module
3636
}
3737

38+
testing {
39+
suites {
40+
val testStableSemconv by registering(JvmTestSuite::class) {
41+
targets {
42+
all {
43+
testTask.configure {
44+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
45+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
46+
}
47+
}
48+
}
49+
}
50+
}
51+
}
52+
3853
tasks {
3954
withType<Test>().configureEach {
4055
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
4156
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
4257
}
4358

44-
val testStableSemconv by registering(Test::class) {
45-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
46-
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
47-
}
48-
4959
check {
50-
dependsOn(testStableSemconv)
60+
dependsOn(testing.suites.named("testStableSemconv"))
5161
}
5262
}

‎instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/build.gradle.kts‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,21 @@ dependencies {
3838
testImplementation("org.testcontainers:elasticsearch")
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+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
49+
}
50+
}
51+
}
52+
}
53+
}
54+
}
55+
4156
tasks {
4257
withType<Test>().configureEach {
4358
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
@@ -46,12 +61,7 @@ tasks {
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/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts‎

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,32 @@ dependencies {
4949
latestDepTestLibrary("org.elasticsearch.client:transport:5.2.+") // see elasticsearch-transport-5.3 module
5050
}
5151

52+
testing {
53+
suites {
54+
val testStableSemconv by registering(JvmTestSuite::class) {
55+
targets {
56+
all {
57+
testTask.configure {
58+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
59+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
60+
}
61+
}
62+
}
63+
}
64+
65+
val testExperimental by registering(JvmTestSuite::class) {
66+
targets {
67+
all {
68+
testTask.configure {
69+
jvmArgs("-Dotel.instrumentation.elasticsearch.experimental-span-attributes=true")
70+
systemProperty("metadataConfig", "otel.instrumentation.elasticsearch.experimental-span-attributes=true")
71+
}
72+
}
73+
}
74+
}
75+
}
76+
}
77+
5278
tasks {
5379
withType<Test>().configureEach {
5480
// required on jdk17
@@ -57,17 +83,8 @@ tasks {
5783
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
5884
}
5985

60-
val testStableSemconv by registering(Test::class) {
61-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
62-
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
63-
}
64-
65-
val testExperimental by registering(Test::class) {
66-
jvmArgs("-Dotel.instrumentation.elasticsearch.experimental-span-attributes=true")
67-
systemProperty("metadataConfig", "otel.instrumentation.elasticsearch.experimental-span-attributes=true")
68-
}
69-
7086
check {
71-
dependsOn(testStableSemconv, testExperimental)
87+
dependsOn(testing.suites.named("testStableSemconv"))
88+
dependsOn(testing.suites.named("testExperimental"))
7289
}
7390
}

0 commit comments

Comments
 (0)