Skip to content

Commit dc10941

Browse files
authored
Fix release workflow for java wrapper (open-telemetry#1484)
* Fix release workflow for java wrapper Signed-off-by: Raphael Silva <rapphil@gmail.com> * Use the Java Wrapper Instrumentation version while publishing the layer Signed-off-by: Raphael Silva <rapphil@gmail.com> --------- Signed-off-by: Raphael Silva <rapphil@gmail.com>
1 parent fc5738c commit dc10941

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

.github/workflows/release-layer-java.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
outputs:
1717
JAVAAGENT_VERSION: ${{ steps.save-javaagent-version.outputs.JAVAAGENT_VERSION }}
18+
JAVAWRAPPER_VERSION: ${{ steps.save-javawrapper-version.outputs.JAVAWRAPPER_VERSION }}
1819
steps:
1920
- uses: actions/checkout@v4
2021

@@ -51,6 +52,14 @@ jobs:
5152
JAVAAGENT_VERSION=$(java -jar ./opentelemetry-javaagent.jar)
5253
echo "JAVAAGENT_VERSION=$JAVAAGENT_VERSION" >> $GITHUB_OUTPUT
5354
55+
- name: Save Java Wrapper Version
56+
id: save-javawrapper-version
57+
shell: bash
58+
run: |
59+
cd java
60+
JAVAWRAPPER_VERSION=$(./gradlew layer-wrapper:printOtelJavaInstrumentationVersion -q)
61+
echo "JAVAWRAPPER_VERSION=$JAVAWRAPPER_VERSION" >> $GITHUB_OUTPUT
62+
5463
publish-javaagent-layer:
5564
uses: ./.github/workflows/layer-publish.yml
5665
needs: build-layer
@@ -106,9 +115,9 @@ jobs:
106115
- us-west-1
107116
- us-west-2
108117
with:
109-
artifact-name: opentelemetry-java-wrapper.zip
118+
artifact-name: opentelemetry-javawrapper-layer.zip
110119
layer-name: opentelemetry-javawrapper
111-
component-version: "--"
120+
component-version: ${{needs.build-layer.outputs.JAVAWRAPPER_VERSION}}
112121
# architecture:
113122
runtimes: java8.al2 java11 java17
114123
release-group: prod

java/layer-wrapper/build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,9 @@ tasks {
3434
dependsOn(createLayer)
3535
}
3636
}
37+
38+
tasks.register("printOtelJavaInstrumentationVersion") {
39+
doLast {
40+
println(project.configurations["runtimeClasspath"].resolvedConfiguration.resolvedArtifacts.find { it.name == "opentelemetry-aws-lambda-events-2.2" }?.moduleVersion?.id?.version)
41+
}
42+
}

0 commit comments

Comments
 (0)