EKS Language Test

Author: harrryr

.github/workflows/test-2.yml

@@ -14,11 +14,25 @@ permissions:
   contents: read
 
 jobs:
-  eks:
+  eks-8:
     strategy:
       fail-fast: false
       matrix:
-        aws-region: ['us-east-1']
+        aws-region: [ 'us-east-1' ]
+    uses: ./.github/workflows/java-eks-retry.yml
+    secrets: inherit
+    with:
+      aws-region: ${{ matrix.aws-region }}
+      test-cluster-name: 'e2e-canary-test'
+      caller-workflow-name: 'appsignals-e2e-eks-canary-test'
+      java-version: '8'
+
+  eks-11:
+    needs: eks-8
+    strategy:
+      fail-fast: false
+      matrix:
+        aws-region: [ 'us-east-1' ]
     uses: ./.github/workflows/java-eks-retry.yml
     secrets: inherit
     with:
@@ -27,6 +41,48 @@ jobs:
       caller-workflow-name: 'appsignals-e2e-eks-canary-test'
       java-version: '11'
 
+  eks-17:
+    needs: eks-11
+    strategy:
+      fail-fast: false
+      matrix:
+        aws-region: [ 'us-east-1' ]
+    uses: ./.github/workflows/java-eks-retry.yml
+    secrets: inherit
+    with:
+      aws-region: ${{ matrix.aws-region }}
+      test-cluster-name: 'e2e-canary-test'
+      caller-workflow-name: 'appsignals-e2e-eks-canary-test'
+      java-version: '17'
+
+  eks-21:
+    needs: eks-17
+    strategy:
+      fail-fast: false
+      matrix:
+        aws-region: [ 'us-east-1' ]
+    uses: ./.github/workflows/java-eks-retry.yml
+    secrets: inherit
+    with:
+      aws-region: ${{ matrix.aws-region }}
+      test-cluster-name: 'e2e-canary-test'
+      caller-workflow-name: 'appsignals-e2e-eks-canary-test'
+      java-version: '21'
+
+  eks-22:
+    needs: eks-21
+    strategy:
+      fail-fast: false
+      matrix:
+        aws-region: [ 'us-east-1' ]
+    uses: ./.github/workflows/java-eks-retry.yml
+    secrets: inherit
+    with:
+      aws-region: ${{ matrix.aws-region }}
+      test-cluster-name: 'e2e-canary-test'
+      caller-workflow-name: 'appsignals-e2e-eks-canary-test'
+      java-version: '22'
+
 #  k8s:
 #    uses: ./.github/workflows/java-k8s-retry.yml
 #    secrets: inherit

validator/src/main/resources/validations/java/eks/log-validation.yml

@@ -21,10 +21,4 @@
   httpPath: "/client-call"
   httpMethod: "get"
   callingType: "http"
-  expectedLogStructureTemplate: "JAVA_EKS_CLIENT_CALL_LOG"
--
-  validationType: "cw-log"
-  httpPath: "/mysql"
-  httpMethod: "get"
-  callingType: "http"
-  expectedLogStructureTemplate: "JAVA_EKS_RDS_MYSQL_LOG"
+  expectedLogStructureTemplate: "JAVA_EKS_CLIENT_CALL_LOG"

validator/src/main/resources/validations/java/eks/metric-validation.yml

@@ -22,9 +22,3 @@
   httpMethod: "get"
   callingType: "http"
   expectedMetricTemplate: "JAVA_EKS_CLIENT_CALL_METRIC"
--
-  validationType: "cw-metric"
-  httpPath: "/mysql"
-  httpMethod: "get"
-  callingType: "http"
-  expectedMetricTemplate: "JAVA_EKS_RDS_MYSQL_METRIC"

validator/src/main/resources/validations/java/eks/trace-validation.yml

@@ -21,10 +21,4 @@
   httpPath: "/client-call"
   httpMethod: "get"
   callingType: "http"
-  expectedTraceTemplate: "JAVA_EKS_CLIENT_CALL_TRACE"
--
-  validationType: "trace"
-  httpPath: "/mysql"
-  httpMethod: "get"
-  callingType: "http"
-  expectedTraceTemplate: "JAVA_EKS_RDS_MYSQL_TRACE"
+  expectedTraceTemplate: "JAVA_EKS_CLIENT_CALL_TRACE"