open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Small consistency (#5931)

This commit is contained in:
Trask Stalnaker 2022-04-25 15:06:38 -07:00 committed by GitHub
parent 8ed3b2001f
commit f2714ad021
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instrumentation/azure-core/azure-core-1.14/javaagent/build.gradle.kts
View File

@ -19,7 +19,7 @@ sourceSets {
} }
dependencies { 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") library("com.azure:azure-core:1.14.0")

2
instrumentation/azure-core/azure-core-1.19/javaagent/build.gradle.kts
View File

@ -19,7 +19,7 @@ sourceSets {
} }
dependencies { 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") library("com.azure:azure-core:1.19.0")

4
instrumentation/build.gradle.kts
View File

@ -24,8 +24,8 @@ subprojects {
// this only exists to make Intellij happy since it doesn't (currently at least) understand our // this only exists to make Intellij happy since it doesn't (currently at least) understand our
// inclusion of this artifact inside :testing-common // inclusion of this artifact inside :testing-common
dependencies { dependencies {
compileOnly(project(path = ":testing:armeria-shaded-for-testing", configuration = "shadow")) compileOnly(project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
testCompileOnly(project(path = ":testing:armeria-shaded-for-testing", configuration = "shadow")) testCompileOnly(project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
} }
} }

2
instrumentation/opentelemetry-annotations-1.0/javaagent/build.gradle.kts
View File

@ -23,7 +23,7 @@ dependencies {
// the @WithSpan annotation references the OpenTelemetry API's SpanKind class // the @WithSpan annotation references the OpenTelemetry API's SpanKind class
// //
// see the comment in opentelemetry-api-1.0.gradle for more details // 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("io.opentelemetry:opentelemetry-extension-annotations")
testImplementation(project(":instrumentation-api-annotation-support")) testImplementation(project(":instrumentation-api-annotation-support"))

2
instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/build.gradle.kts
View File

@ -32,7 +32,7 @@ dependencies {
// //
// and in the code "io.opentelemetry.*" refers to the (shaded) OpenTelemetry API that is used by // 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) // 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 // using OpenTelemetry SDK to make sure that instrumentation doesn't cause
// OpenTelemetrySdk.getTracerProvider() to throw ClassCastException // OpenTelemetrySdk.getTracerProvider() to throw ClassCastException

2
instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/build.gradle.kts
View File

@ -3,7 +3,7 @@ plugins {
} }
dependencies { 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.0:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent")) implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
} }

2
instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/build.gradle.kts
View File

@ -3,6 +3,6 @@ plugins {
} }
dependencies { 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.0:javaagent"))
} }

2
instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts
View File

@ -25,7 +25,7 @@ dependencies {
compileOnly(project(":javaagent-tooling")) compileOnly(project(":javaagent-tooling"))
compileOnly(project(":instrumentation-api-annotation-support")) 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") testLibrary("io.projectreactor:reactor-test:3.1.0.RELEASE")
testImplementation(project(":instrumentation:opentelemetry-annotations-1.0:testing")) testImplementation(project(":instrumentation:opentelemetry-annotations-1.0:testing"))

2
smoke-tests/build.gradle.kts
View File

@ -38,7 +38,7 @@ dependencies {
testImplementation("com.github.docker-java:docker-java-transport-httpclient5:$dockerJavaVersion") testImplementation("com.github.docker-java:docker-java-transport-httpclient5:$dockerJavaVersion")
// make IntelliJ see shaded Armeria // 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 { tasks {

2
testing-common/build.gradle.kts
View File

@ -49,7 +49,7 @@ dependencies {
api("com.google.guava:guava") 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") implementation("io.opentelemetry.proto:opentelemetry-proto")