From 9afaefde4ccfb7083abca9f0def0a8ccb6484240 Mon Sep 17 00:00:00 2001 From: Mahad Janjua Date: Thu, 20 Mar 2025 17:34:55 -0700 Subject: [PATCH] [Java] Remove EKS/K8s/EC2 canaries --- .github/workflows/java-ec2-canary.yml | 43 ------------ .github/workflows/java-ec2-default-retry.yml | 74 -------------------- .github/workflows/java-ecs-canary.yml | 28 -------- .github/workflows/java-ecs-retry.yml | 62 ---------------- .github/workflows/java-eks-canary.yml | 33 --------- .github/workflows/java-eks-retry.yml | 71 ------------------- .github/workflows/java-k8s-canary.yml | 27 ------- .github/workflows/java-k8s-retry.yml | 66 ----------------- 8 files changed, 404 deletions(-) delete mode 100644 .github/workflows/java-ec2-canary.yml delete mode 100644 .github/workflows/java-ec2-default-retry.yml delete mode 100644 .github/workflows/java-ecs-canary.yml delete mode 100644 .github/workflows/java-ecs-retry.yml delete mode 100644 .github/workflows/java-eks-canary.yml delete mode 100644 .github/workflows/java-eks-retry.yml delete mode 100644 .github/workflows/java-k8s-canary.yml delete mode 100644 .github/workflows/java-k8s-retry.yml diff --git a/.github/workflows/java-ec2-canary.yml b/.github/workflows/java-ec2-canary.yml deleted file mode 100644 index 3a52bec42..000000000 --- a/.github/workflows/java-ec2-canary.yml +++ /dev/null @@ -1,43 +0,0 @@ -## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -## SPDX-License-Identifier: Apache-2.0 - -## This workflow aims to run the Application Signals end-to-end tests as a canary to -## test the artifacts for App Signals enablement. It will deploy a sample app and remote -## service on two EC2 instances, call the APIs, and validate the generated telemetry, -## including logs, metrics, and traces. -name: Java EC2 Enablement Canary Testing -on: - schedule: - - cron: '6,31 * * * *' # run the workflow at 6th and 31th minute of every hour - workflow_dispatch: # be able to run the workflow on demand - -permissions: - id-token: write - contents: read - -jobs: - github: - strategy: - fail-fast: false - matrix: - aws-region: ['af-south-1','ap-east-1','ap-northeast-1','ap-northeast-2','ap-northeast-3','ap-south-1','ap-south-2','ap-southeast-1', - 'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1', - 'eu-south-1','eu-south-2','eu-west-1','eu-west-2','eu-west-3','il-central-1','me-central-1','me-south-1', 'sa-east-1', - 'us-east-1','us-east-2', 'us-west-1', 'us-west-2'] - uses: ./.github/workflows/java-ec2-default-retry.yml - secrets: inherit - with: - aws-region: ${{ matrix.aws-region }} - caller-workflow-name: 'appsignals-e2e-ec2-canary-test' - java-version: '11' - cpu-architecture: 'x86_64' - - maven: - uses: ./.github/workflows/java-ec2-default-retry.yml - secrets: inherit - with: - aws-region: 'us-east-1' - caller-workflow-name: 'appsignals-e2e-ec2-maven-canary-test' - otel-source: 'maven' - java-version: '11' - cpu-architecture: 'x86_64' \ No newline at end of file diff --git a/.github/workflows/java-ec2-default-retry.yml b/.github/workflows/java-ec2-default-retry.yml deleted file mode 100644 index 77edc7aca..000000000 --- a/.github/workflows/java-ec2-default-retry.yml +++ /dev/null @@ -1,74 +0,0 @@ -## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -## SPDX-License-Identifier: Apache-2.0 - -# This is a reusable workflow for running the Enablement test for App Signals. -# It is meant to be called from another workflow. -# Read more about reusable workflows: https://docs.github.com/en/actions/using-workflows/reusing-workflows#overview -name: Java EC2 default Retry -on: - workflow_call: - inputs: - aws-region: - required: true - type: string - caller-workflow-name: - required: true - type: string - java-version: - required: true - type: string - cpu-architecture: - required: false - type: string - default: "x86_64" - otel-source: - required: false - type: string - default: 'github' - -permissions: - id-token: write - contents: read - -jobs: - java-ec2-default-attempt-1: - uses: ./.github/workflows/java-ec2-default-test.yml - secrets: inherit - with: - aws-region: ${{ inputs.aws-region }} - caller-workflow-name: ${{ inputs.caller-workflow-name }} - java-version: ${{ inputs.java-version }} - otel-source: ${{ inputs.otel-source }} - cpu-architecture: ${{ inputs.cpu-architecture }} - - java-ec2-default-attempt-2: - needs: [ java-ec2-default-attempt-1 ] - if: ${{ needs.java-ec2-default-attempt-1.outputs.job-started != 'true' }} - uses: ./.github/workflows/java-ec2-default-test.yml - secrets: inherit - with: - aws-region: ${{ inputs.aws-region }} - caller-workflow-name: ${{ inputs.caller-workflow-name }} - java-version: ${{ inputs.java-version }} - otel-source: ${{ inputs.otel-source }} - cpu-architecture: ${{ inputs.cpu-architecture }} - - publish-metric-attempt-1: - needs: [ java-ec2-default-attempt-1, java-ec2-default-attempt-2 ] - if: always() - uses: ./.github/workflows/enablement-test-publish-result.yml - secrets: inherit - with: - aws-region: ${{ inputs.aws-region }} - caller-workflow-name: ${{ inputs.caller-workflow-name }} - validation-result: ${{ needs.java-ec2-default-attempt-1.outputs.validation-result || needs.java-ec2-default-attempt-2.outputs.validation-result }} - - publish-metric-attempt-2: - needs: [ java-ec2-default-attempt-1, java-ec2-default-attempt-2, publish-metric-attempt-1 ] - if: ${{ always() && needs.publish-metric-attempt-1.outputs.job-started != 'true' }} - uses: ./.github/workflows/enablement-test-publish-result.yml - secrets: inherit - with: - aws-region: ${{ inputs.aws-region }} - caller-workflow-name: ${{ inputs.caller-workflow-name }} - validation-result: ${{ needs.java-ec2-default-attempt-1.outputs.validation-result || needs.java-ec2-default-attempt-2.outputs.validation-result }} \ No newline at end of file diff --git a/.github/workflows/java-ecs-canary.yml b/.github/workflows/java-ecs-canary.yml deleted file mode 100644 index c8a76ea55..000000000 --- a/.github/workflows/java-ecs-canary.yml +++ /dev/null @@ -1,28 +0,0 @@ -## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -## SPDX-License-Identifier: Apache-2.0 - -## This workflow aims to run the Application Signals Java end-to-end tests as a canary to -## test the artifacts for Application Signals enablement. It will deploy a sample app onto an ECS cluster, -## call the APIs, and validate the generated telemetry, including logs, metrics, and traces. -name: Java ECS Enablement Canary Testing -on: - schedule: - - cron: '0,25 * * * *' # run the workflow at 0th and 25th minute of every hour - workflow_dispatch: # be able to run the workflow on demand - -permissions: - id-token: write - contents: read - -jobs: - ecs: - strategy: - fail-fast: false - matrix: - aws-region: ['us-east-1'] - uses: ./.github/workflows/java-ecs-retry.yml - secrets: inherit - with: - aws-region: ${{ matrix.aws-region }} - caller-workflow-name: 'appsignals-e2e-java-ecs-canary-test' - java-version: '11' \ No newline at end of file diff --git a/.github/workflows/java-ecs-retry.yml b/.github/workflows/java-ecs-retry.yml deleted file mode 100644 index 2c615a50e..000000000 --- a/.github/workflows/java-ecs-retry.yml +++ /dev/null @@ -1,62 +0,0 @@ -## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -## SPDX-License-Identifier: Apache-2.0 - -# This is a reusable workflow for running the Enablement test for App Signals. -# It is meant to be called from another workflow. -# Read more about reusable workflows: https://docs.github.com/en/actions/using-workflows/reusing-workflows#overview -name: Java ECS Retry -on: - workflow_call: - inputs: - aws-region: - required: true - type: string - caller-workflow-name: - required: true - type: string - java-version: - required: true - type: string - -permissions: - id-token: write - contents: read - -jobs: - java-ecs-attempt-1: - uses: ./.github/workflows/java-ecs-test.yml - secrets: inherit - with: - aws-region: ${{ inputs.aws-region }} - caller-workflow-name: ${{ inputs.caller-workflow-name }} - java-version: ${{ inputs.java-version }} - - java-ecs-attempt-2: - needs: [ java-ecs-attempt-1 ] - if: ${{ needs.java-ecs-attempt-1.outputs.job-started != 'true' }} - uses: ./.github/workflows/java-ecs-test.yml - secrets: inherit - with: - aws-region: ${{ inputs.aws-region }} - caller-workflow-name: ${{ inputs.caller-workflow-name }} - java-version: ${{ inputs.java-version }} - - publish-metric-attempt-1: - needs: [ java-ecs-attempt-1, java-ecs-attempt-2 ] - if: always() - uses: ./.github/workflows/enablement-test-publish-result.yml - secrets: inherit - with: - aws-region: ${{ inputs.aws-region }} - caller-workflow-name: ${{ inputs.caller-workflow-name }} - validation-result: ${{ needs.java-ecs-attempt-1.outputs.validation-result || needs.java-ecs-attempt-2.outputs.validation-result }} - - publish-metric-attempt-2: - needs: [ java-ecs-attempt-1, java-ecs-attempt-2, publish-metric-attempt-1 ] - if: ${{ always() && needs.publish-metric-attempt-1.outputs.job-started != 'true' }} - uses: ./.github/workflows/enablement-test-publish-result.yml - secrets: inherit - with: - aws-region: ${{ inputs.aws-region }} - caller-workflow-name: ${{ inputs.caller-workflow-name }} - validation-result: ${{ needs.java-ecs-attempt-1.outputs.validation-result || needs.java-ecs-attempt-2.outputs.validation-result }} \ No newline at end of file diff --git a/.github/workflows/java-eks-canary.yml b/.github/workflows/java-eks-canary.yml deleted file mode 100644 index c76f65d93..000000000 --- a/.github/workflows/java-eks-canary.yml +++ /dev/null @@ -1,33 +0,0 @@ -## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -## SPDX-License-Identifier: Apache-2.0 - -## This workflow aims to run the Application Signals end-to-end tests as a canary to -## test the artifacts for App Signals enablement. It will deploy a sample app and remote -## service onto an EKS cluster, call the APIs, and validate the generated telemetry, -## including logs, metrics, and traces. -name: Java EKS Enablement Canary Testing -on: - schedule: - - cron: '8,33 * * * *' # run the workflow at 8th and 33th minute of every hour - workflow_dispatch: # be able to run the workflow on demand - -permissions: - id-token: write - contents: read - -jobs: - eks: - strategy: - fail-fast: false - matrix: - aws-region: ['af-south-1','ap-east-1','ap-northeast-1','ap-northeast-2','ap-northeast-3','ap-south-1','ap-south-2','ap-southeast-1', - 'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1', - 'eu-south-1','eu-south-2','eu-west-1','eu-west-2','eu-west-3','il-central-1','me-central-1','me-south-1', 'sa-east-1', - 'us-east-1','us-east-2','us-west-1','us-west-2'] - uses: ./.github/workflows/java-eks-retry.yml - secrets: inherit - with: - aws-region: ${{ matrix.aws-region }} - test-cluster-name: 'e2e-canary-test' - caller-workflow-name: 'appsignals-e2e-eks-canary-test' - java-version: '11' diff --git a/.github/workflows/java-eks-retry.yml b/.github/workflows/java-eks-retry.yml deleted file mode 100644 index 9a0daba60..000000000 --- a/.github/workflows/java-eks-retry.yml +++ /dev/null @@ -1,71 +0,0 @@ -## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -## SPDX-License-Identifier: Apache-2.0 - -# This is a reusable workflow for running the Enablement test for App Signals. -# It is meant to be called from another workflow. -# Read more about reusable workflows: https://docs.github.com/en/actions/using-workflows/reusing-workflows#overview -name: Java EKS Retry -on: - workflow_call: - inputs: - aws-region: - required: true - type: string - test-cluster-name: - required: true - type: string - caller-workflow-name: - required: true - type: string - java-version: - required: true - type: string - -concurrency: - group: 'java-eks-${{ inputs.aws-region }}-${{ inputs.test-cluster-name }}' - cancel-in-progress: false - -permissions: - id-token: write - contents: read - -jobs: - java-eks-attempt-1: - uses: ./.github/workflows/java-eks-test.yml - secrets: inherit - with: - aws-region: ${{ inputs.aws-region }} - test-cluster-name: ${{ inputs.test-cluster-name }} - caller-workflow-name: ${{ inputs.caller-workflow-name }} - java-version: ${{ inputs.java-version }} - - java-eks-attempt-2: - needs: [ java-eks-attempt-1 ] - if: ${{ needs.java-eks-attempt-1.outputs.job-started != 'true' }} - uses: ./.github/workflows/java-eks-test.yml - secrets: inherit - with: - aws-region: ${{ inputs.aws-region }} - test-cluster-name: ${{ inputs.test-cluster-name }} - caller-workflow-name: ${{ inputs.caller-workflow-name }} - java-version: ${{ inputs.java-version }} - - publish-metric-attempt-1: - needs: [ java-eks-attempt-1, java-eks-attempt-2 ] - if: always() - uses: ./.github/workflows/enablement-test-publish-result.yml - secrets: inherit - with: - aws-region: ${{ inputs.aws-region }} - caller-workflow-name: ${{ inputs.caller-workflow-name }} - validation-result: ${{ needs.java-eks-attempt-1.outputs.validation-result || needs.java-eks-attempt-2.outputs.validation-result }} - - publish-metric-attempt-2: - needs: [ java-eks-attempt-1, java-eks-attempt-2, publish-metric-attempt-1 ] - if: ${{ always() && needs.publish-metric-attempt-1.outputs.job-started != 'true' }} - uses: ./.github/workflows/enablement-test-publish-result.yml - secrets: inherit - with: - aws-region: ${{ inputs.aws-region }} - caller-workflow-name: ${{ inputs.caller-workflow-name }} - validation-result: ${{ needs.java-eks-attempt-1.outputs.validation-result || needs.java-eks-attempt-2.outputs.validation-result }} \ No newline at end of file diff --git a/.github/workflows/java-k8s-canary.yml b/.github/workflows/java-k8s-canary.yml deleted file mode 100644 index f79592921..000000000 --- a/.github/workflows/java-k8s-canary.yml +++ /dev/null @@ -1,27 +0,0 @@ -## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -## SPDX-License-Identifier: Apache-2.0 - -## This workflow aims to run the Application Signals end-to-end tests as a canary to -## test the artifacts for App Signals enablement. It will deploy the CloudWatch Agent -## Operator and our sample app and remote service onto a native K8s cluster, call the -## APIs, and validate the generated telemetry, including logs, metrics, and traces. -## It will then clean up the cluster and EC2 instance it runs on for the next test run. -name: Java K8s Enablement Canary Testing -on: - schedule: - - cron: '0,25 * * * *' # run the workflow at 0th and 25th minute of every hour - workflow_dispatch: # be able to run the workflow on demand - -permissions: - id-token: write - contents: read - -jobs: - k8s: - uses: ./.github/workflows/java-k8s-retry.yml - secrets: inherit - with: - # To run in more regions, a cluster must be provisioned manually on EC2 instances in that region - aws-region: 'us-east-1' - caller-workflow-name: 'appsignals-e2e-k8s-canary-test' - java-version: '11' \ No newline at end of file diff --git a/.github/workflows/java-k8s-retry.yml b/.github/workflows/java-k8s-retry.yml deleted file mode 100644 index fe85a14c5..000000000 --- a/.github/workflows/java-k8s-retry.yml +++ /dev/null @@ -1,66 +0,0 @@ -## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -## SPDX-License-Identifier: Apache-2.0 - -# This is a reusable workflow for running the Enablement test for App Signals. -# It is meant to be called from another workflow. -# Read more about reusable workflows: https://docs.github.com/en/actions/using-workflows/reusing-workflows#overview -name: Java K8s Retry -on: - workflow_call: - inputs: - aws-region: - required: true - type: string - caller-workflow-name: - required: true - type: string - java-version: - required: true - type: string - -concurrency: - group: 'java-k8s-${{ inputs.aws-region }}-${{ github.ref_name }}' - cancel-in-progress: false - -permissions: - id-token: write - contents: read - -jobs: - java-k8s-attempt-1: - uses: ./.github/workflows/java-k8s-test.yml - secrets: inherit - with: - aws-region: ${{ inputs.aws-region }} - caller-workflow-name: ${{ inputs.caller-workflow-name }} - java-version: ${{ inputs.java-version }} - - java-k8s-attempt-2: - needs: [ java-k8s-attempt-1 ] - if: ${{ needs.java-k8s-attempt-1.outputs.job-started != 'true' }} - uses: ./.github/workflows/java-k8s-test.yml - secrets: inherit - with: - aws-region: ${{ inputs.aws-region }} - caller-workflow-name: ${{ inputs.caller-workflow-name }} - java-version: ${{ inputs.java-version }} - - publish-metric-attempt-1: - needs: [ java-k8s-attempt-1, java-k8s-attempt-2 ] - if: always() - uses: ./.github/workflows/enablement-test-publish-result.yml - secrets: inherit - with: - aws-region: ${{ inputs.aws-region }} - caller-workflow-name: ${{ inputs.caller-workflow-name }} - validation-result: ${{ needs.java-k8s-attempt-1.outputs.validation-result || needs.java-k8s-attempt-2.outputs.validation-result }} - - publish-metric-attempt-2: - needs: [ java-k8s-attempt-1, java-k8s-attempt-2, publish-metric-attempt-1 ] - if: ${{ always() && needs.publish-metric-attempt-1.outputs.job-started != 'true' }} - uses: ./.github/workflows/enablement-test-publish-result.yml - secrets: inherit - with: - aws-region: ${{ inputs.aws-region }} - caller-workflow-name: ${{ inputs.caller-workflow-name }} - validation-result: ${{ needs.java-k8s-attempt-1.outputs.validation-result || needs.java-k8s-attempt-2.outputs.validation-result }} \ No newline at end of file