Skip to content

Commit 5da7503

Browse files
authored
Fix intellij not seeing shaded deps of testing-common (#15243)
1 parent cb6563a commit 5da7503

File tree

114 files changed

+119
-144
lines changed

Some content is hidden

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

114 files changed

+119
-144
lines changed

conventions/src/main/kotlin/io.opentelemetry.instrumentation.library-instrumentation.gradle.kts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,11 @@ dependencies {
1010

1111
testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
1212
}
13+
14+
testing {
15+
suites.withType(JvmTestSuite::class).configureEach {
16+
dependencies {
17+
implementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
18+
}
19+
}
20+
}

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ configurations.configureEach {
467467
substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")).using(project(":javaagent-extension-api"))
468468
substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")).using(project(":javaagent-tooling"))
469469
substitute(module("io.opentelemetry.javaagent:opentelemetry-agent-for-testing")).using(project(":testing:agent-for-testing"))
470-
substitute(module("io.opentelemetry.javaagent:opentelemetry-testing-common")).using(project(":testing-common"))
470+
substitute(module("io.opentelemetry.javaagent:opentelemetry-testing-common")).using(project(":testing-common:with-shaded-dependencies"))
471471
substitute(module("io.opentelemetry.javaagent:opentelemetry-muzzle")).using(project(":muzzle"))
472472
substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent")).using(project(":javaagent"))
473473
}

instrumentation-annotations-support-testing/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ plugins {
33
}
44

55
dependencies {
6-
api(project(":testing-common"))
6+
api("io.opentelemetry.javaagent:opentelemetry-testing-common")
77
}

instrumentation-annotations-support/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ dependencies {
1616
compileOnly("com.google.auto.value:auto-value-annotations")
1717
annotationProcessor("com.google.auto.value:auto-value")
1818

19-
testImplementation(project(":testing-common"))
19+
testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
2020
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
2121
}

instrumentation-api-incubator/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies {
1818
compileOnly("com.google.auto.value:auto-value-annotations")
1919
annotationProcessor("com.google.auto.value:auto-value")
2020

21-
testImplementation(project(":testing-common"))
21+
testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
2222
testImplementation("io.opentelemetry:opentelemetry-sdk")
2323
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
2424
testImplementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating")

instrumentation-api/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies {
1919
compileOnly("com.google.auto.value:auto-value-annotations")
2020
annotationProcessor("com.google.auto.value:auto-value")
2121

22-
testImplementation(project(":testing-common"))
22+
testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
2323
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
2424
testImplementation("io.opentelemetry:opentelemetry-exporter-common")
2525
testImplementation("org.junit-pioneer:junit-pioneer")

instrumentation/alibaba-druid-1.0/testing/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
}
44

55
dependencies {
6-
api(project(":testing-common"))
6+
api("io.opentelemetry.javaagent:opentelemetry-testing-common")
77
api("org.mockito:mockito-core")
88
api("org.mockito:mockito-junit-jupiter")
99

instrumentation/apache-dbcp-2.0/testing/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
}
44

55
dependencies {
6-
api(project(":testing-common"))
6+
api("io.opentelemetry.javaagent:opentelemetry-testing-common")
77
api("org.mockito:mockito-core")
88
api("org.mockito:mockito-junit-jupiter")
99

instrumentation/apache-dubbo-2.7/testing/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
val apacheDubboVersion = "2.7.5"
66

77
dependencies {
8-
api(project(":testing-common"))
8+
api("io.opentelemetry.javaagent:opentelemetry-testing-common")
99

1010
api("org.apache.dubbo:dubbo:$apacheDubboVersion")
1111
api("org.apache.dubbo:dubbo-config-api:$apacheDubboVersion")

instrumentation/apache-httpclient/apache-httpclient-4.3/testing/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ tasks {
1313
}
1414

1515
dependencies {
16-
api(project(":testing-common"))
16+
api("io.opentelemetry.javaagent:opentelemetry-testing-common")
1717

1818
api("org.apache.httpcomponents:httpclient:4.3")
1919

0 commit comments

Comments
 (0)