From 7dc7a31bd0c707d1f9a01f798191f710263c0239 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 6 Dec 2024 14:27:05 -0800 Subject: [PATCH] Change to release after SDK and before Instrumentation --- RELEASING.md | 4 ++-- dependencyManagement/build.gradle.kts | 10 +--------- jmx-scraper/build.gradle.kts | 2 +- resource-providers/build.gradle.kts | 4 ---- runtime-attach/runtime-attach/build.gradle.kts | 10 +++++++--- .../agent-extension/build.gradle.kts | 13 +++++++++---- .../agent-instrumenter/build.gradle.kts | 2 +- 7 files changed, 21 insertions(+), 24 deletions(-) diff --git a/RELEASING.md b/RELEASING.md index afb1b8162..d3c55e5dd 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 Friday after +This repository roughly targets monthly minor releases from the `main` branch on the Tuesday after the second Monday of the month (roughly a couple of days after the monthly minor release of -[opentelemetry-java-instrumentation](https://github.com/open-telemetry/opentelemetry-java-instrumentation)). +[opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)). ## Preparing a new major or minor release diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 642f53f32..2a6aea5bb 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -7,15 +7,13 @@ 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.2", "org.junit:junit-bom:5.11.3", "io.grpc:grpc-bom:1.68.2", - "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}", + "io.opentelemetry:opentelemetry-bom-alpha:1.44.1-alpha", "org.testcontainers:testcontainers-bom:1.20.4" ) @@ -78,12 +76,6 @@ javaPlatform { dependencies { for (bom in DEPENDENCY_BOMS) { - // this is needed until io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha - // is updated to contain the latest version of opentelemetry-semconv - if (bom.equals("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}")) { - api(platform(bom)) - continue - } api(enforcedPlatform(bom)) val split = bom.split(':') dependencyVersions[split[0]] = split[2] diff --git a/jmx-scraper/build.gradle.kts b/jmx-scraper/build.gradle.kts index 61f33dfbe..f91fc8e79 100644 --- a/jmx-scraper/build.gradle.kts +++ b/jmx-scraper/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { runtimeOnly("io.opentelemetry:opentelemetry-exporter-otlp") runtimeOnly("io.opentelemetry:opentelemetry-exporter-logging") - implementation("io.opentelemetry.instrumentation:opentelemetry-jmx-metrics") + implementation("io.opentelemetry.instrumentation:opentelemetry-jmx-metrics:2.10.0-alpha") testImplementation("org.junit-pioneer:junit-pioneer") testImplementation("io.opentelemetry:opentelemetry-sdk-testing") diff --git a/resource-providers/build.gradle.kts b/resource-providers/build.gradle.kts index 0a816d7ae..1dc20be51 100644 --- a/resource-providers/build.gradle.kts +++ b/resource-providers/build.gradle.kts @@ -15,11 +15,7 @@ dependencies { compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure") compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi") compileOnly("io.opentelemetry.semconv:opentelemetry-semconv") - compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling") testImplementation("io.opentelemetry.semconv:opentelemetry-semconv") testImplementation("com.google.auto.service:auto-service") testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure") - testImplementation("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling") { - exclude("io.opentelemetry.javaagent", "opentelemetry-javaagent-tooling-java9") - } } diff --git a/runtime-attach/runtime-attach/build.gradle.kts b/runtime-attach/runtime-attach/build.gradle.kts index 27927a7f0..89a295c8b 100644 --- a/runtime-attach/runtime-attach/build.gradle.kts +++ b/runtime-attach/runtime-attach/build.gradle.kts @@ -11,15 +11,19 @@ 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") + agent("io.opentelemetry.javaagent:opentelemetry-javaagent:$otelInstrumentationVersion") // Used by byte-buddy but not brought in as a transitive dependency. compileOnly("com.google.code.findbugs:annotations") - testImplementation("io.opentelemetry.javaagent:opentelemetry-javaagent") - testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations") + testImplementation("io.opentelemetry.javaagent:opentelemetry-javaagent:$otelInstrumentationVersion") + testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:$otelInstrumentationVersion") 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 fb41b7169..cbb89476c 100644 --- a/static-instrumenter/agent-extension/build.gradle.kts +++ b/static-instrumenter/agent-extension/build.gradle.kts @@ -8,15 +8,20 @@ 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") - compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api") - compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api") + 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:opentelemetry-sdk-extension-autoconfigure") - compileOnly("io.opentelemetry.javaagent:opentelemetry-muzzle") + compileOnly("io.opentelemetry.javaagent:opentelemetry-muzzle:$otelInstrumentationAlphaVersion") compileOnly(project(":static-instrumenter:bootstrap")) } diff --git a/static-instrumenter/agent-instrumenter/build.gradle.kts b/static-instrumenter/agent-instrumenter/build.gradle.kts index eee36f9d1..3c7be87b7 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") + javaagent("io.opentelemetry.javaagent:opentelemetry-javaagent:2.10.0") bootstrapLibs(project(":static-instrumenter:bootstrap")) javaagentLibs(project(":static-instrumenter:agent-extension"))