Skip to content

Commit 0b0c59c

Browse files
jaydelucajaydeluca
authored
Gradle test fixes (#14542)
1 parent f5256cf commit 0b0c59c

File tree

102 files changed

+1883
-821
lines changed

Some content is hidden

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

102 files changed

+1883
-821
lines changed

‎instrumentation-api-incubator/build.gradle.kts‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,30 @@ dependencies {
2828
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
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,code")
38+
}
39+
}
40+
}
41+
}
42+
43+
val testBothSemconv by registering(JvmTestSuite::class) {
44+
targets {
45+
all {
46+
testTask.configure {
47+
jvmArgs("-Dotel.semconv-stability.opt-in=database/dup,code/dup")
48+
}
49+
}
50+
}
51+
}
52+
}
53+
}
54+
3155
tasks {
3256
// exclude auto-generated code
3357
named<Checkstyle>("checkstyleMain") {
@@ -45,16 +69,7 @@ tasks {
4569
dependsOn("generateJflex")
4670
}
4771

48-
val testStableSemconv by registering(Test::class) {
49-
jvmArgs("-Dotel.semconv-stability.opt-in=database,code")
50-
}
51-
52-
val testBothSemconv by registering(Test::class) {
53-
jvmArgs("-Dotel.semconv-stability.opt-in=database/dup,code/dup")
54-
}
55-
5672
check {
57-
dependsOn(testStableSemconv)
58-
dependsOn(testBothSemconv)
73+
dependsOn(testing.suites)
5974
}
6075
}

‎instrumentation/alibaba-druid-1.0/javaagent/build.gradle.kts‎

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

2222
val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false"
2323

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

40+
tasks {
3241
test {
3342
systemProperty("collectMetadata", collectMetadata)
3443
}
3544

3645
check {
37-
dependsOn(testStableSemconv)
46+
dependsOn(testing.suites)
3847
}
3948
}

‎instrumentation/alibaba-druid-1.0/library/build.gradle.kts‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,22 @@ dependencies {
99
testImplementation(project(":instrumentation:alibaba-druid-1.0:testing"))
1010
}
1111

12-
tasks {
13-
val testStableSemconv by registering(Test::class) {
14-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
12+
testing {
13+
suites {
14+
val testStableSemconv by registering(JvmTestSuite::class) {
15+
targets {
16+
all {
17+
testTask.configure {
18+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
19+
}
20+
}
21+
}
22+
}
1523
}
24+
}
1625

26+
tasks {
1727
check {
18-
dependsOn(testStableSemconv)
28+
dependsOn(testing.suites)
1929
}
2030
}

‎instrumentation/apache-dbcp-2.0/javaagent/build.gradle.kts‎

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

2222
val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false"
2323

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

40+
tasks {
3241
test {
3342
systemProperty("collectMetadata", collectMetadata)
3443
}
3544

3645
check {
37-
dependsOn(testStableSemconv)
46+
dependsOn(testing.suites)
3847
}
3948
}

‎instrumentation/apache-dbcp-2.0/library/build.gradle.kts‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,22 @@ dependencies {
99
testImplementation(project(":instrumentation:apache-dbcp-2.0:testing"))
1010
}
1111

12-
tasks {
13-
val testStableSemconv by registering(Test::class) {
14-
jvmArgs("-Dotel.semconv-stability.opt-in=database")
12+
testing {
13+
suites {
14+
val testStableSemconv by registering(JvmTestSuite::class) {
15+
targets {
16+
all {
17+
testTask.configure {
18+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
19+
}
20+
}
21+
}
22+
}
1523
}
24+
}
1625

26+
tasks {
1727
check {
18-
dependsOn(testStableSemconv)
28+
dependsOn(testing.suites)
1929
}
2030
}

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

Lines changed: 12 additions & 11 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,17 +156,6 @@ 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-
154-
check {
155-
dependsOn(testStableSemconv)
156-
}
157-
158159
test {
159160
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
160161
systemProperty("collectMetadata", collectMetadata)

‎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)
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: 43 additions & 27 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,8 +228,6 @@ tasks {
196228
}
197229

198230
check {
199-
dependsOn(testExperimentalSqs)
200-
dependsOn(testReceiveSpansDisabled)
201231
dependsOn(testing.suites)
202232
}
203233

@@ -214,18 +244,4 @@ tasks {
214244
include("software/amazon/awssdk/global/handlers/execution.interceptors")
215245
}
216246
}
217-
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")
224-
225-
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
226-
}
227-
228-
check {
229-
dependsOn(testStableSemconv)
230-
}
231247
}

0 commit comments

Comments
 (0)