Modify workflows to test on java17 (#911)

* Modify terraform script to accept runtime * Add java workflow * Move java and python to seperate yml * change workflow name to be explicit * bump go version in workflow * Use Random id * runtime java17 in script
aws-observability · May 10, 2024 · fea6024 · fea6024
1 parent f70c255
commit fea6024
Show file tree

Hide file tree

Showing 21 changed files with 305 additions and 129 deletions.
diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
@@ -67,7 +67,7 @@ jobs:
           submodules: recursive
       - uses: actions/setup-go@v5
         with:
-          go-version: '~1.21.3'
+          go-version: '~1.21.10'
           check-latest: true
       - uses: actions/setup-java@v4
         if: ${{ matrix.language == 'java' }}

diff --git a/.github/workflows/main-build-java.yml b/.github/workflows/main-build-java.yml
@@ -0,0 +1,199 @@
+name: Java Layer Integration Test
+on:
+  workflow_call:
+    inputs:
+      caller-workflow-name:
+        required: true
+        type: string
+  workflow_dispatch:
+
+concurrency:
+  group: main-build-java-${{ github.ref_name }}
+  cancel-in-progress: true
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  integration-test:
+    runs-on: ubuntu-20.04
+    name: java-${{ matrix.sample-app }}-${{ matrix.instrumentation-type }}-${{ matrix.architecture }}-${{matrix.confmap}}
+    strategy:
+      fail-fast: false
+      matrix:
+        architecture: [ amd64, arm64 ]
+        runtime: [java17, java11, java8.al2]
+        sample-app: [ aws-sdk, okhttp ]
+        instrumentation-type: [ wrapper ]
+        confmap: [ "noop" ]
+        include:
+          - sample-app: aws-sdk
+            instrumentation-type: agent
+            architecture: amd64
+            confmap: noop
+            runtime: java17
+          - sample-app: aws-sdk
+            instrumentation-type: agent
+            architecture: amd64
+            confmap: noop
+            runtime: java11
+          - sample-app: aws-sdk
+            instrumentation-type: agent
+            architecture: amd64
+            confmap: noop
+            runtime: java8.al2
+          - sample-app: aws-sdk
+            instrumentation-type: agent
+            architecture: arm64
+            confmap: noop
+            runtime: java17
+          - sample-app: aws-sdk
+            instrumentation-type: agent
+            architecture: arm64
+            confmap: noop
+            runtime: java11
+          - sample-app: aws-sdk
+            instrumentation-type: agent
+            architecture: arm64
+            confmap: noop
+            runtime: java8.al2
+          - sample-app: aws-sdk
+            instrumentation-type: agent-confmap
+            architecture: amd64
+            confmap: s3
+            runtime: java11
+          - sample-app: aws-sdk
+            instrumentation-type: agent-confmap
+            architecture: arm64
+            confmap: s3
+            runtime: java11
+          - sample-app: aws-sdk
+            instrumentation-type: agent-confmap
+            architecture: amd64
+            confmap: http
+            runtime: java11
+          - sample-app: aws-sdk
+            instrumentation-type: agent-confmap
+            architecture: arm64
+            confmap: http
+            runtime: java11
+          - sample-app: aws-sdk
+            instrumentation-type: agent-confmap
+            architecture: amd64
+            confmap: https
+            runtime: java11
+          - sample-app: aws-sdk
+            instrumentation-type: agent-confmap
+            architecture: arm64
+            confmap: https
+            runtime: java11
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '~1.21.10'
+          check-latest: true
+      - uses: actions/setup-java@v4
+        with:
+          distribution: corretto
+          java-version: '17'
+      - name: Cache (Java)
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/go/pkg/mod
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - uses: aws-actions/[email protected]
+        with:
+          role-to-assume: ${{ secrets.INTEG_TEST_LAMBDA_ROLE_ARN }}
+          role-duration-seconds: 7200
+          aws-region: us-east-1
+      - name: Generate UUID
+        id: generate-uuid
+        run: |
+          UUID=$(uuidgen | cut -c1-4)
+          echo "uuid=$UUID" >> $GITHUB_OUTPUT
+      - name: Patch ADOT
+        run: ./patch-upstream.sh
+      - name: Build layers / functions
+        run: GOARCH=${{ matrix.architecture }} ./build.sh ${{ matrix.architecture }}
+        working-directory: java
+      - name: Get Lambda Layer amd64 architecture value
+        if: ${{ matrix.architecture == 'amd64' }}
+        run: echo LAMBDA_FUNCTION_ARCH=x86_64 | tee --append $GITHUB_ENV
+      - name: Get Lambda Layer arm64 architecture value
+        if: ${{ matrix.architecture == 'arm64' }}
+        run: echo LAMBDA_FUNCTION_ARCH=arm64 | tee --append $GITHUB_ENV
+      - name: Get terraform directory
+        run: |
+          echo TERRAFORM_DIRECTORY=java/integration-tests/${{ matrix.sample-app }}/${{ matrix.instrumentation-type }} |
+          tee --append $GITHUB_ENV
+      - uses: hashicorp/setup-terraform@v2
+      - name: Initialize terraform
+        run: terraform init
+        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
+      - name: Get terraform Lambda function name
+        run: |
+          echo TERRAFORM_LAMBDA_FUNCTION_NAME=lambda-java-${{ matrix.sample-app }}-${{ matrix.instrumentation-type }}-${{ matrix.confmap }}-${{ matrix.architecture }}-${{ steps.generate-uuid.outputs.uuid }} |
+          tee --append $GITHUB_ENV
+      - name: Apply terraform
+        run: terraform apply -auto-approve
+        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
+        env:
+          TF_VAR_sdk_layer_name: opentelemetry-java-${{ matrix.sample-app }}-${{ matrix.instrumentation-type }}-${{ matrix.architecture }}-${{ github.run_id }}
+          TF_VAR_function_name: ${{ env.TERRAFORM_LAMBDA_FUNCTION_NAME }}
+          TF_VAR_architecture: ${{ env.LAMBDA_FUNCTION_ARCH }}
+          TF_VAR_configuration_source: ${{ matrix.confmap }}
+          TF_VAR_runtime: ${{ matrix.runtime }}
+      - name: Extract endpoint
+        id: extract-endpoint
+        run: terraform output -raw api-gateway-url
+        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
+      - name: Extract AMP endpoint
+        id: extract-amp-endpoint
+        if: ${{ matrix.sample-app == 'aws-sdk' && startsWith(matrix.instrumentation-type, 'agent') }}
+        run: terraform output -raw amp_endpoint
+        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
+      - name: Extract SDK layer arn
+        id: extract-sdk-layer-arn
+        run: terraform output -raw sdk_layer_arn
+        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
+      - name: Output annotations
+        run: |
+          echo "::warning::Function: ${{ env.TERRAFORM_LAMBDA_FUNCTION_NAME }}"
+          echo "::warning::SDK Layer ARN: ${{ steps.extract-sdk-layer-arn.outputs.stdout }}"
+      - name: Send request to endpoint
+        run: curl -sS ${{ steps.extract-endpoint.outputs.stdout }}
+      - name: Checkout test framework
+        uses: actions/checkout@v4
+        with:
+          repository: aws-observability/aws-otel-test-framework
+          path: test-framework
+      - name: validate trace sample
+        run: |
+          cp adot/utils/expected-templates/java-${{ matrix.sample-app }}-${{ matrix.instrumentation-type }}.json \
+             test-framework/validator/src/main/resources/expected-data-template/lambdaExpectedTrace.mustache
+          cd test-framework
+          ./gradlew :validator:run --args="-c default-lambda-validation.yml --endpoint ${{ steps.extract-endpoint.outputs.stdout }} --region $AWS_REGION"
+      - name: validate java agent metric sample
+        if: ${{ matrix.sample-app == 'aws-sdk' && startsWith(matrix.instrumentation-type, 'agent') }}
+        run: |
+          cp adot/utils/expected-templates/java-${{ matrix.sample-app }}-${{ matrix.instrumentation-type }}-metric.json \
+             test-framework/validator/src/main/resources/expected-data-template/ampExpectedMetric.mustache
+          cd test-framework
+          ./gradlew :validator:run --args="-c prometheus-static-metric-validation.yml --cortex-instance-endpoint ${{ steps.extract-amp-endpoint.outputs.stdout }} --region $AWS_REGION"
+      - name: Destroy terraform
+        if: always()
+        run: terraform destroy -auto-approve
+        working-directory: ${{ env.TERRAFORM_DIRECTORY }}
+        env:
+          TF_VAR_architecture: ${{ env.LAMBDA_FUNCTION_ARCH }}
diff --git a/.github/workflows/main-build-python311.yml → .github/workflows/main-build-python.yml b/.github/workflows/main-build-python311.yml → .github/workflows/main-build-python.yml
@@ -1,39 +1,36 @@
-name: Python-3.11 Layer Integration Test
-# This workflow is for verifying python3.11 layer in Lambda python3.8 environment
+name: Python Layer Integration Test
 on:
-  push:
-    branches: 
-      - main 
-      - release/*
-    paths-ignore:
-      - '.github/**'
-      - '!.github/workflows/main-build-python311.yml'
-      - '**.md'
+  workflow_call:
+    inputs:
+      caller-workflow-name:
+        required: true
+        type: string
   workflow_dispatch:
 
 concurrency:
-  group: main-build-python311-${{ github.ref_name }}
+  group: main-build-python-${{ github.ref_name }}
   cancel-in-progress: true
 
-
 permissions:
   id-token: write
+  contents: read
 
 jobs:
   integration-test:
     runs-on: ubuntu-20.04
-    name: Python311-${{ matrix.architecture }}-IntegrationTest
+    name: python-wrapper-${{ matrix.architecture }}
     strategy:
       fail-fast: false
       matrix:
         architecture: [ amd64, arm64 ]
+        runtime: [python3.9, python3.10, python3.11]
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
       - uses: actions/setup-go@v5
         with:
-          go-version: '~1.21.3'
+          go-version: '~1.21.10'
           check-latest: true
       - uses: actions/setup-python@v5
         with:
@@ -52,6 +49,11 @@ jobs:
           role-to-assume: ${{ secrets.INTEG_TEST_LAMBDA_ROLE_ARN }}
           role-duration-seconds: 7200
           aws-region: us-east-1
+      - name: Generate UUID
+        id: generate-uuid
+        run: |
+          UUID=$(uuidgen | cut -c1-4)
+          echo "uuid=$UUID" >> $GITHUB_OUTPUT
       - name: Patch ADOT
         run: ./patch-upstream.sh
       - name: Login to Public ECR
@@ -77,7 +79,7 @@ jobs:
         working-directory: ${{ env.TERRAFORM_DIRECTORY }}
       - name: Get terraform Lambda function name
         run: |
-          echo TERRAFORM_LAMBDA_FUNCTION_NAME=lambda-python-${{ matrix.architecture }}-${{ github.run_id }} |
+          echo TERRAFORM_LAMBDA_FUNCTION_NAME=lambda-python-${{ matrix.architecture }}-${{ steps.generate-uuid.outputs.uuid }} |
           tee --append $GITHUB_ENV
       - name: Apply terraform
         run: terraform apply -auto-approve
@@ -86,7 +88,7 @@ jobs:
           TF_VAR_sdk_layer_name: opentelemetry-python-aws-sdk-wrapper-${{ matrix.architecture }}
           TF_VAR_function_name: ${{ env.TERRAFORM_LAMBDA_FUNCTION_NAME }}
           TF_VAR_architecture: ${{ env.LAMBDA_FUNCTION_ARCH }}
-          TF_VAR_runtime: 'python3.11'
+          TF_VAR_runtime: ${{ matrix.runtime }}
       - name: Extract endpoint
         id: extract-endpoint
         run: terraform output -raw api-gateway-url