refactor releases to build all first

Author: ezhang6811

.github/workflows/release-build.yml

@@ -27,7 +27,7 @@ permissions:
   contents: write
 
 jobs:
-  build:
+  build-sdk:
     environment: Release
     runs-on: ubuntu-latest
     steps:
@@ -62,23 +62,67 @@ jobs:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           gpg_password: ${{ secrets.GPG_PASSPHRASE }}
 
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
+      - name: Build release with Gradle
+        uses: gradle/gradle-build-action@v3
         with:
-          role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
-          aws-region: ${{ env.AWS_PUBLIC_ECR_REGION }}
+          arguments: build integrationTests -PlocalDocker=true -Prelease.version=${{ github.event.inputs.version }} --stacktrace
 
-      - name: Log in to AWS ECR
-        uses: docker/login-action@v3
+      - name: Upload SDK artifact
+        uses: actions/upload-artifact@v4
         with:
-          registry: public.ecr.aws
+          name: ${{ env.ARTIFACT_NAME }}
+          path: otelagent/build/libs/aws-opentelemetry-agent-${{ github.event.inputs.version }}.jar
 
-      - name: Build release with Gradle
-        uses: gradle/gradle-build-action@v3
+  build-layer:
+    needs: build-sdk
+    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@v5
+
+      - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
-          arguments: build integrationTests -PlocalDocker=true -Prelease.version=${{ github.event.inputs.version }} --stacktrace
+          java-version-file: .java-version
+          distribution: 'temurin'
+
+      - name: Build layers
+        working-directory: lambda-layer
+        run: |
+          ./build-layer.sh
 
-      - name: Configure AWS Credentials
+      - name: Upload layer
+        uses: actions/upload-artifact@v4
+        with:
+          name: layer.zip
+          path: lambda-layer/build/distributions/aws-opentelemetry-java-layer.zip
+
+  publish-sdk:
+    runs-on: ubuntu-latest
+    needs: [build-sdk, build-layer]
+    steps:
+      - uses: actions/checkout@v5
+
+      - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+        with:
+          java-version-file: .java-version
+          distribution: 'temurin'
+
+      - name: Configure AWS Credentials for public ECR
         uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN_RELEASE }}
@@ -144,83 +188,9 @@ jobs:
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
 
-
-      - name: Get SHA256 checksum of release artifact
-        id: get_sha256
-        run: |
-          cp "otelagent/build/libs/aws-opentelemetry-agent-${{ github.event.inputs.version }}.jar" ${{ env.ARTIFACT_NAME }}
-          shasum -a 256 ${{ env.ARTIFACT_NAME }} > ${{ env.ARTIFACT_NAME }}.sha256
-
-      - name: Create release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-        run: |
-          # Extract versions from dependency files
-          OTEL_INSTRUMENTATION_VERSION=$(grep "val otelVersion" dependencyManagement/build.gradle.kts | sed 's/.*= "\([^"]*\)".*/\1/')
-          OTEL_CONTRIB_VERSION=$(grep "io.opentelemetry.contrib:opentelemetry-aws-xray" dependencyManagement/build.gradle.kts | sed 's/.*:\([^"]*\)".*/\1/')
-
-          # Create release notes
-          cat > release_notes.md << EOF
-          This release contains updates of the following upstream components:
-
-          OpenTelemetry Java - <opentelemetry-java version number - e.g. 1.45.0>
-          OpenTelemetry Java Contrib - $OTEL_CONTRIB_VERSION
-          Opentelemetry Instrumentation for Java - $OTEL_INSTRUMENTATION_VERSION
-
-          This release also publishes to public ECR and Maven Central.
-          * See ADOT Java auto-instrumentation Docker image v${{ github.event.inputs.version }} in our public ECR repository:
-          https://gallery.ecr.aws/aws-observability/adot-autoinstrumentation-java
-          * See version ${{ github.event.inputs.version }} in our Maven Central repository:
-          https://central.sonatype.com/artifact/software.amazon.opentelemetry/aws-opentelemetry-agent
-          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 }}" \
-             ${{ env.ARTIFACT_NAME }} \
-             ${{ env.ARTIFACT_NAME }}.sha256
-  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@v5
-
-      - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
-        with:
-          java-version-file: .java-version
-          distribution: 'temurin'
-
-      - name: Build layers
-        working-directory: lambda-layer
-        run: |
-          ./build-layer.sh
-
-      - name: Upload layer
-        uses: actions/upload-artifact@v4
-        with:
-          name: aws-opentelemetry-java-layer.zip
-          path: lambda-layer/build/distributions/aws-opentelemetry-java-layer.zip
   publish-layer-prod:
     runs-on: ubuntu-latest
-    needs: build-layer
+    needs: [build-layer, publish-sdk]
     strategy:
       matrix:
         aws_region: ${{ fromJson(needs.build-layer.outputs.aws_regions_json) }}
@@ -260,7 +230,7 @@ jobs:
       - name: download layer.zip
         uses: actions/download-artifact@v5
         with:
-          name: aws-opentelemetry-java-layer.zip
+          name: layer.zip
 
       - name: publish
         run: |
@@ -308,9 +278,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
+    outputs:
+      layer-note: ${{ steps.layer-note.outputs.layer-note }}
     steps:
       - name: Checkout Repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v5
@@ -329,6 +302,7 @@ jobs:
           cat $file
           done
       - name: generate layer-note
+        id: layer-note
         working-directory: ${{ env.LAYER_NAME }}
         run: |
           echo "| Region | Layer ARN |" >> ../layer-note
@@ -338,7 +312,13 @@ jobs:
           read arn < $file
           echo "| " $file " | " $arn " |" >> ../layer-note
           done
-          cat ../layer-note
+          cd ..
+          {
+            echo "layer-note<<EOF"
+            cat layer-note
+            echo "EOF"
+          } >> $GITHUB_OUTPUT
+          cat layer-note
       - name: generate tf layer
         working-directory: ${{ env.LAYER_NAME }}
         run: |
@@ -364,46 +344,67 @@ 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@v5
+      
+      - name: Download SDK artifact
         uses: actions/download-artifact@v5
         with:
-          name: aws-opentelemetry-java-layer.zip
-      - name: Rename layer file
+          name: ${{ env.ARTIFACT_NAME }}
+      
+      - name: Download layer.zip artifact
+        uses: actions/download-artifact@v5
+        with:
+          name: layer.zip
+
+      - name: Rename artifacts
         run: |
+          cp "aws-opentelemetry-agent-${{ github.event.inputs.version }}.jar" ${{ env.ARTIFACT_NAME }}
           cp aws-opentelemetry-java-layer.zip layer.zip
-      - name: Get commit hash
-        id: commit
-        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $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
+          # Extract versions from dependency files
+          OTEL_INSTRUMENTATION_VERSION=$(grep "val otelVersion" dependencyManagement/build.gradle.kts | sed 's/.*= "\([^"]*\)".*/\1/')
+          OTEL_CONTRIB_VERSION=$(grep "io.opentelemetry.contrib:opentelemetry-aws-xray" dependencyManagement/build.gradle.kts | sed 's/.*:\([^"]*\)".*/\1/')
+
+          # Create release notes
+          cat > release_notes.md << EOF
+          This release contains updates of the following upstream components:
+
+          OpenTelemetry Java Contrib - $OTEL_CONTRIB_VERSION
+          Opentelemetry Instrumentation for Java - $OTEL_INSTRUMENTATION_VERSION
+
+          This release also publishes to public ECR and Maven Central.
+          * See ADOT Java auto-instrumentation Docker image v${{ github.event.inputs.version }} in our public ECR repository:
+          https://gallery.ecr.aws/aws-observability/adot-autoinstrumentation-java
+          * See version ${{ github.event.inputs.version }} in our Maven Central repository:
+          https://central.sonatype.com/artifact/software.amazon.opentelemetry/aws-opentelemetry-agent
+
+          This release also includes the AWS OpenTelemetry Lambda Layer for Java 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 Java 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