Skip to content

Commit e969310

Browse files
jaydelucajaydeluca
committed
batch 4
1 parent 6aba385 commit e969310

File tree

10 files changed

+199
-90
lines changed

10 files changed

+199
-90
lines changed

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,18 @@ testing {
128128
}
129129
}
130130
}
131+
132+
val testStableSemconv by registering(JvmTestSuite::class) {
133+
targets {
134+
all {
135+
testTask.configure {
136+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
137+
systemProperty("collectMetadata", collectMetadata)
138+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
139+
}
140+
}
141+
}
142+
}
131143
}
132144
}
133145

@@ -144,15 +156,8 @@ tasks {
144156
}
145157
}
146158

147-
val testStableSemconv by registering(Test::class) {
148-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
149-
150-
systemProperty("collectMetadata", collectMetadata)
151-
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
152-
}
153-
154159
check {
155-
dependsOn(testStableSemconv)
160+
dependsOn(testing.suites.named("testStableSemconv"))
156161
}
157162

158163
test {

‎instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/build.gradle.kts‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,29 @@ dependencies {
2323
latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583") // documented limitation
2424
}
2525

26+
testing {
27+
suites {
28+
val testReceiveSpansDisabled by registering(JvmTestSuite::class) {
29+
targets {
30+
all {
31+
testTask.configure {
32+
filter {
33+
includeTestsMatching("SqsSuppressReceiveSpansTest")
34+
}
35+
include("**/SqsSuppressReceiveSpansTest.*")
36+
}
37+
}
38+
}
39+
}
40+
}
41+
}
42+
2643
tasks {
2744
withType<Test>().configureEach {
2845
systemProperty("otel.instrumentation.aws-sdk.experimental-span-attributes", "true")
2946
systemProperty("otel.instrumentation.messaging.experimental.capture-headers", "Test-Message-Header")
3047
}
3148

32-
val testReceiveSpansDisabled by registering(Test::class) {
33-
filter {
34-
includeTestsMatching("SqsSuppressReceiveSpansTest")
35-
}
36-
include("**/SqsSuppressReceiveSpansTest.*")
37-
}
38-
3949
test {
4050
filter {
4151
excludeTestsMatching("SqsSuppressReceiveSpansTest")
@@ -44,7 +54,7 @@ tasks {
4454
}
4555

4656
check {
47-
dependsOn(testReceiveSpansDisabled)
57+
dependsOn(testing.suites.named("testReceiveSpansDisabled"))
4858
}
4959
}
5060

‎instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,21 @@ testing {
4848
implementation("com.amazonaws:aws-java-sdk-secretsmanager:$version")
4949
}
5050
}
51+
52+
val testStableSemconv by registering(JvmTestSuite::class) {
53+
targets {
54+
all {
55+
testTask.configure {
56+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
57+
}
58+
}
59+
}
60+
}
5161
}
5262
}
5363

5464
tasks {
55-
val testStableSemconv by registering(Test::class) {
56-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
57-
}
58-
5965
check {
6066
dependsOn(testing.suites)
61-
dependsOn(testStableSemconv)
6267
}
6368
}

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

Lines changed: 49 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -171,21 +171,53 @@ testing {
171171
}
172172
}
173173

174-
tasks {
175-
val testExperimentalSqs by registering(Test::class) {
176-
filter {
177-
excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
174+
testing {
175+
suites {
176+
val testExperimentalSqs by registering(JvmTestSuite::class) {
177+
targets {
178+
all {
179+
testTask.configure {
180+
filter {
181+
excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
182+
}
183+
systemProperty("otel.instrumentation.aws-sdk.experimental-use-propagator-for-messaging", "true")
184+
systemProperty("otel.instrumentation.messaging.experimental.receive-telemetry.enabled", "true")
185+
}
186+
}
187+
}
178188
}
179-
systemProperty("otel.instrumentation.aws-sdk.experimental-use-propagator-for-messaging", "true")
180-
systemProperty("otel.instrumentation.messaging.experimental.receive-telemetry.enabled", "true")
181-
}
182189

183-
val testReceiveSpansDisabled by registering(Test::class) {
184-
filter {
185-
includeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
190+
val testReceiveSpansDisabled by registering(JvmTestSuite::class) {
191+
targets {
192+
all {
193+
testTask.configure {
194+
filter {
195+
includeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
196+
}
197+
include("**/Aws2SqsSuppressReceiveSpansTest.*")
198+
}
199+
}
200+
}
201+
}
202+
203+
val testStableSemconv by registering(JvmTestSuite::class) {
204+
targets {
205+
all {
206+
testTask.configure {
207+
filter {
208+
excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
209+
}
210+
systemProperty("otel.instrumentation.messaging.experimental.receive-telemetry.enabled", "true")
211+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
212+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
213+
}
214+
}
215+
}
186216
}
187-
include("**/Aws2SqsSuppressReceiveSpansTest.*")
188217
}
218+
}
219+
220+
tasks {
189221

190222
test {
191223
filter {
@@ -196,9 +228,12 @@ tasks {
196228
}
197229

198230
check {
199-
dependsOn(testExperimentalSqs)
200-
dependsOn(testReceiveSpansDisabled)
201-
dependsOn(testing.suites)
231+
dependsOn(testing.suites.named("testExperimentalSqs"))
232+
dependsOn(testing.suites.named("testReceiveSpansDisabled"))
233+
dependsOn(testing.suites.named("testStableSemconv"))
234+
dependsOn(testing.suites.named("s3PresignerTest"))
235+
dependsOn(testing.suites.named("s3CrtTest"))
236+
dependsOn(testing.suites.named("testBedrockRuntime"))
202237
}
203238

204239
withType<Test>().configureEach {
@@ -215,17 +250,5 @@ tasks {
215250
}
216251
}
217252

218-
val testStableSemconv by registering(Test::class) {
219-
filter {
220-
excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
221-
}
222-
systemProperty("otel.instrumentation.messaging.experimental.receive-telemetry.enabled", "true")
223-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
224253

225-
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
226-
}
227-
228-
check {
229-
dependsOn(testStableSemconv)
230-
}
231254
}

‎instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/build.gradle.kts‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,20 @@ dependencies {
2424
testLibrary("software.amazon.awssdk:sqs:2.2.0")
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+
2741
tasks {
2842
withType<Test>().configureEach {
2943
systemProperty("otel.instrumentation.aws-sdk.experimental-span-attributes", true)
@@ -32,11 +46,7 @@ tasks {
3246
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
3347
}
3448

35-
val testStableSemconv by registering(Test::class) {
36-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
37-
}
38-
3949
check {
40-
dependsOn(testStableSemconv)
50+
dependsOn(testing.suites.named("testStableSemconv"))
4151
}
4252
}

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,16 @@ testing {
6666
implementation("software.amazon.awssdk:bedrockruntime:$version")
6767
}
6868
}
69+
70+
val testStableSemconv by registering(JvmTestSuite::class) {
71+
targets {
72+
all {
73+
testTask.configure {
74+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
75+
}
76+
}
77+
}
78+
}
6979
}
7080
}
7181

@@ -77,12 +87,7 @@ tasks {
7787
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
7888
}
7989

80-
val testStableSemconv by registering(Test::class) {
81-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
82-
}
83-
8490
check {
8591
dependsOn(testing.suites)
86-
dependsOn(testStableSemconv)
8792
}
8893
}

‎instrumentation/camel-2.20/javaagent/build.gradle.kts‎

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,32 @@ dependencies {
6767
latestDepTestLibrary("org.apache.camel:camel-cassandraql:2.+") // documented limitation
6868
}
6969

70+
testing {
71+
suites {
72+
val testExperimental by registering(JvmTestSuite::class) {
73+
targets {
74+
all {
75+
testTask.configure {
76+
jvmArgs("-Dotel.instrumentation.camel.experimental-span-attributes=true")
77+
systemProperty("metadataConfig", "otel.instrumentation.camel.experimental-span-attributes=true")
78+
}
79+
}
80+
}
81+
}
82+
83+
val testStableSemconv by registering(JvmTestSuite::class) {
84+
targets {
85+
all {
86+
testTask.configure {
87+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
88+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
89+
}
90+
}
91+
}
92+
}
93+
}
94+
}
95+
7096
tasks {
7197
withType<Test>().configureEach {
7298
jvmArgs("-Dotel.instrumentation.aws-sdk.experimental-span-attributes=true")
@@ -83,18 +109,9 @@ tasks {
83109
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
84110
}
85111

86-
val testExperimental by registering(Test::class) {
87-
jvmArgs("-Dotel.instrumentation.camel.experimental-span-attributes=true")
88-
systemProperty("metadataConfig", "otel.instrumentation.camel.experimental-span-attributes=true")
89-
}
90-
91-
val testStableSemconv by registering(Test::class) {
92-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
93-
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
94-
}
95-
96112
check {
97-
dependsOn(testStableSemconv, testExperimental)
113+
dependsOn(testing.suites.named("testStableSemconv"))
114+
dependsOn(testing.suites.named("testExperimental"))
98115
}
99116
}
100117

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

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,28 @@ dependencies {
1919

2020
val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false"
2121

22-
tasks {
23-
val testStableSemconv by registering(Test::class) {
24-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
25-
26-
systemProperty("collectMetadata", collectMetadata)
27-
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
22+
testing {
23+
suites {
24+
val testStableSemconv by registering(JvmTestSuite::class) {
25+
targets {
26+
all {
27+
testTask.configure {
28+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
29+
systemProperty("collectMetadata", collectMetadata)
30+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
31+
}
32+
}
33+
}
34+
}
2835
}
36+
}
2937

38+
tasks {
3039
test {
3140
systemProperty("collectMetadata", collectMetadata)
3241
}
3342

3443
check {
35-
dependsOn(testStableSemconv)
44+
dependsOn(testing.suites.named("testStableSemconv"))
3645
}
3746
}

‎instrumentation/graphql-java/graphql-java-20.0/javaagent/build.gradle.kts‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,29 @@ dependencies {
2323
testImplementation(project(":instrumentation:graphql-java:graphql-java-common:testing"))
2424
}
2525

26+
testing {
27+
suites {
28+
val testDataFetcher by registering(JvmTestSuite::class) {
29+
targets {
30+
all {
31+
testTask.configure {
32+
jvmArgs("-Dotel.instrumentation.graphql.data-fetcher.enabled=true")
33+
systemProperty("metadataConfig", "otel.instrumentation.graphql.data-fetcher.enabled=true")
34+
}
35+
}
36+
}
37+
}
38+
}
39+
}
40+
2641
tasks {
2742
withType<Test>().configureEach {
2843
jvmArgs("-Dotel.instrumentation.graphql.add-operation-name-to-span-name.enabled=true")
2944
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
3045
}
3146

32-
val testDataFetcher by registering(Test::class) {
33-
jvmArgs("-Dotel.instrumentation.graphql.data-fetcher.enabled=true")
34-
systemProperty("metadataConfig", "otel.instrumentation.graphql.data-fetcher.enabled=true")
35-
}
36-
3747
check {
38-
dependsOn(testDataFetcher)
48+
dependsOn(testing.suites.named("testDataFetcher"))
3949
}
4050
}
4151

0 commit comments

Comments
 (0)