refactor release job order

ezhang6811 · ezhang6811 · commit 2e776e3de512 · 2025-09-10T10:44:25.000-07:00
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -32,7 +32,7 @@ jobs:
     environment: Release
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
+      - name: Checkout Repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v4
 
       - name: Check main build status
@@ -63,9 +63,59 @@ jobs:
           package_name: aws-distro-opentelemetry-node-autoinstrumentation
           os: ubuntu-latest
 
+      - name: Upload SDK Tarball
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.ARTIFACT_NAME }}
+          path: aws-distro-opentelemetry-node-autoinstrumentation/${{ env.ARTIFACT_NAME }}
+
       # TODO: Add some sort of smoke/integration testing before we go
       # release the artifacts. adot java for reference:
       # https://github.com/aws-observability/aws-otel-java-instrumentation/tree/93870a550ac30988fbdd5d3bf1e8f9f1b37916f5/smoke-tests
+  
+  build-layer:
+    needs: build
+    runs-on: ubuntu-latest
+    outputs:
+      aws_regions_json: ${{ steps.set-matrix.outputs.aws_regions_json }}
+    steps:
+      - name: Set up regions matrix
+        id: set-matrix
+        run: |
+          IFS=',' read -ra REGIONS <<< "${{ github.event.inputs.aws_region }}"
+          MATRIX="["
+          for region in "${REGIONS[@]}"; do
+            trimmed_region=$(echo "$region" | xargs)
+            MATRIX+="\"$trimmed_region\","
+          done
+          MATRIX="${MATRIX%,}]"
+          echo ${MATRIX}
+          echo "aws_regions_json=${MATRIX}" >> $GITHUB_OUTPUT
+      - name: Checkout Repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+      - name: NPM Clean Install
+        # https://docs.npmjs.com/cli/v10/commands/npm-ci
+        run: npm ci
+      - name: Compile all NPM projects
+        run: npm run compile
+      - name: Build Lambda Layer
+        run: npm run build-lambda
+      - name: upload layer
+        uses: actions/upload-artifact@v4
+        with:
+          name: layer.zip
+          path: lambda-layer/packages/layer/build/layer.zip
+
+  publish:
+    needs: [build, build-layer]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
 
       - name: Configure AWS credentials for private ECR
         uses: aws-actions/configure-aws-credentials@v4
@@ -89,7 +139,6 @@ jobs:
         with:
           registry: public.ecr.aws
 
-
       # Publish to public ECR
       - name: Build and push public ECR image
         uses: docker/build-push-action@v5
@@ -112,93 +161,17 @@ jobs:
           tags: |
             ${{ env.RELEASE_PRIVATE_REPOSITORY }}:v${{ github.event.inputs.version }}
 
-      - name: Get SHA256 checksum of release artifact
-        id: get_sha256
-        run: |
-          shasum -a 256 aws-distro-opentelemetry-node-autoinstrumentation/${{ env.ARTIFACT_NAME }} | sed "s|aws-distro-opentelemetry-node-autoinstrumentation/||" > ${{ env.ARTIFACT_NAME }}.sha256
-    
-      # Publish to GitHub releases
-      - name: Create GH release
-        id: create_release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-        run: |
-          # Generate dependency versions from package.json
-          DEPS=$(node -e "
-            const pkg = require('./aws-distro-opentelemetry-node-autoinstrumentation/package.json');
-            const deps = Object.entries(pkg.dependencies || {})
-              .map(([name, version]) => \`- \\\`\${name}\\\` - \${version}\`)
-              .join('\n');
-            console.log(deps);
-          ")
-
-          # Create release notes
-          cat > release_notes.md << EOF
-          This release contains the following upstream components:
-
-          $DEPS
-
-          This release also publishes to public ECR and NPM.
-          * See ADOT node auto-instrumentation Docker image v${{ github.event.inputs.version }} in our public ECR repository:
-          https://gallery.ecr.aws/aws-observability/adot-autoinstrumentation-node
-          * See version ${{ github.event.inputs.version }} in our NPM repository:
-          https://www.npmjs.com/package/@aws/aws-distro-opentelemetry-node-autoinstrumentation
-          EOF
-
-          gh release create --target "$GITHUB_REF_NAME" \
-             --title "Release v${{ github.event.inputs.version }}" \
-             --notes-file release_notes.md \
-             --draft \
-             "v${{ github.event.inputs.version }}" \
-             aws-distro-opentelemetry-node-autoinstrumentation/${{ env.ARTIFACT_NAME }} \
-             ${{ env.ARTIFACT_NAME }}.sha256
-
       # Publish '@aws/aws-distro-opentelemetry-node-autoinstrumentation' to npm
       - name: Publish autoinstrumentation to npm
         working-directory: aws-distro-opentelemetry-node-autoinstrumentation
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
           NPM_CONFIG_PROVENANCE: true
         run: npm publish
-  build-layer:
-    needs: build
-    runs-on: ubuntu-latest
-    outputs:
-      aws_regions_json: ${{ steps.set-matrix.outputs.aws_regions_json }}
-    steps:
-      - name: Set up regions matrix
-        id: set-matrix
-        run: |
-          IFS=',' read -ra REGIONS <<< "${{ github.event.inputs.aws_region }}"
-          MATRIX="["
-          for region in "${REGIONS[@]}"; do
-            trimmed_region=$(echo "$region" | xargs)
-            MATRIX+="\"$trimmed_region\","
-          done
-          MATRIX="${MATRIX%,}]"
-          echo ${MATRIX}
-          echo "aws_regions_json=${MATRIX}" >> $GITHUB_OUTPUT
-      - name: Checkout Repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 22
-      - name: NPM Clean Install
-        # https://docs.npmjs.com/cli/v10/commands/npm-ci
-        run: npm ci
-      - name: Compile all NPM projects
-        run: npm run compile
-      - name: Build Lambda Layer
-        run: npm run build-lambda
-      - name: upload layer
-        uses: actions/upload-artifact@v4
-        with:
-          name: layer.zip
-          path: lambda-layer/packages/layer/build/layer.zip
+
   publish-layer-prod:
     runs-on: ubuntu-latest
-    needs: build-layer
+    needs: [build-layer, publish]
     strategy:
       matrix:
         aws_region: ${{ fromJson(needs.build-layer.outputs.aws_regions_json) }}
@@ -279,9 +252,12 @@ jobs:
         if: always()
         run: |
           aws s3 rb --force s3://${{ env.BUCKET_NAME }}
+
   generate-lambda-release-note:
     runs-on: ubuntu-latest
-    needs: publish-layer-prod
+    needs: [publish, publish-layer-prod]
+    outputs:
+      layer-note: ${{ steps.layer-note.outputs.layer-note }}
     steps:
       - name: Checkout Repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v4
@@ -300,6 +276,7 @@ jobs:
           cat $file
           done
       - name: generate layer-note
+        id: layer-note
         working-directory: ${{ env.LAYER_NAME }}
         run: |
           echo "| Region | Layer ARN |" >> ../layer-note
@@ -310,6 +287,11 @@ jobs:
           echo "| " $file " | " $arn " |" >> ../layer-note
           done
           cd ..
+          {
+            echo "layer-note<<EOF"
+            cat layer-note
+            echo "EOF"
+          } >> $GITHUB_OUTPUT
           cat layer-note
       - name: generate tf layer
         working-directory: ${{ env.LAYER_NAME }}
@@ -336,44 +318,66 @@ jobs:
           done
           echo "}" >> ../layer_cdk
           cat ../layer_cdk
-      - name: download layer.zip
+
+  publish-github:
+    needs: generate-lambda-release-note
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+      
+      - name: Download SDK artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ env.ARTIFACT_NAME }}
+      
+      - name: Download layer.zip artifact
         uses: actions/download-artifact@v4
         with:
           name: layer.zip
-      - name: Get commit hash
-        id: commit
-        run: |
-          echo "sha_short=$(echo $GITHUB_SHA | cut -c1-7)" >> $GITHUB_OUTPUT
-      - name: Update GH release
+
+      # Publish to GitHub releases
+      - name: Create GH release
+        id: create_release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          TAG="v${{ github.event.inputs.version }}"
-          # Generate SHA-256 checksum for layer.zip
+          # Generate dependency versions from package.json
+          DEPS=$(node -e "
+            const pkg = require('./aws-distro-opentelemetry-node-autoinstrumentation/package.json');
+            const deps = Object.entries(pkg.dependencies || {})
+              .map(([name, version]) => \`- \\\`\${name}\\\` - \${version}\`)
+              .join('\n');
+            console.log(deps);
+          ")
+
+          # Create release notes
+          cat > release_notes.md << EOF
+          This release contains the following upstream components:
+
+          $DEPS
+
+          This release also publishes to public ECR and NPM.
+          * See ADOT node auto-instrumentation Docker image v${{ github.event.inputs.version }} in our public ECR repository:
+          https://gallery.ecr.aws/aws-observability/adot-autoinstrumentation-node
+          * See version ${{ github.event.inputs.version }} in our NPM repository:
+          https://www.npmjs.com/package/@aws/aws-distro-opentelemetry-node-autoinstrumentation
+
+          This release also includes the AWS OpenTelemetry Lambda Layer for JavaScript version ${{ github.event.inputs.version }}-$(echo $GITHUB_SHA | cut -c1-7).
+
+          Lambda Layer ARNs:
+          ${{ needs.generate-lambda-release-note.outputs.layer-note }}
+          EOF
+
+          shasum -a 256 ${{ env.ARTIFACT_NAME }} > ${{ env.ARTIFACT_NAME }}.sha256
           shasum -a 256 layer.zip > layer.zip.sha256
-          gh release upload $TAG \
-            layer.zip \
-            layer.zip.sha256 \
-            layer_arns.tf \
-            --clobber
-      - name: Update Release Notes
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          TAG="v${{ github.event.inputs.version }}"
-          # Get current release notes
-          current_notes=$(gh release view $TAG --json body -q .body)
-          echo "This release also includes the AWS OpenTelemetry Lambda Layer for JavaScript version ${{ github.event.inputs.version }}-${{ steps.commit.outputs.sha_short }}." >> lambda_notes.md
-          echo "" >> lambda_notes.md
-          echo "Lambda Layer ARNs:" >> lambda_notes.md
-          echo "" >> lambda_notes.md
-          cat layer-note >> lambda_notes.md
-          echo "" >> lambda_notes.md
-          echo "Notes:" >> lambda_notes.md
-          {
-            echo "$current_notes"
-            echo ""
-            cat lambda_notes.md
-          } > updated_notes.md
-          # Update release notes
-          gh release edit $TAG --notes-file updated_notes.md
+
+          gh release create --target "$GITHUB_REF_NAME" \
+             --title "Release v${{ github.event.inputs.version }}" \
+             --notes-file release_notes.md \
+             --draft \
+             "v${{ github.event.inputs.version }}" \
+             ${{ env.ARTIFACT_NAME }} \
+             ${{ env.ARTIFACT_NAME }}.sha256 \
+             layer.zip \
+             layer.zip.sha256
