Skip to content

Commit 0cf2488

Browse files
jaydelucajaydeluca
authored
Revert JvmTestSuite changes (#14550)
1 parent 774ee40 commit 0cf2488

File tree

102 files changed

+1091
-1895
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

+1091
-1895
lines changed

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

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -28,30 +28,6 @@ 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-
5531
tasks {
5632
// exclude auto-generated code
5733
named<Checkstyle>("checkstyleMain") {
@@ -69,7 +45,19 @@ tasks {
6945
dependsOn("generateJflex")
7046
}
7147

48+
val testStableSemconv by registering(Test::class) {
49+
testClassesDirs = sourceSets.test.get().output.classesDirs
50+
classpath = sourceSets.test.get().runtimeClasspath
51+
jvmArgs("-Dotel.semconv-stability.opt-in=database,code")
52+
}
53+
54+
val testBothSemconv by registering(Test::class) {
55+
testClassesDirs = sourceSets.test.get().output.classesDirs
56+
classpath = sourceSets.test.get().runtimeClasspath
57+
jvmArgs("-Dotel.semconv-stability.opt-in=database/dup,code/dup")
58+
}
59+
7260
check {
73-
dependsOn(testing.suites)
61+
dependsOn(testStableSemconv, testBothSemconv)
7462
}
7563
}

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

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

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

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-
}
24+
tasks {
25+
val testStableSemconv by registering(Test::class) {
26+
testClassesDirs = sourceSets.test.get().output.classesDirs
27+
classpath = sourceSets.test.get().runtimeClasspath
28+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
29+
systemProperty("collectMetadata", collectMetadata)
30+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
3731
}
38-
}
3932

40-
tasks {
4133
test {
4234
systemProperty("collectMetadata", collectMetadata)
4335
}
4436

4537
check {
46-
dependsOn(testing.suites)
38+
dependsOn(testStableSemconv)
4739
}
4840
}

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

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

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-
}
12+
tasks {
13+
val testStableSemconv by registering(Test::class) {
14+
testClassesDirs = sourceSets.test.get().output.classesDirs
15+
classpath = sourceSets.test.get().runtimeClasspath
16+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
2317
}
24-
}
2518

26-
tasks {
2719
check {
28-
dependsOn(testing.suites)
20+
dependsOn(testStableSemconv)
2921
}
3022
}

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

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

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

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-
}
24+
tasks {
25+
val testStableSemconv by registering(Test::class) {
26+
testClassesDirs = sourceSets.test.get().output.classesDirs
27+
classpath = sourceSets.test.get().runtimeClasspath
28+
29+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
30+
systemProperty("collectMetadata", collectMetadata)
31+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
3732
}
38-
}
3933

40-
tasks {
4134
test {
4235
systemProperty("collectMetadata", collectMetadata)
4336
}
4437

4538
check {
46-
dependsOn(testing.suites)
39+
dependsOn(testStableSemconv)
4740
}
4841
}

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

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

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-
}
12+
tasks {
13+
val testStableSemconv by registering(Test::class) {
14+
testClassesDirs = sourceSets.test.get().output.classesDirs
15+
classpath = sourceSets.test.get().runtimeClasspath
16+
17+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
2318
}
24-
}
2519

26-
tasks {
2720
check {
28-
dependsOn(testing.suites)
21+
dependsOn(testStableSemconv)
2922
}
3023
}

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

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -128,18 +128,6 @@ 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-
}
143131
}
144132
}
145133

@@ -166,6 +154,19 @@ tasks {
166154
jvmArgs("-Dotel.instrumentation.aws-sdk.experimental-span-attributes=true")
167155
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
168156
}
157+
158+
val testStableSemconv by registering(Test::class) {
159+
testClassesDirs = sourceSets.test.get().output.classesDirs
160+
classpath = sourceSets.test.get().runtimeClasspath
161+
162+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
163+
systemProperty("collectMetadata", collectMetadata)
164+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
165+
}
166+
167+
check {
168+
dependsOn(testStableSemconv)
169+
}
169170
}
170171

171172
if (!(findProperty("testLatestDeps") as Boolean)) {

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

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,22 @@ 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-
4326
tasks {
4427
withType<Test>().configureEach {
4528
systemProperty("otel.instrumentation.aws-sdk.experimental-span-attributes", "true")
4629
systemProperty("otel.instrumentation.messaging.experimental.capture-headers", "Test-Message-Header")
4730
}
4831

32+
val testReceiveSpansDisabled by registering(Test::class) {
33+
testClassesDirs = sourceSets.test.get().output.classesDirs
34+
classpath = sourceSets.test.get().runtimeClasspath
35+
36+
filter {
37+
includeTestsMatching("SqsSuppressReceiveSpansTest")
38+
}
39+
include("**/SqsSuppressReceiveSpansTest.*")
40+
}
41+
4942
test {
5043
filter {
5144
excludeTestsMatching("SqsSuppressReceiveSpansTest")
@@ -54,7 +47,7 @@ tasks {
5447
}
5548

5649
check {
57-
dependsOn(testing.suites)
50+
dependsOn(testReceiveSpansDisabled)
5851
}
5952
}
6053

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,17 @@ 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-
}
6151
}
6252
}
6353

6454
tasks {
55+
val testStableSemconv by registering(Test::class) {
56+
testClassesDirs = sourceSets.test.get().output.classesDirs
57+
classpath = sourceSets.test.get().runtimeClasspath
58+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
59+
}
60+
6561
check {
66-
dependsOn(testing.suites)
62+
dependsOn(testing.suites, testStableSemconv)
6763
}
6864
}

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

Lines changed: 29 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -171,53 +171,40 @@ testing {
171171
}
172172
}
173173

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-
}
188-
}
174+
tasks {
175+
val testExperimentalSqs by registering(Test::class) {
176+
testClassesDirs = sourceSets.test.get().output.classesDirs
177+
classpath = sourceSets.test.get().runtimeClasspath
189178

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-
}
179+
filter {
180+
excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
201181
}
182+
systemProperty("otel.instrumentation.aws-sdk.experimental-use-propagator-for-messaging", "true")
183+
systemProperty("otel.instrumentation.messaging.experimental.receive-telemetry.enabled", "true")
184+
}
202185

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-
}
186+
val testReceiveSpansDisabled by registering(Test::class) {
187+
testClassesDirs = sourceSets.test.get().output.classesDirs
188+
classpath = sourceSets.test.get().runtimeClasspath
189+
190+
filter {
191+
includeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
216192
}
193+
include("**/Aws2SqsSuppressReceiveSpansTest.*")
217194
}
218-
}
219195

220-
tasks {
196+
val testStableSemconv by registering(Test::class) {
197+
testClassesDirs = sourceSets.test.get().output.classesDirs
198+
classpath = sourceSets.test.get().runtimeClasspath
199+
200+
filter {
201+
excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
202+
}
203+
systemProperty("otel.instrumentation.messaging.experimental.receive-telemetry.enabled", "true")
204+
jvmArgs("-Dotel.semconv-stability.opt-in=database")
205+
206+
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
207+
}
221208

222209
test {
223210
filter {
@@ -228,7 +215,7 @@ tasks {
228215
}
229216

230217
check {
231-
dependsOn(testing.suites)
218+
dependsOn(testing.suites, testExperimentalSqs, testStableSemconv, testReceiveSpansDisabled)
232219
}
233220

234221
withType<Test>().configureEach {

0 commit comments

Comments
 (0)