test amend

Author: liustve

.github/workflows/java-ec2-adot-sigv4-test.yml

@@ -176,41 +176,41 @@ jobs:
           max_retry: 3
           sleep_time: 60
 
-      # # Validation for pulse telemetry data
-      # - name: Validate generated EMF logs
-      #   id: log-validation
-      #   run: ./gradlew validator:run --args='-c java/ec2/adot-sigv4/log-validation.yml
-      #         --testing-id ${{ env.TESTING_ID }}
-      #         --endpoint http://${{ env.MAIN_SERVICE_ENDPOINT }}
-      #         --remote-service-deployment-name ${{ env.REMOTE_SERVICE_IP }}:8080
-      #         --region ${{ env.E2E_TEST_AWS_REGION }}
-      #         --account-id ${{ env.E2E_TEST_ACCOUNT_ID }}
-      #         --metric-namespace ${{ env.METRIC_NAMESPACE }}
-      #         --log-group ${{ env.LOG_GROUP_NAME }}
-      #         --service-name sample-application-${{ env.TESTING_ID }}
-      #         --remote-service-name sample-remote-application-${{ env.TESTING_ID }}
-      #         --query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
-      #         --instance-ami ${{ env.EC2_INSTANCE_AMI }}
-      #         --instance-id ${{ env.MAIN_SERVICE_INSTANCE_ID }}
-      #         --rollup'
-
-      # - name: Validate generated metrics
-      #   id: metric-validation
-      #   if: (success() || steps.log-validation.outcome == 'failure') && !cancelled()
-      #   run: ./gradlew validator:run --args='-c java/ec2/adot-sigv4/metric-validation.yml
-      #     --testing-id ${{ env.TESTING_ID }}
-      #     --endpoint http://${{ env.MAIN_SERVICE_ENDPOINT }}
-      #     --remote-service-deployment-name ${{ env.REMOTE_SERVICE_IP }}:8080
-      #     --region ${{ env.E2E_TEST_AWS_REGION }}
-      #     --account-id ${{ env.E2E_TEST_ACCOUNT_ID }}
-      #     --metric-namespace ${{ env.METRIC_NAMESPACE }}
-      #     --log-group ${{ env.LOG_GROUP_NAME }}
-      #     --service-name sample-application-${{ env.TESTING_ID }}
-      #     --remote-service-name sample-remote-application-${{ env.TESTING_ID }}
-      #     --query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
-      #     --instance-ami ${{ env.EC2_INSTANCE_AMI }}
-      #     --instance-id ${{ env.MAIN_SERVICE_INSTANCE_ID }}
-      #     --rollup'
+      # Validation for pulse telemetry data
+      - name: Validate generated EMF logs
+        id: log-validation
+        run: ./gradlew validator:run --args='-c java/ec2/adot-sigv4/log-validation.yml
+              --testing-id ${{ env.TESTING_ID }}
+              --endpoint http://${{ env.MAIN_SERVICE_ENDPOINT }}
+              --remote-service-deployment-name ${{ env.REMOTE_SERVICE_IP }}:8080
+              --region ${{ env.E2E_TEST_AWS_REGION }}
+              --account-id ${{ env.E2E_TEST_ACCOUNT_ID }}
+              --metric-namespace ${{ env.METRIC_NAMESPACE }}
+              --log-group ${{ env.LOG_GROUP_NAME }}
+              --service-name sample-application-${{ env.TESTING_ID }}
+              --remote-service-name sample-remote-application-${{ env.TESTING_ID }}
+              --query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
+              --instance-ami ${{ env.EC2_INSTANCE_AMI }}
+              --instance-id ${{ env.MAIN_SERVICE_INSTANCE_ID }}
+              --rollup'
+
+      - name: Validate generated metrics
+        id: metric-validation
+        if: (success() || steps.log-validation.outcome == 'failure') && !cancelled()
+        run: ./gradlew validator:run --args='-c java/ec2/adot-sigv4/metric-validation.yml
+          --testing-id ${{ env.TESTING_ID }}
+          --endpoint http://${{ env.MAIN_SERVICE_ENDPOINT }}
+          --remote-service-deployment-name ${{ env.REMOTE_SERVICE_IP }}:8080
+          --region ${{ env.E2E_TEST_AWS_REGION }}
+          --account-id ${{ env.E2E_TEST_ACCOUNT_ID }}
+          --metric-namespace ${{ env.METRIC_NAMESPACE }}
+          --log-group ${{ env.LOG_GROUP_NAME }}
+          --service-name sample-application-${{ env.TESTING_ID }}
+          --remote-service-name sample-remote-application-${{ env.TESTING_ID }}
+          --query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
+          --instance-ami ${{ env.EC2_INSTANCE_AMI }}
+          --instance-id ${{ env.MAIN_SERVICE_INSTANCE_ID }}
+          --rollup'
 
       - name: Validate generated traces
         id: trace-validation