diff --git a/.github/workflows/release-layer-java.yml b/.github/workflows/release-layer-java.yml index d1160ce0cd..73dc4f6031 100644 --- a/.github/workflows/release-layer-java.yml +++ b/.github/workflows/release-layer-java.yml @@ -15,6 +15,7 @@ jobs: runs-on: ubuntu-latest outputs: JAVAAGENT_VERSION: ${{ steps.save-javaagent-version.outputs.JAVAAGENT_VERSION }} + JAVAWRAPPER_VERSION: ${{ steps.save-javawrapper-version.outputs.JAVAWRAPPER_VERSION }} steps: - uses: actions/checkout@v4 @@ -51,6 +52,14 @@ jobs: JAVAAGENT_VERSION=$(java -jar ./opentelemetry-javaagent.jar) echo "JAVAAGENT_VERSION=$JAVAAGENT_VERSION" >> $GITHUB_OUTPUT + - name: Save Java Wrapper Version + id: save-javawrapper-version + shell: bash + run: | + cd java + JAVAWRAPPER_VERSION=$(./gradlew layer-wrapper:printOtelJavaInstrumentationVersion -q) + echo "JAVAWRAPPER_VERSION=$JAVAWRAPPER_VERSION" >> $GITHUB_OUTPUT + publish-javaagent-layer: uses: ./.github/workflows/layer-publish.yml needs: build-layer @@ -106,9 +115,9 @@ jobs: - us-west-1 - us-west-2 with: - artifact-name: opentelemetry-java-wrapper.zip + artifact-name: opentelemetry-javawrapper-layer.zip layer-name: opentelemetry-javawrapper - component-version: "--" + component-version: ${{needs.build-layer.outputs.JAVAWRAPPER_VERSION}} # architecture: runtimes: java8.al2 java11 java17 release-group: prod diff --git a/java/layer-wrapper/build.gradle.kts b/java/layer-wrapper/build.gradle.kts index 756ef1bd68..b0721ee896 100644 --- a/java/layer-wrapper/build.gradle.kts +++ b/java/layer-wrapper/build.gradle.kts @@ -34,3 +34,9 @@ tasks { dependsOn(createLayer) } } + +tasks.register("printOtelJavaInstrumentationVersion") { + doLast { + println(project.configurations["runtimeClasspath"].resolvedConfiguration.resolvedArtifacts.find { it.name == "opentelemetry-aws-lambda-events-2.2" }?.moduleVersion?.id?.version) + } +}