test

Author: xuan-cao-swi

.github/workflows/build_publish_lambda_layer.yml

@@ -51,7 +51,7 @@ jobs:
           GITHUB_RUBY_TOKEN: ${{ secrets.PACKAGE_GITHUB_TOKEN }}
           SOLARWINDS_SOURCE: ${{ github.event.inputs.solarwinds-source }}
           PUBLISH_DEST: ${{ github.event.inputs.publish-dest }}
-          ALLOWED_RUBY_VERSION: ${{ github.event.inputs.ruby-version }}
+          ALLOWED_RUBY_VERSION: '3.4'
 
       - name: Show directory contents
         run: |
@@ -64,18 +64,59 @@ jobs:
           name: ruby-layer.zip
           path: lambda/build/ruby-layer.zip
 
+  build_bigdecimal_arm64:
+    needs:
+      - build_layer
+    runs-on: fromJSON('{"group":"apm-arm-runner"}')
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build ruby lambda layer on arm64 machine
+        run: |
+          uname -a
+          ./build.sh
+        shell: bash
+        working-directory: lambda/
+        env:
+          GITHUB_RUBY_TOKEN: ${{ secrets.PACKAGE_GITHUB_TOKEN }}
+          SOLARWINDS_SOURCE: ${{ github.event.inputs.solarwinds-source }}
+          PUBLISH_DEST: ${{ github.event.inputs.publish-dest }}
+          ALLOWED_RUBY_VERSION: '3.4'
+          BIGDECIMAL: true
+
+    - name: extract layer zip from artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: ruby-layer.zip
+          path: lambda/build
+
+    - name: Combine to single layer
+      run: |
+        unzip ruby-layer.zip
+        mkdir -p bigdecimal
+        unzip -d bigdecimal/ bigdecimal-aarch64.zip
+        mkdir -p ruby/gems/3.4.0/extensions/aarch64-linux/
+        mv bigdecimal/ruby/gems/3.4.0/extensions/aarch64-linux/3.4.0/bigdecimal-*/ ruby/gems/3.4.0/extensions/aarch64-linux/3.4.0/
+        zip -qr ruby-layer.zip ruby/ solarwinds-apm/ otel_wrapper.rb
+      working-directory: lambda/build
+
+    - name: Upload to artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ruby-layer.zip
+          path: lambda/build/ruby-layer.zip
+
   # extract the built layer from artifacts, then scan it with reverselab
   reverselab_scan_layer:
+    if: false  # Disable this job
     needs:
-      - build_layer
+      - build_bigdecimal_arm64
     runs-on: ubuntu-latest
 
     outputs:
       apm_ruby_version: ${{ steps.version.outputs.SOLARWINDS_APM_VERSION }}
 
-    strategy:
-      fail-fast: false
-
     steps:
       - uses: actions/checkout@v4
 
@@ -122,6 +163,7 @@ jobs:
 
   # extract the built layer from artifacts, then publish it based on region
   publish_layer:
+    if: false  # Disable this job
     needs:
       - reverselab_scan_layer
     runs-on: ubuntu-latest

lambda/build.sh

@@ -27,11 +27,17 @@ for ruby_version in $ALLOWED_RUBY_VERSION; do
 done
 
 cd build/
-mkdir solarwinds-apm && mkdir ruby && mkdir ruby/gems
+mkdir -p ruby/gems
 
 for ruby_version in $ALLOWED_RUBY_VERSION; do
   unzip -q gems-$ruby_version.0.zip -d ruby/gems/
 done
 
-cp ../otel/layer/otel_wrapper.rb . && cp ../otel/layer/wrapper solarwinds-apm/
-zip -qr ruby-layer.zip ruby/ solarwinds-apm/ otel_wrapper.rb
+if [ $BIGDECIMAL = 'true' ]; then
+  zip -qr bigdecimal-aarch64.zip ruby/gems/3.4.0/extensions/aarch64-linux/3.4.0/bigdecimal-*/
+  rm -rf ruby/
+else
+  mkdir solarwinds-apm
+  cp ../otel/layer/otel_wrapper.rb . && cp ../otel/layer/wrapper solarwinds-apm/
+  zip -qr ruby-layer.zip ruby/ solarwinds-apm/ otel_wrapper.rb
+fi