Refactor code

Author: harrryr

.github/workflows/application-signals-python-e2e-ec2-asg-test.yml

@@ -42,10 +42,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           repository: aws-observability/aws-application-signals-test-framework
-          ref: add-ec2-platform-for-python-ga
-
-      - name: Set CW Agent RPM environment variable
-        run: echo GET_CW_AGENT_RPM_COMMAND="aws s3api get-object --bucket private-cloudwatch-agent-apm-beta --key linux_amd64/amazon-cloudwatch-agent.rpm cw-agent.rpm" >> $GITHUB_ENV
+          ref: ga-python
 
       - name: Generate testing id
         run: echo TESTING_ID="${{ github.job }}-${{ env.AWS_DEFAULT_REGION }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}" >> $GITHUB_ENV

.github/workflows/application-signals-python-e2e-ec2-default-test.yml

@@ -43,9 +43,6 @@ jobs:
           repository: aws-observability/aws-application-signals-test-framework
           ref: ga-python
 
-      - name: Set CW Agent RPM environment variable
-        run: echo GET_CW_AGENT_RPM_COMMAND="aws s3api get-object --bucket private-cloudwatch-agent-apm-beta --key linux_amd64/amazon-cloudwatch-agent.rpm cw-agent.rpm" >> $GITHUB_ENV
-
       - name: Generate testing id
         run: echo TESTING_ID="${{ github.job }}-${{ env.AWS_DEFAULT_REGION }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}" >> $GITHUB_ENV
 
@@ -87,6 +84,7 @@ jobs:
 #            echo GET_ADOT_WHEEL_COMMAND="python3.9 -m pip install ${{ env.ADOT_WHEEL_NAME }}==0.1.1" >> $GITHUB_ENV
 #          fi
 
+
       - name: Initiate Terraform
         uses: ./.github/workflows/actions/execute_and_retry
         with:

.github/workflows/application-signals-python-e2e-eks-test.yml

@@ -42,7 +42,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           repository: aws-observability/aws-application-signals-test-framework
-          ref: add-ec2-platform-for-python-ga
+          ref: ga-python
 
       - name: Download enablement script
         uses: ./.github/workflows/actions/execute_and_retry

terraform/python/ec2/asg/main.tf

@@ -119,7 +119,8 @@ resource "aws_launch_configuration" "launch_configuration" {
 
     # Export environment variables for instrumentation
     cd ./django_frontend_service
-    # Delete the requests requirement as it is installed already using rpm
+    # Delete the requests requirement as it is installed already using rpm. Only applicable for ec2 instances
+    # created by Auto Scaling Groups
     sudo sed -i '/requests/d' ./requirements.txt
     python3.9 -m pip install -r requirements.txt
     export DJANGO_SETTINGS_MODULE="django_frontend_service.settings"