Introduce architecture specific packages

.github/workflows/build.yml

@@ -483,11 +483,23 @@ jobs:
           printf '%s' "${{ needs.list-python-versions.outputs.versions }}" | jq -r '.[]' | while read -r version; do
             cat src/DEBIAN/triggers | grep 'python3$' | sed "s~/python3~/python$version~g" >> src/DEBIAN/triggers
           done
-      - run: cd src && dpkg-deb --root-owner-group -Zgzip --build . ../package.deb
+      - run: |
+          cd src
+          replaced_binaries="$(mktemp -d)"
+          mv usr/share/opentelemetry_shell/agent.instrumentation.http/* "$replaced_binaries"
+          dpkg-deb --root-owner-group -Zgzip --build . ../opentelemetry-shell_"$(cat ../VERSION)"_all.deb
+          ls "$replaced_binaries" | while read -r arch; do
+            debian_arch="$(echo "$arch" | sed s/x86_64/amd64/g | sed s/aarch64/arm64/g | sed 's/le$/el/g')"
+            cp "$replaced_binaries"/"$arch"/*.so usr/share/opentelemetry_shell/agent.instrumentation.http
+            sed -i "s/Architecture: .*/Architecture: $debian_arch/g" DEBIAN/control
+            dpkg-deb --root-owner-group -Zgzip --build . ../opentelemetry-shell_"$(cat ../VERSION)"_"$debian_arch".deb
+            rm usr/share/opentelemetry_shell/agent.instrumentation.http/*.so
+          done
       - uses: actions/upload-artifact@v7.0.0
         with:
-          name: package.deb_${{ inputs.ref }}
-          path: package.deb
+          name: packages.deb.${{ inputs.ref }}
+          path: opentelemetry-shell_*_*.deb
+          if-no-files-found: error
 
   verify-rpm-python-dependency:
     runs-on: ubuntu-slim
@@ -529,14 +541,6 @@ jobs:
       - uses: actions/checkout@v6.0.2
         with:
           ref: ${{ inputs.ref }}
-      - run: |
-          {
-            find src -iname 'Dockerfile' -type f
-            find src -iname '*.c' -type f
-            find src -iname '*.java' -type f
-            find src -iname 'manifest.txt' -type f
-            find src -iname 'pom.xml' -type f
-          } | xargs -r rm
       - uses: actions/download-artifact@v8.0.1
         with:
           name: http_${{ inputs.ref }}
@@ -553,42 +557,58 @@ jobs:
         with:
           name: java_${{ inputs.ref }}
           path: src/usr/share/opentelemetry_shell/agent.instrumentation.java
-      - run: cp meta/rpm/opentelemetry-shell.spec .
-      - run: sed -i "s/__VERSION__/$(cat VERSION)/g" opentelemetry-shell.spec
       - run: |
-          cat meta/debian/triggers | grep -v '^$' | cut -d ' ' -f 2 | rev | cut -d / -f 1 | rev | sort -u | grep -v python3 | while read -r package; do
-            echo "%triggerin -- $package"
-            echo '#/bin/sh -e'
-            echo 'if [ "$1" = 0 ] || [ "$1" = 1 ] || [ "$1" = 2 ]; then set -- configure; fi'
-            cat meta/debian/postinst
-            echo "%triggerun -- $package"
-            echo '#/bin/sh -e'
-            echo 'if [ "$1" = 0 ] || [ "$1" = 1 ] || [ "$1" = 2 ]; then set -- configure; fi'
-            cat meta/debian/postinst
-          done >> opentelemetry-shell.spec
-          {
-            echo "%post"
-            echo '#/bin/sh -e'
-            echo 'if [ "$1" = 0 ] || [ "$1" = 1 ] || [ "$1" = 2 ]; then set -- configure; fi'
-            cat meta/debian/postinst
-          } >> opentelemetry-shell.spec
-          {
-            echo "%preun"
-            echo '#!/bin/sh -e'
-            echo 'if [ "$1" = 0 ]; then set -- remove; fi'
-            echo 'if [ "$1" = 1 ]; then set -- upgrade; fi'
-            cat meta/debian/prerm
-          } >> opentelemetry-shell.spec
-          {
-            echo '%files'
-            ( cd src && find . | grep -v '.spec$' | while read -r file; do echo "${file#.}"; done | grep -v '^$' | while read -r file; do if [ -d "$file" ]; then if ! echo "$file" | grep opentelemetry-shell; then continue; fi; echo -n '%dir '; fi; echo \""$file"\"; done )
-          } >> opentelemetry-shell.spec
-          rpmbuild -bb --buildroot="$(pwd)/src" opentelemetry-shell.spec
-          mv /home/runner/rpmbuild/RPMS/noarch/opentelemetry-shell-*.noarch.rpm package.rpm
+          replaced_binaries="$(mktemp -d)"
+          mv src/usr/share/opentelemetry_shell/agent.instrumentation.http/*/ "$replaced_binaries"
+          { echo noarch; ls "$replaced_binaries"; } | while read -r arch; do
+            rm -rf src/tmp.* /home/runner/rpmbuild
+            git checkout .
+            {
+              find src -iname 'Dockerfile' -type f
+              find src -iname '*.c' -type f
+              find src -iname '*.java' -type f
+              find src -iname 'manifest.txt' -type f
+              find src -iname 'pom.xml' -type f
+            } | xargs -r rm
+            cp meta/rpm/opentelemetry-shell.spec .
+            sed -i "s/__VERSION__/$(cat VERSION)/g" opentelemetry-shell.spec
+            # sed -i "s/BuildArch: .*/BuildArch: $arch/g" opentelemetry-shell.spec
+            [ "$arch" = noarch ] || cp "$replaced_binaries"/"$arch"/*.so src/usr/share/opentelemetry_shell/agent.instrumentation.http
+            cat meta/debian/triggers | grep -v '^$' | cut -d ' ' -f 2 | rev | cut -d / -f 1 | rev | sort -u | grep -v python3 | while read -r package; do
+              echo "%triggerin -- $package"
+              echo '#/bin/sh -e'
+              echo 'if [ "$1" = 0 ] || [ "$1" = 1 ] || [ "$1" = 2 ]; then set -- configure; fi'
+              cat meta/debian/postinst
+              echo "%triggerun -- $package"
+              echo '#/bin/sh -e'
+              echo 'if [ "$1" = 0 ] || [ "$1" = 1 ] || [ "$1" = 2 ]; then set -- configure; fi'
+              cat meta/debian/postinst
+            done >> opentelemetry-shell.spec
+            {
+              echo "%post"
+              echo '#/bin/sh -e'
+              echo 'if [ "$1" = 0 ] || [ "$1" = 1 ] || [ "$1" = 2 ]; then set -- configure; fi'
+              cat meta/debian/postinst
+            } >> opentelemetry-shell.spec
+            {
+              echo "%preun"
+              echo '#!/bin/sh -e'
+              echo 'if [ "$1" = 0 ]; then set -- remove; fi'
+              echo 'if [ "$1" = 1 ]; then set -- upgrade; fi'
+              cat meta/debian/prerm
+            } >> opentelemetry-shell.spec
+            {
+              echo '%files'
+              ( cd src && find . | grep -v '.spec$' | while read -r file; do echo "${file#.}"; done | grep -v '^$' | while read -r file; do if [ -d "$file" ]; then if ! echo "$file" | grep opentelemetry-shell; then continue; fi; echo -n '%dir '; fi; echo \""$file"\"; done )
+            } >> opentelemetry-shell.spec
+            rpmbuild -bb --buildroot="$(pwd)/src" opentelemetry-shell.spec
+            mv /home/runner/rpmbuild/RPMS/noarch/opentelemetry-shell-"$(cat VERSION)"-1.noarch.rpm opentelemetry-shell-"$(cat VERSION)"-1."$arch".rpm
+          done
       - uses: actions/upload-artifact@v7.0.0
         with:
-          name: package.rpm_${{ inputs.ref }}
-          path: package.rpm
+          name: packages.rpm.${{ inputs.ref }}
+          path: opentelemetry-shell-*.*.rpm
+          if-no-files-found: error
 
   build-apk:
     needs: [verify-scripts, merge-node-modules, merge-python-site-packages, build-java-agents]
@@ -636,35 +656,15 @@ jobs:
           cat meta/debian/prerm >> "$workspace"/opentelemetry-shell.pre-upgrade
           cp -r src "$workspace"/my_src
           echo 'cd ~/workspace && apk add abuild && SUDO=env abuild-keygen -a -i -n && abuild -F -r && find ~/packages -iname '\''*.apk'\'' | xargs -I "{}" mv "{}" .' | \sudo docker run --rm --network host -v "$workspace":/root/workspace -i alpine:latest
-          mv "$workspace"/*.apk package.apk
+          mv "$workspace"/*.apk .
       - uses: actions/upload-artifact@v7.0.0
         with:
-          name: package.apk_${{ inputs.ref }}
-          path: package.apk
-  merge-packages:
-    needs: [build-deb, build-rpm, build-apk]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      actions: read
-    steps:
-      - uses: plengauer/opentelemetry-github/actions/instrument/job@v5.50.0
-        env:
-          OTEL_EXPORTER_OTLP_ENDPOINT: ${{ secrets.OTEL_EXPORTER_OTLP_ENDPOINT }}
-          OTEL_EXPORTER_OTLP_HEADERS: ${{ secrets.OTEL_EXPORTER_OTLP_HEADERS }}
-        with:
-          secrets_to_redact: '["${{ github.token }}"]'
-      - uses: actions/download-artifact@v8.0.1
-        with:
-          pattern: package.*
-          merge-multiple: true
-      - uses: actions/upload-artifact@v7.0.0
-        with:
-          name: packages_${{ inputs.ref }}
-          path: package.*
+          name: packages.apk.${{ inputs.ref }}
+          path: opentelemetry-shell-*.apk
+          if-no-files-found: error
 
   build-workflow-image:
-    needs: [build-apk]
+    needs: build-apk
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -681,15 +681,15 @@ jobs:
           ref: ${{ inputs.ref }}
       - uses: actions/download-artifact@v8.0.1
         with:
-          name: package.apk_${{ inputs.ref }}
+          name: packages.apk.${{ inputs.ref }}
       - run: |
-          cp package.apk actions/instrument/workflow
+          cp *.apk actions/instrument/workflow
           pushd actions/instrument/workflow
           sudo docker build --build-arg=repository="$GITHUB_REPOSITORY" --network host --tag opentelemetry-github-workflow-instrumentation-runner .
           popd
           sudo docker save opentelemetry-github-workflow-instrumentation-runner > opentelemetry-github-workflow-instrumentation-runner.image
-          rm actions/instrument/workflow/package.apk
+          rm actions/instrument/workflow/*.apk
       - uses: actions/upload-artifact@v7.0.0
         with:
-          name: images_${{ inputs.ref }}
+          name: images.${{ inputs.ref }}
           path: '*.image'

.github/workflows/publish.yml

@@ -59,7 +59,7 @@ jobs:
     uses: ./.github/workflows/ci.yml
     with:
       ref: ${{ matrix.ref }}
-    
+
   publish:
     needs: [ setup, ci ]
     strategy:
@@ -75,34 +75,34 @@ jobs:
     steps:
       - uses: plengauer/opentelemetry-github/actions/instrument/job@v5.50.0
         with:
-          secrets_to_redact: '${{ github.token }}
-
-            ${{ secrets.ACTIONS_GITHUB_TOKEN }}'
+          secrets_to_redact: |-
+            ${{ github.token }}
+            ${{ secrets.ACTION_GITHUB_TOKEN }}
         env:
           OTEL_EXPORTER_OTLP_ENDPOINT: '${{ secrets.OTEL_EXPORTER_OTLP_ENDPOINT }}'
           OTEL_EXPORTER_OTLP_HEADERS: '${{ secrets.OTEL_EXPORTER_OTLP_HEADERS }}'
-
       - uses: actions/checkout@v6.0.2
         with:
           ref: ${{ matrix.ref }}
       - run: echo "version=$(cat VERSION)" >> "$GITHUB_OUTPUT"
         id: version
       - uses: actions/download-artifact@v8.0.1
         with:
-          name: packages_${{ matrix.ref }}
+          name: images.${{ matrix.ref }}
+      - uses: actions/download-artifact@v8.0.0
+        with:
+          pattern: packages.*.${{ matrix.ref }}
+          merge-multiple: true
 
       - uses: actions/attest-build-provenance@v4.1.0
         with:
-          subject-path: ./package.deb
-          subject-name: opentelemetry-shell_${{ steps.version.outputs.version }}.deb
+          subject-path: '*.deb'
       - uses: actions/attest-build-provenance@v4.1.0
         with:
-          subject-path: ./package.rpm
-          subject-name: opentelemetry-shell_${{ steps.version.outputs.version }}.rpm
+          subject-path: '*.rpm'
       - uses: actions/attest-build-provenance@v4.1.0
         with:
-          subject-path: ./package.apk
-          subject-name: opentelemetry-shell_${{ steps.version.outputs.version }}.apk
+          subject-path: '*.apk'
       - uses: actions/download-artifact@v8.0.1
         with:
           name: images_${{ matrix.ref }}
@@ -126,48 +126,18 @@ jobs:
             sudo docker push "ghcr.io/${GITHUB_REPOSITORY%/*}/$image_name" --all-tags
           done
 
-      - id: create_release
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          gh release create "v${{ steps.version.outputs.version }}" \
-            --target "${{ matrix.ref }}" \
-            --title "Release v${{ steps.version.outputs.version }}" \
-            --generate-notes \
-            --draft
-          sleep 60 # let API catch up
-          echo "id=$(gh api repos/${{ github.repository }}/releases | jq '.[] | select(.tag_name == "v${{ steps.version.outputs.version }}") | .id' -r)" >> "$GITHUB_OUTPUT"
-          echo "upload_url=$(gh api repos/${{ github.repository }}/releases | jq '.[] | select(.tag_name == "v${{ steps.version.outputs.version }}") | .upload_url' -r)" >> "$GITHUB_OUTPUT"
-
-      - uses: actions/upload-release-asset@v1.0.2
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./package.deb
-          asset_name: opentelemetry-shell_${{ steps.version.outputs.version }}.deb
-          asset_content_type: application/octet-stream
-      - uses: actions/upload-release-asset@v1.0.2
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./package.rpm
-          asset_name: opentelemetry-shell_${{ steps.version.outputs.version }}.rpm
-          asset_content_type: application/octet-stream
-      - uses: actions/upload-release-asset@v1.0.2
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./package.apk
-          asset_name: opentelemetry-shell_${{ steps.version.outputs.version }}.apk
-          asset_content_type: application/octet-stream
-      - uses: eregon/publish-release@v1.0.6
-        env:
-          GITHUB_TOKEN: ${{ secrets.ACTIONS_GITHUB_TOKEN }}
+      - uses: softprops/gh-action-release@v2.6.0
         with:
-          release_id: ${{ steps.create_release.outputs.id }}
+          token: ${{ secrets.ACTION_GITHUB_TOKEN }}
+          target_committish: ${{ matrix.ref }}
+          tag_name: v${{ steps.version.outputs.version }}
+          name: Release v${{ steps.version.outputs.version }}
+          generate_release_notes: true
+          files: |-
+            *.deb
+            *.rpm
+            *.apk
+          fail_on_unmatched_files: true
 
       - run: |
           version="${{ steps.version.outputs.version }}"