Address TODOs

Author: majanjua-amzn

.github/workflows/java-eks-otlp-ocb-canary.yml

@@ -1,9 +1,14 @@
 ## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 ## SPDX-License-Identifier: Apache-2.0
 
-# TODO: Add comment
+## This workflow aims to run the Application Signals end-to-end tests as a canary to
+## test the artifacts for App Signals enablement. It will deploy a sample app and remote
+## service onto an EKS cluster, instrumented using an OTel Collector built through
+## OTel Collector Builder (OCB) and interacting with the OTLP endpoint for this use case.
+## Logs, metrics, and traces are all validated.
 name: Java EKS OTLP/OCB Enablement Canary Test
 on:
+  # TODO: Reintroduce cron-job
   # schedule:
   #   - cron: '12,37 * * * *' # run the workflow at 12th and 37th minute of every hour
   workflow_dispatch: # be able to run the workflow on demand
@@ -21,6 +26,7 @@ jobs:
       fail-fast: false
       matrix:
         aws-region: ['us-west-1']
+        # TODO: Reintroduce all regions (one more first, then all except eu-central-2, then eu-central-2 when infra is deployed)
         # 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',

.github/workflows/java-eks-otlp-ocb-retry.yml

@@ -30,7 +30,7 @@ permissions:
   contents: read
 
 jobs:
-  java-eks-otlp-ocb-attempt-1:
+  java-eks-attempt-1:
     uses: ./.github/workflows/java-eks-otlp-ocb-test.yml
     secrets: inherit
     with:
@@ -39,33 +39,33 @@ jobs:
       caller-workflow-name: ${{ inputs.caller-workflow-name }}
       java-version: ${{ inputs.java-version }}
 
-  # java-eks-otlp-ocb-attempt-2:
-  #   needs: [ java-eks-otlp-ocb-attempt-1 ]
-  #   if: ${{ needs.java-eks-otlp-ocb-attempt-1.outputs.job-started != 'true' }}
-  #   uses: ./.github/workflows/java-eks-otlp-ocb-test.yml
-  #   secrets: inherit
-  #   with:
-  #     aws-region: ${{ inputs.aws-region }}
-  #     test-cluster-name: ${{ inputs.test-cluster-name }}
-  #     caller-workflow-name: ${{ inputs.caller-workflow-name }}
-  #     java-version: ${{ inputs.java-version }}
+  java-eks-attempt-2:
+    needs: [ java-eks-attempt-1 ]
+    if: ${{ needs.java-eks-attempt-1.outputs.job-started != 'true' }}
+    uses: ./.github/workflows/java-eks-otlp-ocb-test.yml
+    secrets: inherit
+    with:
+      aws-region: ${{ inputs.aws-region }}
+      test-cluster-name: ${{ inputs.test-cluster-name }}
+      caller-workflow-name: ${{ inputs.caller-workflow-name }}
+      java-version: ${{ inputs.java-version }}
 
-  # publish-metric-attempt-1:
-  #   needs: [ java-eks-otlp-ocb-attempt-1, java-eks-otlp-ocb-attempt-2 ]
-  #   if: always()
-  #   uses: ./.github/workflows/enablement-test-publish-result.yml
-  #   secrets: inherit
-  #   with:
-  #     aws-region: ${{ inputs.aws-region }}
-  #     caller-workflow-name: ${{ inputs.caller-workflow-name }}
-  #     validation-result: ${{ needs.java-eks-otlp-ocb-attempt-1.outputs.validation-result || needs.java-eks-otlp-ocb-attempt-2.outputs.validation-result }}
+  publish-metric-attempt-1:
+    needs: [ java-eks-attempt-1, java-eks-attempt-2 ]
+    if: always()
+    uses: ./.github/workflows/enablement-test-publish-result.yml
+    secrets: inherit
+    with:
+      aws-region: ${{ inputs.aws-region }}
+      caller-workflow-name: ${{ inputs.caller-workflow-name }}
+      validation-result: ${{ needs.java-eks-attempt-1.outputs.validation-result || needs.java-eks-attempt-2.outputs.validation-result }}
 
-  # publish-metric-attempt-2:
-  #   needs: [ java-eks-otlp-ocb-attempt-1, java-eks-otlp-ocb-attempt-2, publish-metric-attempt-1 ]
-  #   if: ${{ always() && needs.publish-metric-attempt-1.outputs.job-started != 'true' }}
-  #   uses: ./.github/workflows/enablement-test-publish-result.yml
-  #   secrets: inherit
-  #   with:
-  #     aws-region: ${{ inputs.aws-region }}
-  #     caller-workflow-name: ${{ inputs.caller-workflow-name }}
-  #     validation-result: ${{ needs.java-eks-otlp-ocb-attempt-1.outputs.validation-result || needs.java-eks-otlp-ocb-attempt-2.outputs.validation-result }}
+  publish-metric-attempt-2:
+    needs: [ java-eks-attempt-1, java-eks-attempt-2, publish-metric-attempt-1 ]
+    if: ${{ always() && needs.publish-metric-attempt-1.outputs.job-started != 'true' }}
+    uses: ./.github/workflows/enablement-test-publish-result.yml
+    secrets: inherit
+    with:
+      aws-region: ${{ inputs.aws-region }}
+      caller-workflow-name: ${{ inputs.caller-workflow-name }}
+      validation-result: ${{ needs.java-eks-attempt-1.outputs.validation-result || needs.java-eks-attempt-2.outputs.validation-result }}