From 48c514364c3ee0acea0848f695f036414301c7a6 Mon Sep 17 00:00:00 2001 From: Xinran Zhang Date: Tue, 17 Sep 2024 23:47:04 -0700 Subject: [PATCH 1/4] Create a temporary mitigation solution for unstable java maven --- .github/workflows/java-ec2-default-test.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/java-ec2-default-test.yml b/.github/workflows/java-ec2-default-test.yml index 2ebf4fb1d..b7ea5ea4a 100644 --- a/.github/workflows/java-ec2-default-test.yml +++ b/.github/workflows/java-ec2-default-test.yml @@ -99,9 +99,8 @@ jobs: # Reusing the adot-main-build-staging-jar bucket to store the python wheel file echo GET_ADOT_JAR_COMMAND="aws s3 cp s3://adot-main-build-staging-jar/aws-opentelemetry-agent.jar ./adot.jar" >> $GITHUB_ENV elif [ "${{ env.OTEL_SOURCE }}" == "maven" ]; then - latest_version=$(curl -s "https://search.maven.org/solrsearch/select?q=g:software.amazon.opentelemetry+a:aws-opentelemetry-agent&core=gav&rows=1&wt=json" | jq -r '.response.docs[0].v') - echo "Latest version for Maven is: $latest_version" - echo GET_ADOT_JAR_COMMAND="wget -O adot.jar https://repo1.maven.org/maven2/software/amazon/opentelemetry/aws-opentelemetry-agent/$latest_version/aws-opentelemetry-agent-$latest_version.jar" >> $GITHUB_ENV + echo "Latest version for Maven is: 1.32.3" + echo GET_ADOT_JAR_COMMAND="wget -O adot.jar https://repo1.maven.org/maven2/software/amazon/opentelemetry/aws-opentelemetry-agent/1.32.3/aws-opentelemetry-agent-1.32.3.jar" >> $GITHUB_ENV else echo GET_ADOT_JAR_COMMAND="wget -O adot.jar https://github.com/aws-observability/aws-otel-java-instrumentation/releases/latest/download/aws-opentelemetry-agent.jar" >> $GITHUB_ENV fi From f4e991f1682704b485bc4517746d28c2bc3c7ba9 Mon Sep 17 00:00:00 2001 From: Xinran Zhang Date: Tue, 17 Sep 2024 23:47:43 -0700 Subject: [PATCH 2/4] test --- .github/workflows/java-ec2-canary.yml | 29 +++++++++++++++------------ 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/java-ec2-canary.yml b/.github/workflows/java-ec2-canary.yml index 0818ae15c..0586fb82f 100644 --- a/.github/workflows/java-ec2-canary.yml +++ b/.github/workflows/java-ec2-canary.yml @@ -10,25 +10,28 @@ on: schedule: - cron: '*/15 * * * *' # run the workflow every 15 minutes workflow_dispatch: # be able to run the workflow on demand + push: + branches: + - "java-maven-mitigation" 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' +# 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' maven: uses: ./.github/workflows/java-ec2-default-retry.yml From 068fcca25d2d28ae795210a4a2e2c37a17b33e55 Mon Sep 17 00:00:00 2001 From: Xinran Zhang Date: Tue, 17 Sep 2024 23:50:32 -0700 Subject: [PATCH 3/4] Revert "test" This reverts commit f4e991f1682704b485bc4517746d28c2bc3c7ba9. --- .github/workflows/java-ec2-canary.yml | 29 ++++++++++++--------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/.github/workflows/java-ec2-canary.yml b/.github/workflows/java-ec2-canary.yml index 0586fb82f..0818ae15c 100644 --- a/.github/workflows/java-ec2-canary.yml +++ b/.github/workflows/java-ec2-canary.yml @@ -10,28 +10,25 @@ on: schedule: - cron: '*/15 * * * *' # run the workflow every 15 minutes workflow_dispatch: # be able to run the workflow on demand - push: - branches: - - "java-maven-mitigation" 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' + 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' maven: uses: ./.github/workflows/java-ec2-default-retry.yml From de1a4e56bf69e4aba31683c2ce40c8abea7e3a3f Mon Sep 17 00:00:00 2001 From: Xinran Zhang Date: Tue, 17 Sep 2024 23:52:53 -0700 Subject: [PATCH 4/4] Add TODO comment for Maven Latest --- .github/workflows/java-ec2-default-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/java-ec2-default-test.yml b/.github/workflows/java-ec2-default-test.yml index b7ea5ea4a..db3e16d6c 100644 --- a/.github/workflows/java-ec2-default-test.yml +++ b/.github/workflows/java-ec2-default-test.yml @@ -93,6 +93,7 @@ jobs: role-to-assume: arn:aws:iam::${{ env.ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }} aws-region: ${{ env.E2E_TEST_AWS_REGION }} +# TODO: Use Latest version from Maven by latest_version=$(curl -s "https://search.maven.org/solrsearch/select?q=g:software.amazon.opentelemetry+a:aws-opentelemetry-agent&core=gav&rows=1&wt=json" | jq -r '.response.docs[0].v') - name: Set Get ADOT Wheel command environment variable run: | if [ "${{ github.event.repository.name }}" = "aws-otel-java-instrumentation" ]; then