Merge branch 'main' into forceFlush

Author: AsakerMohd

.github/actions/lambda_artifacts_build/action.yml

@@ -0,0 +1,50 @@
+name: Build and Push aws-opentelemetry-python-distro Layer
+description: |
+  This action assumes that the repo was checked out. Builds and push Lambda Layer and sample app to S3 bucket for 
+  the further end to end tests.
+
+inputs:
+  aws-region:
+    required: false
+    description: "AWS Region, required only if push_image is true"
+  snapshot-ecr-role:
+    required: false
+    description: "IAM Role used for pushing to snapshot ecr, required only if push_image is true"
+  python_version:
+    required: true
+    description: "The python version used in actions"
+  layer_directory:
+    required: true
+    description: 'The role use to publish lambda layer'
+  staging_s3_bucket:
+    required: true
+    description: 'S3 bucket holds SDK artifact tarball'
+  os:
+    required: true
+    description: "The os"
+
+
+runs:
+  using: "composite"
+  steps:
+    - name: Build sample lambda function
+      shell: bash
+      working-directory: ${{ inputs.layer_directory }}/sample-apps
+      run: ./package-lambda-function.sh
+    - name: Build layers
+      shell: bash
+      working-directory: ${{ inputs.layer_directory }}/src
+      run: |
+        ./build-lambda-layer.sh
+        pip install tox
+        tox
+    - name: Upload Layer to S3
+      shell: bash
+      run: |
+        aws s3 cp ./build/aws-opentelemetry-python-layer.zip s3://${{ inputs.staging_s3_bucket }}/layer-${{ github.run_id }}.zip
+      working-directory: ${{ inputs.layer_directory }}/src
+    - name: Upload Sample App to S3
+      shell: bash
+      run: |
+        aws s3 cp ./build/function.zip s3://${{ inputs.staging_s3_bucket }}/function-${{ github.run_id }}.zip
+      working-directory: ${{ inputs.layer_directory }}/sample-apps

.github/workflows/application-signals-e2e-test.yml

@@ -100,7 +100,7 @@ jobs:
       python-version: '3.12'
       cpu-architecture: 'x86_64'
       staging-wheel-name: ${{ inputs.staging-wheel-name }}
-      
+
   #
   # DOCKER DISTRIBUTION LANGUAGE VERSION COVERAGE
   # DEFAULT SETTING: {Python Version}, EKS, AMD64, AL2
@@ -174,7 +174,7 @@ jobs:
       caller-workflow-name: 'main-build'
       python-version: '3.9'
       staging-wheel-name: ${{ inputs.staging-wheel-name }}
-      
+
   #
   # DOCKER DISTRIBUTION PLATFORM COVERAGE
   # DEFAULT SETTING: Python 3.10, {Platform}, AMD64, AL2
@@ -215,5 +215,12 @@ jobs:
       cpu-architecture: 'arm64'
       staging-wheel-name: ${{ inputs.staging-wheel-name }}
 
-
-
+  #
+  # Lambda layer integration tests
+  lambda:
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-lambda-test.yml@main
+    secrets: inherit
+    with:
+      aws-region: us-east-1
+      python-version: '3.12'
+      caller-workflow-name: 'main-build'

.github/workflows/main_build.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - "release/v*"
+      - ci-workflow
   workflow_dispatch: # be able to run the workflow on demand
 env:
   AWS_DEFAULT_REGION: us-east-1
@@ -71,6 +72,16 @@ jobs:
           cd ./dist
           cp aws_opentelemetry_distro-${{ steps.python_output.outputs.ADOT_PYTHON_VERSION}}-py3-none-any.whl $staging_wheel
 
+      - name: Build and Publish Lambda Staging Layer
+        uses: ./.github/actions/lambda_artifacts_build
+        with:
+          aws-region: ${{ env.AWS_DEFAULT_REGION }}
+          snapshot-ecr-role: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
+          python_version: "3.12"
+          layer_directory: lambda-layer
+          staging_s3_bucket: ${{ env.STAGING_S3_BUCKET }}
+          os: ubuntu-latest
+
       - name: Upload wheel to S3
         run: |
           aws s3 cp dist/${{ steps.staging_wheel_output.outputs.STAGING_WHEEL}} s3://${{ env.STAGING_S3_BUCKET }}

.github/workflows/release_lambda.yml

@@ -10,8 +10,7 @@ on:
 
 env:
   COMMERCIAL_REGIONS: us-east-1, us-east-2, us-west-1, us-west-2, ap-south-1, ap-northeast-3, ap-northeast-2, ap-southeast-1, ap-southeast-2, ap-northeast-1, ca-central-1, eu-central-1, eu-west-1, eu-west-2, eu-west-3, eu-north-1, sa-east-1
-  # LAYER_NAME: AWSOpenTelemetryDistroPython
-  LAYER_NAME: AWSOpenTelemetryDistroPythonBeta
+  LAYER_NAME: AWSOpenTelemetryDistroPython
 
 permissions:
   id-token: write
@@ -56,7 +55,6 @@ jobs:
     needs: build-layer
     strategy:
       matrix:
-        # aws_region: ${{ fromJson(github.event.inputs.aws_region) }}
         aws_region: ${{ fromJson(needs.build-layer.outputs.aws_regions_json) }}
     steps:
       - name: role arn
@@ -112,7 +110,6 @@ jobs:
           mkdir ${{ env.LAYER_NAME }}
           echo $layerARN > ${{ env.LAYER_NAME }}/${{ matrix.aws_region }}
           cat ${{ env.LAYER_NAME }}/${{ matrix.aws_region }}
-          pwd
       - name: public layer
         run: |
           layerVersion=$(
@@ -193,21 +190,39 @@ jobs:
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
-          git checkout -b "release-lambda-${{ github.run_id }}"
           mv layer.tf lambda-layer/terraform/lambda/
           git add lambda-layer/terraform/lambda/layer.tf
           git commit -m "Update Lambda layer ARNs for releasing" || echo "No changes to commit"
-          git push --set-upstream origin "release-lambda-${{ github.run_id }}"
-      - name: Create Pull Request
+          git push
+  create-release:
+    runs-on: ubuntu-latest
+    needs: generate-release-note
+    steps:
+      - name: Checkout Repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+      - name: Get latest commit SHA
+        run: |
+          echo "COMMIT_SHA=${GITHUB_SHA}" >> $GITHUB_ENV
+          SHORT_SHA=$(echo $GITHUB_SHA | cut -c1-7)
+          echo "SHORT_SHA=${SHORT_SHA}" >> $GITHUB_ENV
+      - name: Create Tag
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          TAG_NAME="lambda-${SHORT_SHA}"
+          git tag -a "$TAG_NAME" -m "Release Lambda layer based on commit $TAG_NAME"
+          git push origin "$TAG_NAME"
+          echo "TAG_NAME=${TAG_NAME}" >> $GITHUB_ENV
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        uses: peter-evans/create-pull-request@v5
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "Update Lambda layer ARNs for releasing"
-          title: "Update Layer layer ARNs for releasing"
-          body: |
-            This PR updates the layer.tf file for the AWS region `${{ matrix.aws_region }}`.
-          branch: release-lambda-${{ github.run_id }}
-          base: main
-
+          tag_name: ${{ env.TAG_NAME }}
+          release_name: "Release AWSOpenTelemetryDistroPython Lambda Layer"
+          body_path: lambda-layer/terraform/lambda/layer.tf
+          draft: true
+          prerelease: false