Skip to content

Add an EC2 test for Maven #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 10, 2024
Merged

Add an EC2 test for Maven #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d853bb
Add an EC2 test for Maven
harrryr Aug 30, 2024
911fe56
Merge branch 'main' into add-maven-test
harrryr Sep 9, 2024
cd9e08b
Remove ASG
harrryr Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .github/workflows/java-ec2-canary.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ permissions:
contents: read

jobs:
default:
github:
strategy:
fail-fast: false
matrix:
Expand All @@ -28,4 +28,12 @@ jobs:
secrets: inherit
with:
aws-region: ${{ matrix.aws-region }}
caller-workflow-name: 'appsignals-e2e-ec2-canary-test'
caller-workflow-name: 'appsignals-e2e-ec2-canary-test'

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'
6 changes: 6 additions & 0 deletions .github/workflows/java-ec2-default-retry.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ on:
caller-workflow-name:
required: true
type: string
otel-source:
required: false
type: string
default: 'github'

permissions:
id-token: write
Expand All @@ -26,6 +30,7 @@ jobs:
with:
aws-region: ${{ inputs.aws-region }}
caller-workflow-name: ${{ inputs.caller-workflow-name }}
otel-source: ${{ inputs.otel-source }}

java-ec2-default-attempt-2:
needs: [ java-ec2-default-attempt-1 ]
Expand All @@ -35,6 +40,7 @@ jobs:
with:
aws-region: ${{ inputs.aws-region }}
caller-workflow-name: ${{ inputs.caller-workflow-name }}
otel-source: ${{ inputs.otel-source }}

publish-metric-attempt-1:
needs: [ java-ec2-default-attempt-1, java-ec2-default-attempt-2 ]
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/java-ec2-default-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ on:
caller-workflow-name:
required: true
type: string
otel-source:
required: false
type: string
default: 'github'
outputs:
job-started:
value: ${{ jobs.java-ec2-default.outputs.job-started }}
Expand All @@ -27,6 +31,7 @@ permissions:
env:
E2E_TEST_AWS_REGION: ${{ inputs.aws-region }}
CALLER_WORKFLOW_NAME: ${{ inputs.caller-workflow-name }}
OTEL_SOURCE: ${{ inputs.otel-source }}
SAMPLE_APP_FRONTEND_SERVICE_JAR: s3://aws-appsignals-sample-app-prod-${{ inputs.aws-region }}/main-service.jar
SAMPLE_APP_REMOTE_SERVICE_JAR: s3://aws-appsignals-sample-app-prod-${{ inputs.aws-region }}/remote-service.jar
E2E_TEST_ACCOUNT_ID: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}
Expand All @@ -48,7 +53,7 @@ jobs:
run: echo "job-started=true" >> $GITHUB_OUTPUT

- name: Generate testing id
run: echo TESTING_ID="${{ github.job }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}" >> $GITHUB_ENV
run: echo TESTING_ID="${{ github.run_id }}-${{ github.run_number }}-${RANDOM}" >> $GITHUB_ENV

- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -93,6 +98,10 @@ jobs:
if [ "${{ github.event.repository.name }}" = "aws-otel-java-instrumentation" ]; then
# 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
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
Expand Down