Skip to content

update otel to 1.32.0 #400

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

Closed
kishansairam9 wants to merge 12 commits into from
Closed

update otel to 1.32.0 #400

Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Revert "move to 11" 
This reverts commit 1ee6ddc.
  • Loading branch information
kishansairam9 committed Jan 23, 2024
commit c21cfdb1c88cc1d289c44c3f5dfcd3fc461c4b18
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ subprojects {
apply(from = "$rootDir/gradle/spotless.gradle")
pluginManager.withPlugin("java-library") {
configure<JavaPluginExtension> {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

repositories {
Expand Down
9 changes: 9 additions & 0 deletions otel-extensions/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,15 @@ dependencies {
implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling") {
constraints {
implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling-java9") {
attributes {
// this transitive dependency creates classes compatible with Java 9 and up, but is only referenced in safe ways for
// java 8 by the javaagent-tooling dependency
attribute(Attribute.of("org.gradle.jvm.version", Integer::class.java), 9 as Integer)
}
}
}
exclude("io.opentelemetry.javaagent", "opentelemetry-javaagent-bootstrap")
}

Expand Down
12 changes: 11 additions & 1 deletion testing-common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,17 @@ dependencies {
testFixturesApi("com.squareup.okhttp3:logging-interceptor:4.9.0")
testFixturesImplementation("io.opentelemetry:opentelemetry-exporter-logging")
testFixturesImplementation("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap")
testFixturesImplementation("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")
testFixturesImplementation("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling") {
constraints {
testFixturesImplementation("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling-java9") {
attributes {
// this transitive dependency creates classes compatible with Java 9 and up, but is only referenced in safe ways for
// java 8 by the javaagent-tooling dependency
attribute(Attribute.of("org.gradle.jvm.version", Integer::class.java), 9 as Integer)
}
}
}
}
testFixturesImplementation("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
testFixturesImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
testFixturesImplementation("ch.qos.logback:logback-classic:1.4.6")
Expand Down