From 344e205720dfc06128b010f56ad3f21d2d4a5399 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 15 Jul 2021 23:55:30 -0700 Subject: [PATCH] Help out Intellij (#3595) --- .../main/kotlin/otel.javaagent-instrumentation.gradle.kts | 6 ++++++ .../src/main/kotlin/otel.library-instrumentation.gradle.kts | 6 ++++++ instrumentation/build.gradle.kts | 4 ++++ .../spring/spring-boot-autoconfigure/build.gradle.kts | 4 ++++ javaagent-bootstrap/build.gradle.kts | 4 ++++ javaagent-extension-api/build.gradle.kts | 4 ++++ javaagent-instrumentation-api/build.gradle.kts | 4 ++++ javaagent-tooling/build.gradle.kts | 4 ++++ 8 files changed, 36 insertions(+) diff --git a/buildSrc/src/main/kotlin/otel.javaagent-instrumentation.gradle.kts b/buildSrc/src/main/kotlin/otel.javaagent-instrumentation.gradle.kts index c8f7febe2d..5c29ed7688 100644 --- a/buildSrc/src/main/kotlin/otel.javaagent-instrumentation.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.javaagent-instrumentation.gradle.kts @@ -8,3 +8,9 @@ plugins { extra["mavenGroupId"] = "io.opentelemetry.javaagent.instrumentation" base.archivesName.set(projectDir.parentFile.name) + +dependencies { + // this only exists to make Intellij happy since it doesn't (currently at least) understand our + // inclusion of this artifact inside of :instrumentation-api + compileOnly(project(":instrumentation-api-caching")) +} diff --git a/buildSrc/src/main/kotlin/otel.library-instrumentation.gradle.kts b/buildSrc/src/main/kotlin/otel.library-instrumentation.gradle.kts index 92e1cbfc5c..d885cdbb34 100644 --- a/buildSrc/src/main/kotlin/otel.library-instrumentation.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.library-instrumentation.gradle.kts @@ -9,3 +9,9 @@ plugins { extra["mavenGroupId"] = "io.opentelemetry.instrumentation" base.archivesName.set(projectDir.parentFile.name) + +dependencies { + // this only exists to make Intellij happy since it doesn't (currently at least) understand our + // inclusion of this artifact inside of :instrumentation-api + compileOnly(project(":instrumentation-api-caching")) +} diff --git a/instrumentation/build.gradle.kts b/instrumentation/build.gradle.kts index accabc8921..d1a8f2eb8d 100644 --- a/instrumentation/build.gradle.kts +++ b/instrumentation/build.gradle.kts @@ -29,6 +29,10 @@ dependencies { compileOnly(project(":javaagent-instrumentation-api")) implementation(project(":javaagent-tooling")) implementation(project(":javaagent-extension-api")) + + // this only exists to make Intellij happy since it doesn't (currently at least) understand our + // inclusion of this artifact inside of :instrumentation-api + compileOnly(project(":instrumentation-api-caching")) } configurations { diff --git a/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts b/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts index f8c66a6c01..588a5aed9e 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts +++ b/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts @@ -52,6 +52,10 @@ dependencies { testImplementation("io.grpc:grpc-api:1.30.2") testImplementation("io.grpc:grpc-netty-shaded:1.30.2") testImplementation(project(":instrumentation-api-annotation-support")) + + // this only exists to make Intellij happy since it doesn't (currently at least) understand our + // inclusion of this artifact inside of :instrumentation-api + compileOnly(project(":instrumentation-api-caching")) } tasks.compileTestJava { diff --git a/javaagent-bootstrap/build.gradle.kts b/javaagent-bootstrap/build.gradle.kts index ca5af4a7f4..da07d66ec1 100644 --- a/javaagent-bootstrap/build.gradle.kts +++ b/javaagent-bootstrap/build.gradle.kts @@ -12,4 +12,8 @@ dependencies { testImplementation(project(":testing-common")) testImplementation("org.mockito:mockito-core") testImplementation("org.assertj:assertj-core") + + // this only exists to make Intellij happy since it doesn't (currently at least) understand our + // inclusion of this artifact inside of :instrumentation-api + compileOnly(project(":instrumentation-api-caching")) } diff --git a/javaagent-extension-api/build.gradle.kts b/javaagent-extension-api/build.gradle.kts index 70e6d3315d..43d27dfed9 100644 --- a/javaagent-extension-api/build.gradle.kts +++ b/javaagent-extension-api/build.gradle.kts @@ -15,4 +15,8 @@ dependencies { // metrics are unstable, do not expose as api implementation("io.opentelemetry:opentelemetry-sdk-metrics") + + // this only exists to make Intellij happy since it doesn't (currently at least) understand our + // inclusion of this artifact inside of :instrumentation-api + compileOnly(project(":instrumentation-api-caching")) } diff --git a/javaagent-instrumentation-api/build.gradle.kts b/javaagent-instrumentation-api/build.gradle.kts index 6a93d7ca01..1f3eadb22b 100644 --- a/javaagent-instrumentation-api/build.gradle.kts +++ b/javaagent-instrumentation-api/build.gradle.kts @@ -18,4 +18,8 @@ dependencies { testImplementation("org.mockito:mockito-core") testImplementation("org.mockito:mockito-junit-jupiter") testImplementation("org.assertj:assertj-core") + + // this only exists to make Intellij happy since it doesn't (currently at least) understand our + // inclusion of this artifact inside of :instrumentation-api + compileOnly(project(":instrumentation-api-caching")) } diff --git a/javaagent-tooling/build.gradle.kts b/javaagent-tooling/build.gradle.kts index a30fcbeb04..bcaf04eec6 100644 --- a/javaagent-tooling/build.gradle.kts +++ b/javaagent-tooling/build.gradle.kts @@ -38,6 +38,10 @@ dependencies { testImplementation("org.assertj:assertj-core") testImplementation("org.mockito:mockito-core") testImplementation("org.mockito:mockito-junit-jupiter") + + // this only exists to make Intellij happy since it doesn't (currently at least) understand our + // inclusion of this artifact inside of :instrumentation-api + compileOnly(project(":instrumentation-api-caching")) } // Here we only include autoconfigure but don"t include OTLP exporters to ensure they are only in