[Java/eks-otlp-ocb] Test validation adjustments

aws-observability · Nov 15, 2024 · 4ee4a56 · 4ee4a56
1 parent 4ea000a
commit 4ee4a56
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 189 deletions.
diff --git a/...tor/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-log.mustache b/...tor/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-log.mustache
@@ -1,5 +1,4 @@
 [{
-  "EC2.AutoScalingGroup": "^eks-.+",
   "EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
   "EKS.Cluster": "^{{platformInfo}}$",
   "Environment": "^eks:{{platformInfo}}/{{appNamespace}}$",
@@ -15,7 +14,6 @@
   "Host": "^ip(-[0-9]{1,3}){4}.*$"
 },
 {
-  "EC2.AutoScalingGroup": "^eks-.+",
   "EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
   "EKS.Cluster": "^{{platformInfo}}$",
   "Environment": "^eks:{{platformInfo}}/{{appNamespace}}$",

diff --git a/...ator/src/main/resources/expected-data-template/java/eks-otlp-ocb/client-call-log.mustache b/...ator/src/main/resources/expected-data-template/java/eks-otlp-ocb/client-call-log.mustache
@@ -1,5 +1,4 @@
 [{
-  "EC2.AutoScalingGroup": "^eks-.+",
   "EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
   "EKS.Cluster": "^{{platformInfo}}$",
   "Environment": "^eks:{{platformInfo}}/{{appNamespace}}$",
@@ -15,7 +14,6 @@
   "Host": "^ip(-[0-9]{1,3}){4}.*$"
 },
 {
-  "EC2.AutoScalingGroup": "^eks-.+",
   "EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
   "EKS.Cluster": "^{{platformInfo}}$",
   "Environment": "^eks:{{platformInfo}}/{{appNamespace}}$",

diff --git a/...c/main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-log.mustache b/...c/main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-log.mustache
@@ -1,5 +1,4 @@
 [{
-  "EC2.AutoScalingGroup": "^eks-.+",
   "EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
   "EKS.Cluster": "^{{platformInfo}}$",
   "Environment": "^eks:{{platformInfo}}/{{appNamespace}}$",
@@ -15,7 +14,6 @@
   "Host": "^ip(-[0-9]{1,3}){4}.*$"
 },
 {
-  "EC2.AutoScalingGroup": "^eks-.+",
   "EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
   "EKS.Cluster": "^{{platformInfo}}$",
   "Environment": "^eks:{{platformInfo}}/{{appNamespace}}$",

diff --git a/...r/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-log.mustache b/...r/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-log.mustache
@@ -1,5 +1,4 @@
 [{
-  "EC2.AutoScalingGroup": "^eks-.+",
   "EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
   "EKS.Cluster": "^{{platformInfo}}$",
   "Environment": "^eks:{{platformInfo}}/{{appNamespace}}$",
@@ -15,7 +14,6 @@
   "Host": "^ip(-[0-9]{1,3}){4}.*$"
 },
 {
-  "EC2.AutoScalingGroup": "^eks-.+",
   "EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
   "EKS.Cluster": "^{{platformInfo}}$",
   "Environment": "^eks:{{platformInfo}}/{{appNamespace}}$",

diff --git a/...rc/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-metric.mustache b/...rc/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-metric.mustache
@@ -107,66 +107,6 @@
       name: RemoteService
       value: {{remoteServiceDeploymentName}}
 
--
-  metricName: Latency
-  namespace: {{metricNamespace}}
-  dimensions:
-    -
-      name: Environment
-      value: eks:{{platformInfo}}/{{appNamespace}}
-    -
-      name: RemoteEnvironment
-      value: eks:{{platformInfo}}/{{appNamespace}}
-    -
-      name: RemoteService
-      value: {{remoteServiceDeploymentName}}
-    -
-      name: Service
-      value: {{serviceName}}
-
--
-  metricName: Latency
-  namespace: {{metricNamespace}}
-  dimensions:
-    -
-      name: Environment
-      value: eks:{{platformInfo}}/{{appNamespace}}
-    -
-      name: RemoteEnvironment
-      value: eks:{{platformInfo}}/{{appNamespace}}
-    -
-      name: RemoteOperation
-      value: GET /healthcheck
-    -
-      name: RemoteService
-      value: {{remoteServiceDeploymentName}}
-    -
-      name: Service
-      value: {{serviceName}}
-
--
-  metricName: Latency
-  namespace: {{metricNamespace}}
-  dimensions:
-    -
-      name: Environment
-      value: eks:{{platformInfo}}/{{appNamespace}}
-    -
-      name: RemoteEnvironment
-      value: eks:{{platformInfo}}/{{appNamespace}}
-    -
-      name: Operation
-      value: GET /remote-service
-    -
-      name: RemoteOperation
-      value: GET /healthcheck
-    -
-      name: RemoteService
-      value: {{remoteServiceDeploymentName}}
-    -
-      name: Service
-      value: {{serviceName}}
-
 -
   metricName: Error
   namespace: {{metricNamespace}}
@@ -276,66 +216,6 @@
       name: RemoteService
       value: {{remoteServiceDeploymentName}}
 
--
-  metricName: Error
-  namespace: {{metricNamespace}}
-  dimensions:
-    -
-      name: Environment
-      value: eks:{{platformInfo}}/{{appNamespace}}
-    -
-      name: RemoteEnvironment
-      value: eks:{{platformInfo}}/{{appNamespace}}
-    -
-      name: RemoteService
-      value: {{remoteServiceDeploymentName}}
-    -
-      name: Service
-      value: {{serviceName}}
-
--
-  metricName: Error
-  namespace: {{metricNamespace}}
-  dimensions:
-    -
-      name: Environment
-      value: eks:{{platformInfo}}/{{appNamespace}}
-    -
-      name: RemoteEnvironment
-      value: eks:{{platformInfo}}/{{appNamespace}}
-    -
-      name: RemoteOperation
-      value: GET /healthcheck
-    -
-      name: RemoteService
-      value: {{remoteServiceDeploymentName}}
-    -
-      name: Service
-      value: {{serviceName}}
-
--
-  metricName: Error
-  namespace: {{metricNamespace}}
-  dimensions:
-    -
-      name: Environment
-      value: eks:{{platformInfo}}/{{appNamespace}}
-    -
-      name: RemoteEnvironment
-      value: eks:{{platformInfo}}/{{appNamespace}}
-    -
-      name: Operation
-      value: GET /remote-service
-    -
-      name: RemoteOperation
-      value: GET /healthcheck
-    -
-      name: RemoteService
-      value: {{remoteServiceDeploymentName}}
-    -
-      name: Service
-      value: {{serviceName}}
-
 -
   metricName: Fault
   namespace: {{metricNamespace}}
@@ -443,64 +323,4 @@
   dimensions:
     -
       name: RemoteService
-      value: {{remoteServiceDeploymentName}}
-
--
-  metricName: Fault
-  namespace: {{metricNamespace}}
-  dimensions:
-    -
-      name: Environment
-      value: eks:{{platformInfo}}/{{appNamespace}}
-    -
-      name: RemoteEnvironment
-      value: eks:{{platformInfo}}/{{appNamespace}}
-    -
-      name: RemoteService
-      value: {{remoteServiceDeploymentName}}
-    -
-      name: Service
-      value: {{serviceName}}
-
--
-  metricName: Fault
-  namespace: {{metricNamespace}}
-  dimensions:
-    -
-      name: Environment
-      value: eks:{{platformInfo}}/{{appNamespace}}
-    -
-      name: RemoteEnvironment
-      value: eks:{{platformInfo}}/{{appNamespace}}
-    -
-      name: RemoteOperation
-      value: GET /healthcheck
-    -
-      name: RemoteService
-      value: {{remoteServiceDeploymentName}}
-    -
-      name: Service
-      value: {{serviceName}}
-
--
-  metricName: Fault
-  namespace: {{metricNamespace}}
-  dimensions:
-    -
-      name: Environment
-      value: eks:{{platformInfo}}/{{appNamespace}}
-    -
-      name: RemoteEnvironment
-      value: eks:{{platformInfo}}/{{appNamespace}}
-    -
-      name: Operation
-      value: GET /remote-service
-    -
-      name: RemoteOperation
-      value: GET /healthcheck
-    -
-      name: RemoteService
-      value: {{remoteServiceDeploymentName}}
-    -
-      name: Service
-      value: {{serviceName}}
+      value: {{remoteServiceDeploymentName}}