diff --git a/RELEASING.md b/RELEASING.md index d3c55e5dd..afb1b8162 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -12,9 +12,9 @@ as the last step, which publishes a snapshot build to ## Release cadence -This repository roughly targets monthly minor releases from the `main` branch on the Tuesday after +This repository roughly targets monthly minor releases from the `main` branch on the Friday after the second Monday of the month (roughly a couple of days after the monthly minor release of -[opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)). +[opentelemetry-java-instrumentation](https://github.com/open-telemetry/opentelemetry-java-instrumentation)). ## Preparing a new major or minor release diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index dab81bd22..0bb0ec8da 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -7,13 +7,15 @@ data class DependencySet(val group: String, val version: String, val modules: Li val dependencyVersions = hashMapOf() rootProject.extra["versions"] = dependencyVersions +val otelInstrumentationVersion = "2.10.0-alpha" + val DEPENDENCY_BOMS = listOf( "com.fasterxml.jackson:jackson-bom:2.18.2", "com.google.guava:guava-bom:33.3.1-jre", "com.linecorp.armeria:armeria-bom:1.31.3", "org.junit:junit-bom:5.11.3", "io.grpc:grpc-bom:1.69.0", - "io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha", + "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}", "org.testcontainers:testcontainers-bom:1.20.4" ) diff --git a/jmx-scraper/build.gradle.kts b/jmx-scraper/build.gradle.kts index 9b3201413..3b6cfcf0f 100644 --- a/jmx-scraper/build.gradle.kts +++ b/jmx-scraper/build.gradle.kts @@ -21,7 +21,7 @@ dependencies { runtimeOnly("io.opentelemetry:opentelemetry-exporter-otlp") runtimeOnly("io.opentelemetry:opentelemetry-exporter-logging") - implementation("io.opentelemetry.instrumentation:opentelemetry-jmx-metrics:2.10.0-alpha") + implementation("io.opentelemetry.instrumentation:opentelemetry-jmx-metrics") testImplementation("org.junit-pioneer:junit-pioneer") testImplementation("io.opentelemetry:opentelemetry-sdk-testing") diff --git a/runtime-attach/runtime-attach/build.gradle.kts b/runtime-attach/runtime-attach/build.gradle.kts index 89a295c8b..27927a7f0 100644 --- a/runtime-attach/runtime-attach/build.gradle.kts +++ b/runtime-attach/runtime-attach/build.gradle.kts @@ -11,19 +11,15 @@ val agent: Configuration by configurations.creating { isCanBeConsumed = false } -// can't use bom since that will cause conflicts when updating to the latest SDK version -// and before updating to the latest instrumentation version -val otelInstrumentationVersion = "2.10.0" - dependencies { implementation(project(":runtime-attach:runtime-attach-core")) - agent("io.opentelemetry.javaagent:opentelemetry-javaagent:$otelInstrumentationVersion") + agent("io.opentelemetry.javaagent:opentelemetry-javaagent") // Used by byte-buddy but not brought in as a transitive dependency. compileOnly("com.google.code.findbugs:annotations") - testImplementation("io.opentelemetry.javaagent:opentelemetry-javaagent:$otelInstrumentationVersion") - testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:$otelInstrumentationVersion") + testImplementation("io.opentelemetry.javaagent:opentelemetry-javaagent") + testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations") testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.assertj:assertj-core") } diff --git a/static-instrumenter/agent-extension/build.gradle.kts b/static-instrumenter/agent-extension/build.gradle.kts index cbb89476c..fb41b7169 100644 --- a/static-instrumenter/agent-extension/build.gradle.kts +++ b/static-instrumenter/agent-extension/build.gradle.kts @@ -8,20 +8,15 @@ otelJava { minJavaVersionSupported.set(JavaVersion.VERSION_11) } -// can't use bom since that will cause conflicts when updating to the latest SDK version -// and before updating to the latest instrumentation version -val otelInstrumentationVersion = "2.10.0" -val otelInstrumentationAlphaVersion = "2.10.0-alpha" - dependencies { annotationProcessor("com.google.auto.service:auto-service") compileOnly("com.google.auto.service:auto-service") - compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion") - compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:$otelInstrumentationVersion") - compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:$otelInstrumentationAlphaVersion") + compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling") + compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api") + compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api") compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure") - compileOnly("io.opentelemetry.javaagent:opentelemetry-muzzle:$otelInstrumentationAlphaVersion") + compileOnly("io.opentelemetry.javaagent:opentelemetry-muzzle") compileOnly(project(":static-instrumenter:bootstrap")) } diff --git a/static-instrumenter/agent-instrumenter/build.gradle.kts b/static-instrumenter/agent-instrumenter/build.gradle.kts index 3c7be87b7..eee36f9d1 100644 --- a/static-instrumenter/agent-instrumenter/build.gradle.kts +++ b/static-instrumenter/agent-instrumenter/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { implementation("org.slf4j:slf4j-api") runtimeOnly("org.slf4j:slf4j-simple") - javaagent("io.opentelemetry.javaagent:opentelemetry-javaagent:2.10.0") + javaagent("io.opentelemetry.javaagent:opentelemetry-javaagent") bootstrapLibs(project(":static-instrumenter:bootstrap")) javaagentLibs(project(":static-instrumenter:agent-extension"))