diff --git a/java/build.gradle.kts b/java/build.gradle.kts index 1362004e6..1fb24b15e 100644 --- a/java/build.gradle.kts +++ b/java/build.gradle.kts @@ -28,12 +28,12 @@ val javaagentDependency by configurations.creating { } dependencies { - compileOnly(platform("io.opentelemetry:opentelemetry-bom:1.29.0")) - compileOnly(platform("io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha")) + compileOnly(platform("io.opentelemetry:opentelemetry-bom:1.30.0")) + compileOnly(platform("io.opentelemetry:opentelemetry-bom-alpha:1.30.0-alpha")) // Already included in wrapper so compileOnly compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi") compileOnly("io.opentelemetry:opentelemetry-sdk-extension-aws") - javaagentDependency("software.amazon.opentelemetry:aws-opentelemetry-agent:1.29.0-adot-lambda1") + javaagentDependency("software.amazon.opentelemetry:aws-opentelemetry-agent:1.30.0-adot-lambda1") } tasks.register("download") { diff --git a/java/build.sh b/java/build.sh index 03a73064d..258301c20 100755 --- a/java/build.sh +++ b/java/build.sh @@ -4,10 +4,12 @@ SOURCEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" ## revert https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7970 +OTEL_VERSION="1.30.0" +ADOT_VERSION="1.30.0" git clone https://github.com/open-telemetry/opentelemetry-java-instrumentation.git pushd opentelemetry-java-instrumentation -git checkout v1.29.0 -b tag-v1.29.0 +git checkout v${OTEL_VERSION} -b tag-v${OTEL_VERSION} patch -p1 < "$SOURCEDIR"/../patches/opentelemetry-java-instrumentation.patch git add -A git commit -m "Create patch version" @@ -21,11 +23,11 @@ git clone https://github.com/aws-observability/aws-otel-java-instrumentation.git pushd aws-otel-java-instrumentation -git checkout v1.29.0 -b tag-v1.29.0 +git checkout v${ADOT_VERSION} -b tag-v${ADOT_VERSION} patch -p1 < "${SOURCEDIR}"/../patches/aws-otel-java-instrumentation.patch git add -A git commit -a -m "Create patch version" -CI=false ./gradlew publishToMavenLocal -Prelease.version=1.29.0-adot-lambda1 +CI=false ./gradlew publishToMavenLocal -Prelease.version=${ADOT_VERSION}-adot-lambda1 popd rm -rf aws-otel-java-instrumentation diff --git a/opentelemetry-lambda b/opentelemetry-lambda index 8d43b4655..e4e53cb6a 160000 --- a/opentelemetry-lambda +++ b/opentelemetry-lambda @@ -1 +1 @@ -Subproject commit 8d43b46558c7e250634acf88ee8b212b75cb583f +Subproject commit e4e53cb6a49baa3feb55db4a69375864eb8c23f7 diff --git a/patches/aws-otel-java-instrumentation.patch b/patches/aws-otel-java-instrumentation.patch index 8f2ad1de1..efe04461a 100644 --- a/patches/aws-otel-java-instrumentation.patch +++ b/patches/aws-otel-java-instrumentation.patch @@ -6,8 +6,8 @@ index b7226fb..f1658cd 100644 val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true" // This is the version of the upstream instrumentation BOM --val otelVersion = "1.29.0" -+val otelVersion = "1.29.0-adot-lambda1" - val otelSnapshotVersion = "1.30.0" +-val otelVersion = "1.30.0" ++val otelVersion = "1.30.0-adot-lambda1" + val otelSnapshotVersion = "1.31.0" val otelAlphaVersion = if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT" val otelJavaAgentVersion = if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT" diff --git a/patches/opentelemetry-java-instrumentation.patch b/patches/opentelemetry-java-instrumentation.patch index 89753c42e..820968cee 100644 --- a/patches/opentelemetry-java-instrumentation.patch +++ b/patches/opentelemetry-java-instrumentation.patch @@ -604,10 +604,10 @@ index cc1414c0bf..db8a59b046 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -1,5 +1,5 @@ --val stableVersion = "1.29.0" --val alphaVersion = "1.29.0-alpha" -+val stableVersion = "1.29.0-adot-lambda1" -+val alphaVersion = "1.29.0-adot-lambda1-alpha" +-val stableVersion = "1.30.0" +-val alphaVersion = "1.30.0-alpha" ++val stableVersion = "1.30.0-adot-lambda1" ++val alphaVersion = "1.30.0-adot-lambda1-alpha" allprojects { if (findProperty("otel.stable") != "true") { diff --git a/patches/opentelemetry-lambda_java.patch b/patches/opentelemetry-lambda_java.patch index a59301582..2fda397dd 100644 --- a/patches/opentelemetry-lambda_java.patch +++ b/patches/opentelemetry-lambda_java.patch @@ -19,8 +19,8 @@ index b0ec233..5c2f919 100644 data class DependencySet(val group: String, val version: String, val modules: List) val DEPENDENCY_BOMS = listOf( -- "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha", -+ "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-adot-lambda1-alpha", +- "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha", ++ "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-adot-lambda1-alpha", "org.apache.logging.log4j:log4j-bom:2.20.0", "software.amazon.awssdk:bom:2.20.69" ) @@ -28,8 +28,8 @@ index b0ec233..5c2f919 100644 "com.amazonaws:aws-lambda-java-core:1.2.2", "com.amazonaws:aws-lambda-java-events:3.11.2", "com.squareup.okhttp3:okhttp:4.11.0", -- "io.opentelemetry.javaagent:opentelemetry-javaagent:1.29.0" -+ "io.opentelemetry.javaagent:opentelemetry-javaagent:1.29.0-adot-lambda1" +- "io.opentelemetry.javaagent:opentelemetry-javaagent:1.30.0" ++ "io.opentelemetry.javaagent:opentelemetry-javaagent:1.30.0-adot-lambda1" ) javaPlatform {