diff --git a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-log.mustache b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-log.mustache index 629b5c608..2eb27f400 100644 --- a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-log.mustache +++ b/validator/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/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-trace.mustache b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-trace.mustache index dba0da090..03dff694b 100644 --- a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-trace.mustache +++ b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-trace.mustache @@ -19,7 +19,6 @@ }, "metadata": { "default": { - "EC2.AutoScalingGroup": "^eks-.+", "EKS.Cluster": "^{{platformInfo}}$", "K8s.Namespace": "^{{appNamespace}}", "otel.resource.K8s.Workload": "^sample-app-deployment-{{testingId}}", @@ -37,7 +36,7 @@ "name": "^S3$", "http": { "request": { - "url": "^https://e2e-test-bucket-name-{{testingId}}.s3.{{region}}.amazonaws.com\\?location$", + "url": "^https://e2e-test-bucket-name-{{testingId}}.s3.us-west-1.amazonaws.com?location$", "method": "^GET$" } }, @@ -52,7 +51,6 @@ }, "metadata": { "default": { - "EC2.AutoScalingGroup": "^eks-.+", "EKS.Cluster": "^{{platformInfo}}$", "K8s.Namespace": "^{{appNamespace}}$", "PlatformType": "^AWS::EKS$", diff --git a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/client-call-log.mustache b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/client-call-log.mustache index 79e45e62e..21bf6362b 100644 --- a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/client-call-log.mustache +++ b/validator/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/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/client-call-trace.mustache b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/client-call-trace.mustache index 698f0b9bb..3ea48c758 100644 --- a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/client-call-trace.mustache +++ b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/client-call-trace.mustache @@ -31,7 +31,6 @@ }, "metadata": { "default": { - "EC2.AutoScalingGroup": "^eks-.+", "EKS.Cluster": "^{{platformInfo}}$", "K8s.Namespace": "^{{appNamespace}}$", "PlatformType": "^AWS::EKS$", diff --git a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-log.mustache b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-log.mustache index 08e16b7c5..38e544dc9 100644 --- a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-log.mustache +++ b/validator/src/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/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-trace.mustache b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-trace.mustache index 4a327656e..c57877ded 100644 --- a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-trace.mustache +++ b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-trace.mustache @@ -19,7 +19,6 @@ }, "metadata": { "default": { - "EC2.AutoScalingGroup": "^eks-.+", "EKS.Cluster": "^{{platformInfo}}$", "K8s.Namespace": "^{{appNamespace}}", "otel.resource.K8s.Workload": "^sample-app-deployment-{{testingId}}", @@ -50,7 +49,6 @@ }, "metadata": { "default": { - "EC2.AutoScalingGroup": "^eks-.+", "EKS.Cluster": "^{{platformInfo}}$", "K8s.Namespace": "^{{appNamespace}}$", "PlatformType": "^AWS::EKS$", diff --git a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-log.mustache b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-log.mustache index 00d94ea41..8af2e3f39 100644 --- a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-log.mustache +++ b/validator/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/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-metric.mustache b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-metric.mustache index 928652d25..2ee91d0d9 100644 --- a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-metric.mustache +++ b/validator/src/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}} \ No newline at end of file + value: {{remoteServiceDeploymentName}} \ No newline at end of file diff --git a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-trace.mustache b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-trace.mustache index 781de9f64..94dc8fe80 100644 --- a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-trace.mustache +++ b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-trace.mustache @@ -19,7 +19,6 @@ }, "metadata": { "default": { - "EC2.AutoScalingGroup": "^eks-.+", "EKS.Cluster": "^{{platformInfo}}$", "K8s.Namespace": "^{{appNamespace}}", "otel.resource.K8s.Workload": "^sample-app-deployment-{{testingId}}", @@ -51,7 +50,6 @@ }, "metadata": { "default": { - "EC2.AutoScalingGroup": "^eks-.+", "EKS.Cluster": "^{{platformInfo}}$", "K8s.Namespace": "^{{appNamespace}}$", "PlatformType": "^AWS::EKS$", diff --git a/validator/src/main/resources/validations/java/eks-otlp-ocb/log-validation.yml b/validator/src/main/resources/validations/java/eks-otlp-ocb/log-validation.yml index 853a1dad7..2f3013c1d 100644 --- a/validator/src/main/resources/validations/java/eks-otlp-ocb/log-validation.yml +++ b/validator/src/main/resources/validations/java/eks-otlp-ocb/log-validation.yml @@ -21,10 +21,4 @@ httpPath: "/client-call" httpMethod: "get" callingType: "http" - expectedLogStructureTemplate: "JAVA_EKS_OTLP_OCB_CLIENT_CALL_LOG" -- - validationType: "cw-log" - httpPath: "/mysql" - httpMethod: "get" - callingType: "http" - expectedLogStructureTemplate: "JAVA_EKS_OTLP_OCB_RDS_MYSQL_LOG" \ No newline at end of file + expectedLogStructureTemplate: "JAVA_EKS_OTLP_OCB_CLIENT_CALL_LOG" \ No newline at end of file diff --git a/validator/src/main/resources/validations/java/eks-otlp-ocb/metric-validation.yml b/validator/src/main/resources/validations/java/eks-otlp-ocb/metric-validation.yml index dad98706c..35e85f9c4 100644 --- a/validator/src/main/resources/validations/java/eks-otlp-ocb/metric-validation.yml +++ b/validator/src/main/resources/validations/java/eks-otlp-ocb/metric-validation.yml @@ -21,10 +21,4 @@ httpPath: "/client-call" httpMethod: "get" callingType: "http" - expectedMetricTemplate: "JAVA_EKS_OTLP_OCB_CLIENT_CALL_METRIC" -- - validationType: "cw-metric" - httpPath: "/mysql" - httpMethod: "get" - callingType: "http" - expectedMetricTemplate: "JAVA_EKS_OTLP_OCB_RDS_MYSQL_METRIC" + expectedMetricTemplate: "JAVA_EKS_OTLP_OCB_CLIENT_CALL_METRIC" \ No newline at end of file diff --git a/validator/src/main/resources/validations/java/eks-otlp-ocb/trace-validation.yml b/validator/src/main/resources/validations/java/eks-otlp-ocb/trace-validation.yml index ac391d37b..7934c27a4 100644 --- a/validator/src/main/resources/validations/java/eks-otlp-ocb/trace-validation.yml +++ b/validator/src/main/resources/validations/java/eks-otlp-ocb/trace-validation.yml @@ -21,10 +21,4 @@ httpPath: "/client-call" httpMethod: "get" callingType: "http" - expectedTraceTemplate: "JAVA_EKS_OTLP_OCB_CLIENT_CALL_TRACE" -- - validationType: "trace" - httpPath: "/mysql" - httpMethod: "get" - callingType: "http" - expectedTraceTemplate: "JAVA_EKS_OTLP_OCB_RDS_MYSQL_TRACE" + expectedTraceTemplate: "JAVA_EKS_OTLP_OCB_CLIENT_CALL_TRACE" \ No newline at end of file