From f2714ad0217edd15d8917a4c25c1e4bc85286606 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 25 Apr 2022 15:06:38 -0700 Subject: [PATCH] Small consistency (#5931) --- .../azure-core/azure-core-1.14/javaagent/build.gradle.kts | 2 +- .../azure-core/azure-core-1.19/javaagent/build.gradle.kts | 2 +- instrumentation/build.gradle.kts | 4 ++-- .../opentelemetry-annotations-1.0/javaagent/build.gradle.kts | 2 +- .../opentelemetry-api-1.0/javaagent/build.gradle.kts | 2 +- .../opentelemetry-api-1.10/javaagent/build.gradle.kts | 2 +- .../opentelemetry-api-1.4/javaagent/build.gradle.kts | 2 +- .../reactor/reactor-3.1/javaagent/build.gradle.kts | 2 +- smoke-tests/build.gradle.kts | 2 +- testing-common/build.gradle.kts | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/instrumentation/azure-core/azure-core-1.14/javaagent/build.gradle.kts b/instrumentation/azure-core/azure-core-1.14/javaagent/build.gradle.kts index fc74226e99..e79af1e342 100644 --- a/instrumentation/azure-core/azure-core-1.14/javaagent/build.gradle.kts +++ b/instrumentation/azure-core/azure-core-1.14/javaagent/build.gradle.kts @@ -19,7 +19,7 @@ sourceSets { } dependencies { - compileOnly(project(path = ":instrumentation:azure-core:azure-core-1.14:library-instrumentation-shaded", configuration = "shadow")) + compileOnly(project(":instrumentation:azure-core:azure-core-1.14:library-instrumentation-shaded", configuration = "shadow")) library("com.azure:azure-core:1.14.0") diff --git a/instrumentation/azure-core/azure-core-1.19/javaagent/build.gradle.kts b/instrumentation/azure-core/azure-core-1.19/javaagent/build.gradle.kts index ec6e6508a3..8c8cb8e304 100644 --- a/instrumentation/azure-core/azure-core-1.19/javaagent/build.gradle.kts +++ b/instrumentation/azure-core/azure-core-1.19/javaagent/build.gradle.kts @@ -19,7 +19,7 @@ sourceSets { } dependencies { - compileOnly(project(path = ":instrumentation:azure-core:azure-core-1.19:library-instrumentation-shaded", configuration = "shadow")) + compileOnly(project(":instrumentation:azure-core:azure-core-1.19:library-instrumentation-shaded", configuration = "shadow")) library("com.azure:azure-core:1.19.0") diff --git a/instrumentation/build.gradle.kts b/instrumentation/build.gradle.kts index 7e09c04d48..e2347c841c 100644 --- a/instrumentation/build.gradle.kts +++ b/instrumentation/build.gradle.kts @@ -24,8 +24,8 @@ subprojects { // this only exists to make Intellij happy since it doesn't (currently at least) understand our // inclusion of this artifact inside :testing-common dependencies { - compileOnly(project(path = ":testing:armeria-shaded-for-testing", configuration = "shadow")) - testCompileOnly(project(path = ":testing:armeria-shaded-for-testing", configuration = "shadow")) + compileOnly(project(":testing:armeria-shaded-for-testing", configuration = "shadow")) + testCompileOnly(project(":testing:armeria-shaded-for-testing", configuration = "shadow")) } } diff --git a/instrumentation/opentelemetry-annotations-1.0/javaagent/build.gradle.kts b/instrumentation/opentelemetry-annotations-1.0/javaagent/build.gradle.kts index 4ba88b9910..696f2d4673 100644 --- a/instrumentation/opentelemetry-annotations-1.0/javaagent/build.gradle.kts +++ b/instrumentation/opentelemetry-annotations-1.0/javaagent/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { // the @WithSpan annotation references the OpenTelemetry API's SpanKind class // // see the comment in opentelemetry-api-1.0.gradle for more details - compileOnly(project(path = ":opentelemetry-ext-annotations-shaded-for-instrumenting", configuration = "shadow")) + compileOnly(project(":opentelemetry-ext-annotations-shaded-for-instrumenting", configuration = "shadow")) testImplementation("io.opentelemetry:opentelemetry-extension-annotations") testImplementation(project(":instrumentation-api-annotation-support")) diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/build.gradle.kts b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/build.gradle.kts index 273890de24..2e4242fc0c 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/build.gradle.kts +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { // // and in the code "io.opentelemetry.*" refers to the (shaded) OpenTelemetry API that is used by // the agent (as those references will later be shaded) - compileOnly(project(path = ":opentelemetry-api-shaded-for-instrumenting", configuration = "shadow")) + compileOnly(project(":opentelemetry-api-shaded-for-instrumenting", configuration = "shadow")) // using OpenTelemetry SDK to make sure that instrumentation doesn't cause // OpenTelemetrySdk.getTracerProvider() to throw ClassCastException diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/build.gradle.kts b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/build.gradle.kts index 72307200d8..276f573b45 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/build.gradle.kts +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - compileOnly(project(path = ":opentelemetry-api-shaded-for-instrumenting", configuration = "shadow")) + compileOnly(project(":opentelemetry-api-shaded-for-instrumenting", configuration = "shadow")) implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent")) implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent")) } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/build.gradle.kts b/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/build.gradle.kts index bb1a109b1a..357b795da7 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/build.gradle.kts +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/build.gradle.kts @@ -3,6 +3,6 @@ plugins { } dependencies { - compileOnly(project(path = ":opentelemetry-api-shaded-for-instrumenting", configuration = "shadow")) + compileOnly(project(":opentelemetry-api-shaded-for-instrumenting", configuration = "shadow")) implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent")) } diff --git a/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts b/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts index 32e32e315c..907bb69d22 100644 --- a/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts +++ b/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts @@ -25,7 +25,7 @@ dependencies { compileOnly(project(":javaagent-tooling")) compileOnly(project(":instrumentation-api-annotation-support")) - compileOnly(project(path = ":opentelemetry-api-shaded-for-instrumenting", configuration = "shadow")) + compileOnly(project(":opentelemetry-api-shaded-for-instrumenting", configuration = "shadow")) testLibrary("io.projectreactor:reactor-test:3.1.0.RELEASE") testImplementation(project(":instrumentation:opentelemetry-annotations-1.0:testing")) diff --git a/smoke-tests/build.gradle.kts b/smoke-tests/build.gradle.kts index 9259d905e4..25f1eed618 100644 --- a/smoke-tests/build.gradle.kts +++ b/smoke-tests/build.gradle.kts @@ -38,7 +38,7 @@ dependencies { testImplementation("com.github.docker-java:docker-java-transport-httpclient5:$dockerJavaVersion") // make IntelliJ see shaded Armeria - testCompileOnly(project(path = ":testing:armeria-shaded-for-testing", configuration = "shadow")) + testCompileOnly(project(":testing:armeria-shaded-for-testing", configuration = "shadow")) } tasks { diff --git a/testing-common/build.gradle.kts b/testing-common/build.gradle.kts index 574faa74bc..95077098ed 100644 --- a/testing-common/build.gradle.kts +++ b/testing-common/build.gradle.kts @@ -49,7 +49,7 @@ dependencies { api("com.google.guava:guava") - compileOnly(project(path = ":testing:armeria-shaded-for-testing", configuration = "shadow")) + compileOnly(project(":testing:armeria-shaded-for-testing", configuration = "shadow")) implementation("io.opentelemetry.proto:opentelemetry-proto")