Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update otel to 1.32.0 #400

Closed
wants to merge 12 commits into from
Closed

update otel to 1.32.0 #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
34ccf95
update otel to 1.32.0
Jan 23, 2024
2139556
bom
Jan 23, 2024
073da38
nit
Jan 23, 2024
c007d40
nit
Jan 23, 2024
61ade35
nit
Jan 23, 2024
5921ef5
nit
Jan 23, 2024
669316f
try move constraint
Jan 23, 2024
4d36097
undo
Jan 23, 2024
eb5b1bd
try again
Jan 23, 2024
1d5407f
try again
Jan 23, 2024
1ee6ddc
move to 11
Jan 23, 2024
c21cfdb
Revert "move to 11"
Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,10 @@ subprojects {
extra.set("versions", mapOf(
// when updating these values, some values must also be updated in buildSrc as this map
// cannot be accessed there
"opentelemetry" to "1.24.0",
"opentelemetry_semconv" to "1.24.0-alpha",
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

io.opentelemetry:opentelemetry-semconv was used before which wasn't present in bom of opentelmetry instrumentation, but io.opentelemetry.semconv:opentelemetry-semconv was present.
https://repo.maven.apache.org/maven2/io/opentelemetry/instrumentation/opentelemetry-instrumentation-bom-alpha/1.32.0-alpha/opentelemetry-instrumentation-bom-alpha-1.32.0-alpha.pom

<dependency>
<groupId>io.opentelemetry.semconv</groupId>
<artifactId>opentelemetry-semconv</artifactId>
<version>1.21.0-alpha</version>
</dependency>

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/open-telemetry/opentelemetry-java/blob/e4b31cea3de13db7262540457e598282f56d9978/CHANGELOG.md?plain=1#L231

they stopped publishing io.opentelemetry:opentelemetry-semconv and suggest to use the new one

"opentelemetry_proto" to "0.11.0-alpha",
"opentelemetry_java_agent" to "1.24.0-alpha",
"opentelemetry_java_agent_all" to "1.24.0",
"opentelemetry_java_agent-tooling" to "1.24.0-alpha",
"opentelemetry_instrumentation_bom_alpha" to "1.32.0-alpha",

"opentelemetry_gradle_plugin" to "1.24.0-alpha",
"opentelemetry_gradle_plugin" to "1.32.0-alpha",
"byte_buddy" to "1.12.10",
"slf4j" to "2.0.7"
))
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ tasks {
dependencies {
compileOnly(gradleApi())
implementation(localGroovy())
val otelInstrumentationVersion = "1.24.0-alpha"
val otelInstrumentationVersion = "1.32.0-alpha"
implementation("io.opentelemetry.javaagent:opentelemetry-muzzle:$otelInstrumentationVersion")
implementation("io.opentelemetry.instrumentation.muzzle-generation:io.opentelemetry.instrumentation.muzzle-generation.gradle.plugin:$otelInstrumentationVersion")
implementation("io.opentelemetry.instrumentation.muzzle-check:io.opentelemetry.instrumentation.muzzle-check.gradle.plugin:$otelInstrumentationVersion")
Expand Down
3 changes: 2 additions & 1 deletion filter-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ plugins {
val versions: Map<String, String> by extra

dependencies {
api("io.opentelemetry:opentelemetry-api:${versions["opentelemetry"]}")
api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions["opentelemetry_instrumentation_bom_alpha"]}"))
api("io.opentelemetry:opentelemetry-api")
api(project(":javaagent-core"))
compileOnly("com.google.auto.service:auto-service-annotations:1.0")
implementation("org.slf4j:slf4j-api:${versions["slf4j"]}")
Expand Down
7 changes: 4 additions & 3 deletions instrumentation/apache-httpasyncclient-4.1/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ dependencies {
api(project(":instrumentation:java-streams"))
api(project(":instrumentation:apache-httpclient-4.0"))

implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpasyncclient-4.1:${versions["opentelemetry_java_agent"]}")
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-4.0:${versions["opentelemetry_java_agent"]}")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions["opentelemetry_instrumentation_bom_alpha"]}"))
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpasyncclient-4.1")
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-4.0")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
library("org.apache.httpcomponents:httpasyncclient:4.1")
testImplementation(testFixtures(project(":testing-common")))
}
Expand Down
5 changes: 3 additions & 2 deletions instrumentation/apache-httpclient-4.0/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,10 @@ val versions: Map<String, String> by extra

dependencies {
api(project(":instrumentation:java-streams"))
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-4.0:${versions["opentelemetry_java_agent"]}")
testImplementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions["opentelemetry_instrumentation_bom_alpha"]}"))
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-4.0")
library("org.apache.httpcomponents:httpclient:4.0")

testImplementation(testFixtures(project(":testing-common")))
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
}
10 changes: 6 additions & 4 deletions instrumentation/grpc-1.6/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ val versions: Map<String, String> by extra
val grpcVersion = "1.6.0"

dependencies {
api("io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:${versions["opentelemetry_java_agent"]}")
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-grpc-1.6:${versions["opentelemetry_java_agent"]}")
api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions["opentelemetry_instrumentation_bom_alpha"]}"))
api("io.opentelemetry.instrumentation:opentelemetry-grpc-1.6")
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-grpc-1.6")
implementation(project(":instrumentation:grpc-common"))
implementation(project(":shaded-protobuf-java-util", "shadow"))

Expand Down Expand Up @@ -128,9 +129,10 @@ for (version in listOf("1.30.0")) {
extendsFrom(configurations.runtimeClasspath.get())
}
dependencies {
versionedConfiguration(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions["opentelemetry_instrumentation_bom_alpha"]}"))
versionedConfiguration(testFixtures(project(":testing-common")))
versionedConfiguration("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-grpc-1.6:${versions["opentelemetry_java_agent"]}")
versionedConfiguration("io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:${versions["opentelemetry_java_agent"]}")
versionedConfiguration("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-grpc-1.6")
versionedConfiguration("io.opentelemetry.instrumentation:opentelemetry-grpc-1.6")
versionedConfiguration(project(":instrumentation:grpc-shaded-netty-1.9"))
versionedConfiguration(platform("io.grpc:grpc-bom:$version"))
versionedConfiguration("io.grpc:grpc-core")
Expand Down
5 changes: 3 additions & 2 deletions instrumentation/java-streams/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ afterEvaluate{
val versions: Map<String, String> by extra

dependencies {
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:${versions["opentelemetry"]}")
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions["opentelemetry_instrumentation_bom_alpha"]}"))
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
testImplementation(testFixtures(project(":testing-common")))
testImplementation("io.opentelemetry.javaagent:opentelemetry-muzzle:${versions["opentelemetry_java_agent"]}")
testImplementation("io.opentelemetry.javaagent:opentelemetry-muzzle")
}
7 changes: 4 additions & 3 deletions instrumentation/jaxrs-client-2.0/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,19 @@ val versions: Map<String, String> by extra

dependencies {
api(project(":instrumentation:java-streams"))
api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-http-url-connection:1.24.0-alpha")
api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions["opentelemetry_instrumentation_bom_alpha"]}"))
api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-http-url-connection")

compileOnly("javax.ws.rs:javax.ws.rs-api:2.0.1")

testImplementation(testFixtures(project(":testing-common")))
testImplementation("org.glassfish.jersey.core:jersey-client:2.27")
testImplementation("org.glassfish.jersey.inject:jersey-hk2:2.27")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")

testImplementation(project(":instrumentation:apache-httpclient-4.0"))
testImplementation(files(project(":instrumentation:apache-httpclient-4.0").dependencyProject.sourceSets.main.map { it.output }))
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-4.0:${versions["opentelemetry_java_agent"]}")
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-4.0")
testImplementation("org.jboss.resteasy:resteasy-client:3.0.5.Final")
// ^ This version has timeouts https://issues.redhat.com/browse/RESTEASY-975
testImplementation("org.apache.cxf:cxf-rt-rs-client:3.1.0")
Expand Down
7 changes: 4 additions & 3 deletions instrumentation/micronaut-1.0/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,17 @@ val micronautTestVersion = "1.0.0"

dependencies {
implementation(project(":instrumentation:netty:netty-4.1"))
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.1:${versions["opentelemetry_java_agent"]}")
testImplementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions["opentelemetry_instrumentation_bom_alpha"]}"))
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.1")
testImplementation(testFixtures(project(":testing-common")))
testImplementation("io.micronaut.test:micronaut-test-junit5:${micronautTestVersion}")
testImplementation("io.micronaut:micronaut-http-server-netty:${micronautVersion}")
testImplementation("io.micronaut:micronaut-runtime:${micronautVersion}")
testImplementation("io.micronaut:micronaut-inject:${micronautVersion}")
testImplementation("io.micronaut:micronaut-http-client:${micronautVersion}")
testAnnotationProcessor("io.micronaut:micronaut-inject-java:${micronautVersion}")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.1:${versions["opentelemetry_java_agent"]}")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.1")
}

val micronaut2Version = "2.2.3"
Expand Down
7 changes: 4 additions & 3 deletions instrumentation/micronaut-3.0/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ val micronautTestVersion = "3.0.5"

dependencies {
implementation(project(":instrumentation:netty:netty-4.1"))
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.1:${versions["opentelemetry_java_agent"]}")
testImplementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions["opentelemetry_instrumentation_bom_alpha"]}"))
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.1")
testImplementation(testFixtures(project(":testing-common")))
testImplementation("io.micronaut.test:micronaut-test-junit5:${micronautTestVersion}")
testImplementation("io.micronaut:micronaut-http-server-netty:${micronautVersion}")
Expand All @@ -22,6 +23,6 @@ dependencies {
testImplementation("io.micronaut.rxjava2:micronaut-rxjava2:1.1.0")
testImplementation("io.micronaut.rxjava2:micronaut-rxjava2-http-server-netty:1.1.0")
testImplementation("io.micronaut.rxjava2:micronaut-rxjava2-http-client:1.1.0")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.1:${versions["opentelemetry_java_agent"]}")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.1")
}
11 changes: 6 additions & 5 deletions instrumentation/netty/netty-4.0/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,12 @@ val versions: Map<String, String> by extra
val nettyVersion = "4.0.38.Final"

dependencies {
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.0:${versions["opentelemetry_java_agent"]}")
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4-common:${versions["opentelemetry_java_agent"]}")
implementation("io.opentelemetry.instrumentation:opentelemetry-netty-4-common:${versions["opentelemetry_java_agent"]}")
implementation("io.opentelemetry:opentelemetry-semconv:${versions["opentelemetry_semconv"]}")
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions["opentelemetry_instrumentation_bom_alpha"]}"))
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.0")
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4-common")
implementation("io.opentelemetry.instrumentation:opentelemetry-netty-4-common")
implementation("io.opentelemetry.semconv:opentelemetry-semconv")
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
compileOnly("io.netty:netty-codec-http:${nettyVersion}") {
version {
strictly(nettyVersion)
Expand Down
15 changes: 8 additions & 7 deletions instrumentation/netty/netty-4.1/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,14 @@ afterEvaluate{
val versions: Map<String, String> by extra

dependencies {
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4-common:${versions["opentelemetry_java_agent"]}")
implementation("io.opentelemetry.instrumentation:opentelemetry-netty-common:${versions["opentelemetry_java_agent"]}")
implementation("io.opentelemetry.instrumentation:opentelemetry-netty-4-common:${versions["opentelemetry_java_agent"]}")
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.1:${versions["opentelemetry_java_agent"]}")
implementation("io.opentelemetry.instrumentation:opentelemetry-netty-4.1:${versions["opentelemetry_java_agent"]}")
implementation("io.opentelemetry:opentelemetry-semconv:${versions["opentelemetry_semconv"]}")
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions["opentelemetry_instrumentation_bom_alpha"]}"))
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4-common")
implementation("io.opentelemetry.instrumentation:opentelemetry-netty-common")
implementation("io.opentelemetry.instrumentation:opentelemetry-netty-4-common")
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.1")
implementation("io.opentelemetry.instrumentation:opentelemetry-netty-4.1")
implementation("io.opentelemetry.semconv:opentelemetry-semconv")
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
library("io.netty:netty-codec-http:4.1.0.Final")

testImplementation(testFixtures(project(":testing-common")))
Expand Down
3 changes: 2 additions & 1 deletion instrumentation/okhttp/okhttp-3.0/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ val versions: Map<String, String> by extra

dependencies {
compileOnly("com.squareup.okhttp3:okhttp:3.0.0")
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-okhttp-3.0:${versions["opentelemetry_java_agent"]}")
testImplementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions["opentelemetry_instrumentation_bom_alpha"]}"))
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-okhttp-3.0")
testImplementation(testFixtures(project(":testing-common")))
}
17 changes: 9 additions & 8 deletions instrumentation/servlet/servlet-3.0/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,15 @@ afterEvaluate{
val versions: Map<String, String> by extra

dependencies {
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common:${versions["opentelemetry_java_agent"]}")
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0:${versions["opentelemetry_java_agent"]}") // Servlet3Accessor
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0:${versions["opentelemetry_java_agent"]}")
testImplementation("io.opentelemetry.javaagent:opentelemetry-muzzle:${versions["opentelemetry_java_agent"]}")
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:${versions["opentelemetry_java_agent"]}")
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions["opentelemetry_instrumentation_bom_alpha"]}"))
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common")
implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0") // Servlet3Accessor
testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0")
testImplementation("io.opentelemetry.javaagent:opentelemetry-muzzle")
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap")
compileOnly("javax.servlet:javax.servlet-api:3.1.0")
testRuntimeOnly("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap:${versions["opentelemetry_java_agent"]}")
muzzleBootstrap("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap:${versions["opentelemetry_java_agent"]}")
testRuntimeOnly("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap")
muzzleBootstrap("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap")

testImplementation(project(":instrumentation:servlet:servlet-rw"))
testImplementation(files(project(":instrumentation:servlet:servlet-rw").dependencyProject.sourceSets.main.map { it.output }))
Expand All @@ -47,5 +48,5 @@ dependencies {
}
testImplementation("org.eclipse.jetty:jetty-server:8.1.22.v20160922")
testImplementation("org.eclipse.jetty:jetty-servlet:8.1.22.v20160922")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
}
3 changes: 2 additions & 1 deletion instrumentation/servlet/servlet-rw/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ val versions: Map<String, String> by extra

dependencies {
testImplementation(testFixtures(project(":testing-common")))
testImplementation("io.opentelemetry.javaagent:opentelemetry-muzzle:${versions["opentelemetry_java_agent"]}")
testImplementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions["opentelemetry_instrumentation_bom_alpha"]}"))
testImplementation("io.opentelemetry.javaagent:opentelemetry-muzzle")
}
7 changes: 4 additions & 3 deletions instrumentation/spark-2.3/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@ val versions: Map<String, String> by extra
dependencies {
api(project(":instrumentation:servlet:servlet-3.0"))

testRuntimeOnly("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap:${versions["opentelemetry_java_agent"]}")
muzzleBootstrap("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap:${versions["opentelemetry_java_agent"]}")
api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions["opentelemetry_instrumentation_bom_alpha"]}"))
testRuntimeOnly("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap")
muzzleBootstrap("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap")

compileOnly("com.sparkjava:spark-core:2.3")

testImplementation(project(":instrumentation:servlet:servlet-rw"))
testImplementation(files(project(":instrumentation:servlet:servlet-rw").dependencyProject.sourceSets.main.map { it.output }))
testImplementation(testFixtures(project(":testing-common")))
testImplementation("com.sparkjava:spark-core:2.3")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:${versions["opentelemetry_semconv"]}")
testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
}
Loading
Loading