feat(ruby): build and release layer for both amd64 and arm64 architec… #2349
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,49 @@ | ||
| name: 'Build Ruby Lambda Layer' | ||
| description: 'Builds the OpenTelemetry Ruby Lambda layer' | ||
|
|
||
| inputs: | ||
| architecture: | ||
| description: 'Target architecture (amd64 or arm64)' | ||
| required: false | ||
| default: amd64 | ||
|
|
||
| outputs: | ||
| artifact-path: | ||
| description: 'Absolute path to the layer zip artifact' | ||
| value: ${{ github.workspace }}/ruby/src/build/opentelemetry-ruby-layer-${{ inputs.architecture }}.zip | ||
| component-version: | ||
| description: 'OpenTelemetry Ruby SDK version included in the layer' | ||
| value: ${{ steps.version.outputs.component-version || steps.version-skip.outputs.component-version }} | ||
|
|
||
| runs: | ||
| using: composite | ||
| steps: | ||
| - name: Set up QEMU for cross-platform builds | ||
| uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0 | ||
|
|
||
| - name: Set up Docker Buildx | ||
| uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 | ||
|
|
||
| - name: Build Ruby layer | ||
| shell: bash | ||
| working-directory: ruby/src | ||
| env: | ||
| ARCH: ${{ inputs.architecture }} | ||
| run: ./build.sh | ||
|
|
||
| - name: Save Ruby OpenTelemetry SDK version | ||
| if: ${{ inputs.architecture == 'amd64' }} | ||
| id: version | ||
| shell: bash | ||
| working-directory: ruby/src | ||
| run: | | ||
| unzip -q build/opentelemetry-ruby-layer-amd64.zip | ||
| export GEM_PATH=$PWD/ruby/gems/3.3.0/ | ||
| SDK_VERSION=$(ruby -e 'require "opentelemetry-sdk"; puts OpenTelemetry::SDK::VERSION') | ||
| echo "component-version=$SDK_VERSION" >> "$GITHUB_OUTPUT" | ||
|
|
||
| - name: Skip version output for non-amd64 | ||
| if: ${{ inputs.architecture != 'amd64' }} | ||
| id: version-skip | ||
| shell: bash | ||
| run: echo "component-version=" >> "$GITHUB_OUTPUT" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,20 +12,52 @@ permissions: | |
| jobs: | ||
| build-layer: | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| architecture: | ||
| - amd64 | ||
| - arm64 | ||
| steps: | ||
| - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 | ||
|
|
||
| - uses: ./.github/actions/build-ruby-layer | ||
| id: build | ||
| with: | ||
| architecture: ${{ matrix.architecture }} | ||
|
|
||
| - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 | ||
| name: Save assembled layer to build | ||
| with: | ||
| name: opentelemetry-ruby-layer-${{ matrix.architecture }}.zip | ||
| path: ${{ steps.build.outputs.artifact-path }} | ||
|
|
||
| - name: Save component version to file (amd64 only) | ||
| if: ${{ matrix.architecture == 'amd64' }} | ||
| shell: bash | ||
| run: echo "${{ steps.build.outputs.component-version }}" > component-version.txt | ||
|
|
||
| - name: Upload component version artifact (amd64 only) | ||
| if: ${{ matrix.architecture == 'amd64' }} | ||
| uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 | ||
| with: | ||
| name: ruby-component-version | ||
| path: component-version.txt | ||
|
|
||
| get-version: | ||
| runs-on: ubuntu-latest | ||
| needs: [build-layer] | ||
| outputs: | ||
| component-version: ${{ steps.read-version.outputs.version }} | ||
| steps: | ||
| - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1 | ||
| with: | ||
| name: ruby-component-version | ||
|
|
||
| - id: read-version | ||
| shell: bash | ||
| run: echo "version=$(cat component-version.txt)" >> "$GITHUB_OUTPUT" | ||
|
|
||
|
Member
There was a problem hiding this comment. Same comment here, can we please take a look at the collector release workflow? I'm not convinced that we need all of this stuff.
Author
There was a problem hiding this comment. Hi @wpessers, Thanks for your patience and for pointing me back to the collector pattern , that was definitely the right approach. For For the |
||
| integration-test: | ||
| permissions: | ||
| contents: read | ||
|
|
@@ -52,21 +84,30 @@ jobs: | |
|
|
||
| - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1 | ||
| with: | ||
| name: opentelemetry-ruby-layer-amd64.zip | ||
|
|
||
| - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1 | ||
| with: | ||
| name: opentelemetry-ruby-layer-arm64.zip | ||
|
|
||
| - name: Add Binaries to Release | ||
| run: | | ||
| gh release upload ${{ github.ref_name }} opentelemetry-ruby-layer-amd64.zip | ||
| gh release upload ${{ github.ref_name }} opentelemetry-ruby-layer-arm64.zip | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| publish-layer: | ||
| permissions: | ||
| contents: read | ||
| id-token: write | ||
| uses: ./.github/workflows/layer-publish.yml | ||
| needs: [build-layer, create-release, get-version] | ||
| strategy: | ||
| matrix: | ||
| architecture: | ||
| - amd64 | ||
| - arm64 | ||
| aws_region: | ||
| - af-south-1 | ||
| - ap-east-1 | ||
|
|
@@ -103,9 +144,10 @@ jobs: | |
| - us-west-1 | ||
| - us-west-2 | ||
| with: | ||
| artifact-name: opentelemetry-ruby-layer-${{ matrix.architecture }}.zip | ||
| layer-name: opentelemetry-ruby | ||
| component-version: ${{ needs.get-version.outputs.component-version }} | ||
| architecture: ${{ matrix.architecture }} | ||
| runtimes: ruby3.3 ruby3.4 | ||
| release-group: prod | ||
| aws_region: ${{ matrix.aws_region }} | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,16 @@ | ||
| #!/bin/sh | ||
| set -e | ||
|
|
||
| ARCH=${ARCH:-amd64} | ||
| PLATFORM="linux/${ARCH}" | ||
|
|
||
| mkdir -p build | ||
|
|
||
| docker build --progress plain --platform "$PLATFORM" \ | ||
| -t "aws-otel-lambda-ruby-layer-${ARCH}" otel | ||
|
|
||
| docker run --rm --platform "$PLATFORM" \ | ||
| -v "$(pwd)/build:/out" \ | ||
| "aws-otel-lambda-ruby-layer-${ARCH}" | ||
|
|
||
| mv build/opentelemetry-ruby-layer.zip "build/opentelemetry-ruby-layer-${ARCH}.zip" |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I find this quite confusing, you seem to have done a lot of work here and in the release workflow to skip outputting the version. IIRC the collector release has the same matrixed amd64/arm64 build and handles this with no such extra logic. As I said earlier, might be worth taking a look how the collector builds / releases are setup. Let me reiterate that you're basically building the same mechanism that is already in place there.