diff --git a/.github/workflows/node-lambda-test.yml b/.github/workflows/node-lambda-test.yml index ea081c8a3..290959631 100644 --- a/.github/workflows/node-lambda-test.yml +++ b/.github/workflows/node-lambda-test.yml @@ -148,12 +148,11 @@ jobs: shell: bash run: sleep 30s; curl -sS ${{ env.API_GATEWAY_URL }} - # Validation for pulse telemetry data - - name: Validate generated EMF logs - id: log-validation + - name: Validate generated traces + id: trace-validation # will be removed after data quality bug fixed continue-on-error: true - run: ./gradlew validator:run --args='-c node/lambda/log-validation.yml + run: ./gradlew validator:run --args='-c node/lambda/trace-validation.yml --testing-id ${{ env.TESTING_ID }} --endpoint http://${{ env.API_GATEWAY_URL }} --region ${{ inputs.aws-region }} @@ -163,12 +162,13 @@ jobs: --service-name ${{ env.TERRAFORM_LAMBDA_FUNCTION_NAME }} --rollup' - - name: Validate generated metrics - id: metric-validation - if: (success() || steps.log-validation.outcome == 'failure') && !cancelled() + # Validation for pulse telemetry data + - name: Validate generated EMF logs + id: log-validation + if: (success() || steps.trace-validation.outcome == 'failure') && !cancelled() # will be removed after data quality bug fixed continue-on-error: true - run: ./gradlew validator:run --args='-c node/lambda/metric-validation.yml + run: ./gradlew validator:run --args='-c node/lambda/log-validation.yml --testing-id ${{ env.TESTING_ID }} --endpoint http://${{ env.API_GATEWAY_URL }} --region ${{ inputs.aws-region }} @@ -178,12 +178,12 @@ jobs: --service-name ${{ env.TERRAFORM_LAMBDA_FUNCTION_NAME }} --rollup' - - name: Validate generated traces - id: trace-validation - if: (success() || steps.log-validation.outcome == 'failure' || steps.metric-validation.outcome == 'failure') && !cancelled() + - name: Validate generated metrics + id: metric-validation + if: (success() || steps.trace-validation.outcome == 'failure' || steps.log-validation.outcome == 'failure') && !cancelled() # will be removed after data quality bug fixed continue-on-error: true - run: ./gradlew validator:run --args='-c node/lambda/trace-validation.yml + run: ./gradlew validator:run --args='-c node/lambda/metric-validation.yml --testing-id ${{ env.TESTING_ID }} --endpoint http://${{ env.API_GATEWAY_URL }} --region ${{ inputs.aws-region }} diff --git a/.github/workflows/python-lambda-test.yml b/.github/workflows/python-lambda-test.yml index 405a363f2..f9e475123 100644 --- a/.github/workflows/python-lambda-test.yml +++ b/.github/workflows/python-lambda-test.yml @@ -174,12 +174,11 @@ jobs: max_retry: 3 sleep_time: 60 - # Validation for pulse telemetry data - - name: Validate generated EMF logs - id: log-validation + - name: Validate generated traces + id: trace-validation # will be removed after data quality bug fixed continue-on-error: true - run: ./gradlew validator:run --args='-c python/lambda/log-validation.yml + run: ./gradlew validator:run --args='-c python/lambda/trace-validation.yml --testing-id ${{ env.TESTING_ID }} --endpoint http://${{ env.API_GATEWAY_URL }} --region ${{ inputs.aws-region }} @@ -189,12 +188,13 @@ jobs: --service-name ${{ env.TERRAFORM_LAMBDA_FUNCTION_NAME }} --rollup' - - name: Validate generated metrics - id: metric-validation + # Validation for pulse telemetry data + - name: Validate generated EMF logs + id: log-validation + if: (success() || steps.trace-validation.outcome == 'failure') && !cancelled() # will be removed after data quality bug fixed continue-on-error: true - if: (success() || steps.log-validation.outcome == 'failure') && !cancelled() - run: ./gradlew validator:run --args='-c python/lambda/metric-validation.yml + run: ./gradlew validator:run --args='-c python/lambda/log-validation.yml --testing-id ${{ env.TESTING_ID }} --endpoint http://${{ env.API_GATEWAY_URL }} --region ${{ inputs.aws-region }} @@ -204,12 +204,12 @@ jobs: --service-name ${{ env.TERRAFORM_LAMBDA_FUNCTION_NAME }} --rollup' - - name: Validate generated traces - id: trace-validation + - name: Validate generated metrics + id: metric-validation # will be removed after data quality bug fixed continue-on-error: true - if: (success() || steps.log-validation.outcome == 'failure' || steps.metric-validation.outcome == 'failure') && !cancelled() - run: ./gradlew validator:run --args='-c python/lambda/trace-validation.yml + if: (success() || steps.trace-validation.outcome == 'failure' || steps.log-validation.outcome == 'failure') && !cancelled() + run: ./gradlew validator:run --args='-c python/lambda/metric-validation.yml --testing-id ${{ env.TESTING_ID }} --endpoint http://${{ env.API_GATEWAY_URL }} --region ${{ inputs.aws-region }} @@ -246,4 +246,4 @@ jobs: -var="function_name=${{env.TERRAFORM_LAMBDA_FUNCTION_NAME}}" \ -var="layer_artifacts_directory=${{ env.ARTIFACTS_DIR }}" \ -var="region=${{ env.E2E_TEST_AWS_REGION }}" \ - -var="is_canary=${{ env.IS_CANARY }}" \ No newline at end of file + -var="is_canary=${{ env.IS_CANARY }}" diff --git a/validator/src/main/java/com/amazon/aoc/enums/GenericConstants.java b/validator/src/main/java/com/amazon/aoc/enums/GenericConstants.java index 45ffce530..d5f1b2a52 100644 --- a/validator/src/main/java/com/amazon/aoc/enums/GenericConstants.java +++ b/validator/src/main/java/com/amazon/aoc/enums/GenericConstants.java @@ -20,7 +20,7 @@ @Getter public enum GenericConstants { // retry - SLEEP_IN_MILLISECONDS("30000"), // ms + SLEEP_IN_MILLISECONDS("10000"), // ms SLEEP_IN_SECONDS("30"), MAX_RETRIES("10"), diff --git a/validator/src/main/java/com/amazon/aoc/services/XRayService.java b/validator/src/main/java/com/amazon/aoc/services/XRayService.java index 15e9d577c..c757aca4c 100644 --- a/validator/src/main/java/com/amazon/aoc/services/XRayService.java +++ b/validator/src/main/java/com/amazon/aoc/services/XRayService.java @@ -25,13 +25,11 @@ import com.amazonaws.services.xray.model.TraceSummary; import java.util.Date; import java.util.List; -import lombok.extern.log4j.Log4j2; import org.joda.time.DateTime; -@Log4j2 public class XRayService { private AWSXRay awsxRay; - private final int SEARCH_PERIOD = 600 * 3; + private final int SEARCH_PERIOD = 600; public static String DEFAULT_TRACE_ID = "1-00000000-000000000000000000000000"; public XRayService(String region) { @@ -55,7 +53,6 @@ public List listTraceByIds(List traceIdList) { public List searchTraces(String traceFilter) { Date currentDate = new Date(); Date pastDate = new DateTime(currentDate).minusSeconds(SEARCH_PERIOD).toDate(); - log.info("--start-time: " + pastDate + ", --end-time: " + currentDate + ", traceFilter: " + traceFilter); GetTraceSummariesResult traceSummaryResult = awsxRay.getTraceSummaries( new GetTraceSummariesRequest()