Integration Testing and Release workflow for ADOT Java AutoInstrumentation Image (includes cp-utility) (#358)

PaurushGarg · web-flow · commit c2c23243ab48 · 2023-03-30T19:47:25.000-07:00
* Release workflow
diff --git a/.github/scripts/test-adot-javaagent-image.sh b/.github/scripts/test-adot-javaagent-image.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+# Enable debug mode, fail on any command that fail in this script and fail on unset variables
+set -x -e -u
+
+TEST_TAG=$1
+ADOT_JAVA_VERSION=$2
+
+docker volume create operator-volume
+docker run --mount source=operator-volume,dst=/otel-auto-instrumentation ${TEST_TAG} cp /javaagent.jar /otel-auto-instrumentation/javaagent.jar
+docker run -dt --mount source=operator-volume,dst=/otel-auto-instrumentation --name temp  public.ecr.aws/amazonlinux/amazonlinux:latest
+FILENAME=$(docker exec temp /bin/bash -c "ls /otel-auto-instrumentation")
+if [ $FILENAME = javaagent.jar ]; then
+  echo "javaagent.jar file was copied to the operator-volume"
+else
+  echo "error: javaagent.jar file was not copied to the operator-volume"
+  exit 1;
+fi
+
+ORIG_CHECKSUM=$(sha256sum otelagent/build/libs/aws-opentelemetry-agent-${ADOT_JAVA_VERSION}.jar | cut -d' ' -f1)
+CHECKSUM=$(docker exec temp /bin/bash -c "sha256sum /otel-auto-instrumentation/javaagent.jar | cut -d' ' -f1")
+if [ $CHECKSUM = $ORIG_CHECKSUM ]; then
+  echo "copied javaagent.jar checksum matched"
+else
+  echo "error: copied javaagent.jar checksum mis-matched"
+  exit 1;
+fi
diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
@@ -6,6 +6,7 @@ on:
       - "release/v*"
 env:
   AWS_DEFAULT_REGION: us-east-1
+  TEST_TAG: public.ecr.aws/aws-observability/adot-autoinstrumentation-java:test
 
 permissions:
   id-token: write
@@ -69,30 +70,38 @@ jobs:
           PUBLISH_PASSWORD: ${{ secrets.PUBLISH_PASSWORD }}
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+
       - name: Get current version
         shell: bash
         run: |
-          echo ADOT_JAVA_VERSION="$(./gradlew printVersion -q )" >> $GITHUB_ENV
+          echo "ADOT_JAVA_VERSION=$(./gradlew printVersion -q )" >> $GITHUB_ENV
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Build image
+      - name: Build image for testing
         uses: docker/build-push-action@v4
         with:
           push: false
           build-args: "ADOT_JAVA_VERSION=${{ env.ADOT_JAVA_VERSION }}"
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
+          tags: ${{ env.TEST_TAG }}
+          load: true
+
+      - name: Test docker image
+        shell: bash
+        run: .github/scripts/test-adot-javaagent-image.sh "${{ env.TEST_TAG }}" "${{ env.ADOT_JAVA_VERSION }}"
 
       - name: Upload to GitHub Actions
         uses: actions/upload-artifact@v2
         with:
           name: aws-opentelemetry-agent.jar
           path: otelagent/build/libs/aws-opentelemetry-agent-*.jar
+
       - name: Build and push agent and testing docker images with Gradle
         uses: gradle/gradle-build-action@v2
         with:
diff --git a/.github/workflows/nightly-upstream-snapshot-build.yml b/.github/workflows/nightly-upstream-snapshot-build.yml
@@ -6,6 +6,7 @@ on:
 
 env:
   AWS_DEFAULT_REGION: us-east-1
+  TEST_TAG: public.ecr.aws/aws-observability/adot-autoinstrumentation-java:test
 
 permissions:
   id-token: write
@@ -45,27 +46,34 @@ jobs:
       - name: Get current version
         shell: bash
         run: |
-          echo ADOT_JAVA_VERSION="$(./gradlew printVersion -q -PtestUpstreamSnapshots=true )" >> $GITHUB_ENV
+          echo "ADOT_JAVA_VERSION=$(./gradlew printVersion -q -PtestUpstreamSnapshots=true )" >> $GITHUB_ENV
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Build image
+      - name: Build image for testing
         uses: docker/build-push-action@v4
         with:
           push: false
           build-args: "ADOT_JAVA_VERSION=${{ env.ADOT_JAVA_VERSION }}"
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
+          tags: ${{ env.TEST_TAG }}
+          load: true
+
+      - name: Test docker image
+        shell: bash
+        run: .github/scripts/test-adot-javaagent-image.sh "${{ env.TEST_TAG }}" "${{ env.ADOT_JAVA_VERSION }}"
 
       - name: Upload to GitHub Actions
         uses: actions/upload-artifact@v2
         with:
           name: aws-opentelemetry-agent.jar
           path: otelagent/build/libs/aws-opentelemetry-agent-*.jar
+
   publish-build-status:
     needs: [build]
     if: ${{ always() }}
@@ -79,4 +87,3 @@ jobs:
       region: us-west-2
     secrets:
       roleArn: ${{ secrets.METRICS_ROLE_ARN }}
-
diff --git a/.github/workflows/patch-release-build.yml b/.github/workflows/patch-release-build.yml
@@ -12,6 +12,7 @@ on:
 
 env:
   AWS_DEFAULT_REGION: us-east-1
+  TEST_TAG: public.ecr.aws/aws-observability/adot-autoinstrumentation-java:test
 
 permissions:
   id-token: write
@@ -99,6 +100,36 @@ jobs:
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build image for testing
+        uses: docker/build-push-action@v4
+        with:
+          push: false
+          build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}"
+          context: .
+          platforms: linux/amd64
+          tags: ${{ env.TEST_TAG }}
+          load: true
+
+      - name: Test docker image
+        shell: bash
+        run: .github/scripts/test-adot-javaagent-image.sh "${{ env.TEST_TAG }}" "${{ github.event.inputs.version }}"
+
+      - name: Build and push image
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}"
+          context: .
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v${{ github.event.inputs.version }}, public.ecr.aws/aws-observability/adot-autoinstrumentation-java:latest
+
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
@@ -4,6 +4,8 @@ on:
     branches:
       - main
       - "release/v*"
+env:
+  TEST_TAG: public.ecr.aws/aws-observability/adot-autoinstrumentation-java:test
 
 jobs:
   testpatch:
@@ -71,7 +73,7 @@ jobs:
         if: ${{ matrix.os == 'ubuntu-latest' }}
         shell: bash
         run: |
-          echo ADOT_JAVA_VERSION="$(./gradlew printVersion -q )" >> $GITHUB_ENV
+          echo "ADOT_JAVA_VERSION=$(./gradlew printVersion -q )" >> $GITHUB_ENV
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -81,14 +83,21 @@ jobs:
         uses: docker/setup-buildx-action@v2
         if: ${{ matrix.os == 'ubuntu-latest' }}
 
-      - name: Build image
+      - name: Build image for testing
         uses: docker/build-push-action@v4
         if: ${{ matrix.os == 'ubuntu-latest' }}
         with:
           push: false
           build-args: "ADOT_JAVA_VERSION=${{ env.ADOT_JAVA_VERSION }}"
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
+          tags: ${{ env.TEST_TAG }}
+          load: true
+
+      - name: Test docker image
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        shell: bash
+        run: .github/scripts/test-adot-javaagent-image.sh "${{ env.TEST_TAG }}" "${{ env.ADOT_JAVA_VERSION }}"
 
       - name: Build with Gradle
         uses: gradle/gradle-build-action@v2
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -8,6 +8,7 @@ on:
 
 env:
   AWS_DEFAULT_REGION: us-east-1
+  TEST_TAG: public.ecr.aws/aws-observability/adot-autoinstrumentation-java:test
 
 permissions:
   id-token: write
@@ -52,6 +53,36 @@ jobs:
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build image for testing
+        uses: docker/build-push-action@v4
+        with:
+          push: false
+          build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}"
+          context: .
+          platforms: linux/amd64
+          tags: ${{ env.TEST_TAG }}
+          load: true
+
+      - name: Test docker image
+        shell: bash
+        run: .github/scripts/test-adot-javaagent-image.sh "${{ env.TEST_TAG }}" "${{ github.event.inputs.version }}"
+
+      - name: Build and push image
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}"
+          context: .
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v${{ github.event.inputs.version }}, public.ecr.aws/aws-observability/adot-autoinstrumentation-java:latest
+
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
