test

Author: bjrara

.github/workflows/java-ec2-canary.yml

@@ -20,10 +20,7 @@ jobs:
     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']
+        aws-region: ['us-east-2']
     uses: ./.github/workflows/java-ec2-default-retry.yml
     secrets: inherit
     with:

.github/workflows/java-ec2-default-test.yml

@@ -44,10 +44,11 @@ env:
   JAVA_VERSION: ${{ inputs.java-version }}
   OTEL_SOURCE: ${{ inputs.otel-source }}
   CPU_ARCHITECTURE: ${{ inputs.cpu-architecture }}
-  SAMPLE_APP_FRONTEND_SERVICE_JAR: s3://aws-appsignals-sample-app-prod-${{ inputs.aws-region }}/java-main-service-v${{ inputs.java-version }}.jar
-  SAMPLE_APP_REMOTE_SERVICE_JAR: s3://aws-appsignals-sample-app-prod-${{ inputs.aws-region }}/java-remote-service-v${{ inputs.java-version }}.jar
   E2E_TEST_ACCOUNT_ID: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}
   E2E_TEST_ROLE_NAME: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ROLE_NAME }}
+  SAMPLE_APP_FRONTEND_SERVICE_JAR: s3://aws-appsignals-sample-app-zmengyi-${{ inputs.aws-region }}/java-main-service-v${{ inputs.java-version }}.jar
+  SAMPLE_APP_REMOTE_SERVICE_JAR: s3://aws-appsignals-sample-app-zmengyi-${{ inputs.aws-region }}/java-remote-service-v${{ inputs.java-version }}.jar
+  ACCOUNT_ID: 633750930120
   METRIC_NAMESPACE: ApplicationSignals
   LOG_GROUP_NAME: /aws/application-signals/data
   TEST_RESOURCES_FOLDER: ${GITHUB_WORKSPACE}
@@ -91,12 +92,6 @@ jobs:
           role-to-assume: arn:aws:iam::${{ env.E2E_TEST_ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
           aws-region: us-east-1
 
-      - name: Retrieve account
-        uses: aws-actions/aws-secretsmanager-get-secrets@v1
-        with:
-          secret-ids: |
-            ACCOUNT_ID, region-account/${{ env.E2E_TEST_AWS_REGION }}
-
       # If the workflow is running as a canary, then we want to log in to the aws account in the appropriate region
       - name: Configure AWS Credentials
         if: ${{ github.event.repository.name == 'aws-application-signals-test-framework' }}
@@ -105,31 +100,13 @@ 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
-            # 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
-            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
+          echo GET_ADOT_JAR_COMMAND="aws s3 cp s3://adot-build/aws-otel-java-instrumentation-1.33.0-SNAPSHOT.jar ./adot.jar" >> $GITHUB_ENV
 
       - name: Set Get CW Agent command environment variable
         run: |
-          if [ "${{ github.event.repository.name }}" = "amazon-cloudwatch-agent" ]; then
-            # Reusing the adot-main-build-staging-jar bucket to store the python wheel file
-            echo GET_CW_AGENT_RPM_COMMAND= "aws s3 cp s3://${{ secrets.S3_INTEGRATION_BUCKET }}/integration-test/binary/${{ github.sha }}/amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm ./cw-agent.rpm" >> $GITHUB_ENV
-          else
-            if [ "${{ env.CPU_ARCHITECTURE }}" = "x86_64" ]; then
-              echo GET_CW_AGENT_RPM_COMMAND="wget -O cw-agent.rpm https://amazoncloudwatch-agent-${{ inputs.aws-region }}.s3.${{ inputs.aws-region }}.amazonaws.com/amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm" >> $GITHUB_ENV
-            elif [ "${{ env.CPU_ARCHITECTURE }}" = "arm64" ]; then
-              echo GET_CW_AGENT_RPM_COMMAND="wget -O cw-agent.rpm https://amazoncloudwatch-agent-${{ inputs.aws-region }}.s3.${{ inputs.aws-region }}.amazonaws.com/amazon_linux/arm64/latest/amazon-cloudwatch-agent.rpm" >> $GITHUB_ENV
-            fi
-          fi
+          echo GET_CW_AGENT_RPM_COMMAND= "aws s3 cp s3://amazon-cloudwatch-agent-build/amazon-cloudwatch-agent.rpm ./cw-agent.rpm" >> $GITHUB_ENV
 
       - name: Set up terraform
         uses: ./.github/workflows/actions/execute_and_retry

terraform/java/ec2/default/main.tf

@@ -81,7 +81,7 @@ resource "aws_instance" "main_service_instance" {
   ami                                   = data.aws_ami.ami.id # Amazon Linux 2 (free tier)
   instance_type                         = var.cpu_architecture == "x86_64" ? "t3.micro" : "t4g.micro"
   key_name                              = local.ssh_key_name
-  iam_instance_profile                  = "APP_SIGNALS_EC2_TEST_ROLE"
+  iam_instance_profile                  = "EC2-Pet-Clinic-Role"
   vpc_security_group_ids                = [aws_default_vpc.default.default_security_group_id]
   associate_public_ip_address           = true
   instance_initiated_shutdown_behavior  = "terminate"