From 203540c0c24cd1f96b4db8f4a41d26aef0a87390 Mon Sep 17 00:00:00 2001 From: Mengyi Zhou Date: Wed, 9 Oct 2024 11:03:18 -0700 Subject: [PATCH] Add E2E test cases for runtime --- terraform/java/ec2/asg/main.tf | 9 +++++---- terraform/java/ec2/default/main.tf | 9 +++++---- terraform/java/ecs/resources/main-service.json.tpl | 4 ---- terraform/java/eks/main.tf | 8 -------- .../java/k8s/deploy/resources/frontend-service-depl.yaml | 2 -- .../java/k8s/deploy/resources/remote-service-depl.yaml | 3 --- terraform/python/ec2/asg/main.tf | 2 -- terraform/python/ec2/default/main.tf | 8 ++++++-- terraform/python/ecs/resources/main-service.json.tpl | 4 ---- terraform/python/eks/main.tf | 8 -------- .../deploy/resources/python-frontend-service-depl.yaml | 2 -- .../k8s/deploy/resources/python-remote-service-depl.yaml | 2 -- .../validations/java/ec2/asg/log-validation.yml | 5 ++++- .../validations/java/ec2/asg/metric-validation.yml | 5 ++++- .../validations/java/ec2/default/log-validation.yml | 5 ++++- .../validations/java/ec2/default/metric-validation.yml | 5 ++++- .../resources/validations/java/ecs/log-validation.yml | 6 +++++- .../resources/validations/java/ecs/metric-validation.yml | 6 +++++- .../resources/validations/java/eks/log-validation.yml | 6 +++++- .../resources/validations/java/eks/metric-validation.yml | 4 ++++ .../resources/validations/java/k8s/log-validation.yml | 6 +++++- .../resources/validations/java/k8s/metric-validation.yml | 4 ++++ .../validations/python/ec2/asg/log-validation.yml | 5 ++++- .../validations/python/ec2/asg/metric-validation.yml | 5 ++++- .../validations/python/ec2/default/log-validation.yml | 5 ++++- .../validations/python/ec2/default/metric-validation.yml | 5 ++++- .../resources/validations/python/ecs/log-validation.yml | 6 +++++- .../validations/python/ecs/metric-validation.yml | 6 +++++- .../resources/validations/python/eks/log-validation.yml | 6 +++++- .../validations/python/eks/metric-validation.yml | 4 ++++ .../resources/validations/python/k8s/log-validation.yml | 6 +++++- .../validations/python/k8s/metric-validation.yml | 6 +++++- 32 files changed, 105 insertions(+), 62 deletions(-) diff --git a/terraform/java/ec2/asg/main.tf b/terraform/java/ec2/asg/main.tf index ed2f37fc2..46c033ad8 100644 --- a/terraform/java/ec2/asg/main.tf +++ b/terraform/java/ec2/asg/main.tf @@ -109,6 +109,9 @@ resource "aws_launch_configuration" "launch_configuration" { sudo yum install java-${var.language_version}-amazon-corretto -y fi + # enable ec2 instance connect for debug + sudo yum install ec2-instance-connect -y + # Copy in CW Agent configuration agent_config='${replace(replace(file("./amazon-cloudwatch-agent.json"), "/\\s+/", ""), "$REGION", var.aws_region)}' echo $agent_config > amazon-cloudwatch-agent.json @@ -128,12 +131,11 @@ resource "aws_launch_configuration" "launch_configuration" { OTEL_METRICS_EXPORTER=none \ OTEL_LOGS_EXPORT=none \ OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true \ - OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED=false \ OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT=http://localhost:4316/v1/metrics \ OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf \ OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4316/v1/traces \ OTEL_RESOURCE_ATTRIBUTES=service.name=sample-application-${var.test_id} \ - nohup java -jar main-service.jar &> nohup.out & + nohup java -jar -XX:+UseG1GC main-service.jar &> nohup.out & # The application needs time to come up and reach a steady state, this should not take longer than 30 seconds sleep 30 @@ -230,12 +232,11 @@ resource "null_resource" "remote_service_setup" { OTEL_METRICS_EXPORTER=none \ OTEL_LOGS_EXPORT=none \ OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true \ - OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED=false \ OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT=http://localhost:4316/v1/metrics \ OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf \ OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4316/v1/traces \ OTEL_RESOURCE_ATTRIBUTES=service.name=sample-remote-application-${var.test_id} \ - nohup java -jar remote-service.jar &> nohup.out & + nohup java -XX:+UseG1GC -jar remote-service.jar &> nohup.out & # The application needs time to come up and reach a steady state, this should not take longer than 30 seconds sleep 30 diff --git a/terraform/java/ec2/default/main.tf b/terraform/java/ec2/default/main.tf index ae591b64b..36dfd369d 100644 --- a/terraform/java/ec2/default/main.tf +++ b/terraform/java/ec2/default/main.tf @@ -141,12 +141,11 @@ resource "null_resource" "main_service_setup" { OTEL_METRICS_EXPORTER=none \ OTEL_LOGS_EXPORT=none \ OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true \ - OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED=false \ OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT=http://localhost:4316/v1/metrics \ OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf \ OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4316/v1/traces \ OTEL_RESOURCE_ATTRIBUTES=service.name=sample-application-${var.test_id} \ - nohup java -jar main-service.jar &> nohup.out & + nohup java -XX:+UseG1GC -jar main-service.jar &> nohup.out & # The application needs time to come up and reach a steady state, this should not take longer than 30 seconds sleep 30 @@ -217,6 +216,9 @@ resource "null_resource" "remote_service_setup" { sudo yum install java-${var.language_version}-amazon-corretto -y fi + # enable ec2 instance connect for debug + sudo yum install ec2-instance-connect -y + # Copy in CW Agent configuration agent_config='${replace(replace(file("./amazon-cloudwatch-agent.json"), "/\\s+/", ""), "$REGION", var.aws_region)}' echo $agent_config > amazon-cloudwatch-agent.json @@ -236,12 +238,11 @@ resource "null_resource" "remote_service_setup" { OTEL_METRICS_EXPORTER=none \ OTEL_LOGS_EXPORT=none \ OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true \ - OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED=false \ OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT=http://localhost:4316/v1/metrics \ OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf \ OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4316/v1/traces \ OTEL_RESOURCE_ATTRIBUTES=service.name=sample-remote-application-${var.test_id} \ - nohup java -jar remote-service.jar &> nohup.out & + nohup java -XX:+UseG1GC -jar remote-service.jar &> nohup.out & # The application needs time to come up and reach a steady state, this should not take longer than 30 seconds sleep 30 diff --git a/terraform/java/ecs/resources/main-service.json.tpl b/terraform/java/ecs/resources/main-service.json.tpl index 0dd3723db..4649b5b96 100644 --- a/terraform/java/ecs/resources/main-service.json.tpl +++ b/terraform/java/ecs/resources/main-service.json.tpl @@ -22,10 +22,6 @@ "name": "OTEL_AWS_APPLICATION_SIGNALS_ENABLED", "value": "true" }, - { - "name": "OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED", - "value": "false" - }, { "name": "OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT", "value": "http://localhost:4316/v1/metrics" diff --git a/terraform/java/eks/main.tf b/terraform/java/eks/main.tf index 6ff7dfd19..2aac0df51 100644 --- a/terraform/java/eks/main.tf +++ b/terraform/java/eks/main.tf @@ -123,10 +123,6 @@ resource "kubernetes_deployment" "sample_app_deployment" { name = "RDS_MYSQL_CLUSTER_PASSWORD" value = var.rds_mysql_cluster_password } - env { - name = "OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED" - value = "false" - } port { container_port = 8080 } @@ -195,10 +191,6 @@ resource "kubernetes_deployment" "sample_remote_app_deployment" { port { container_port = 8080 } - env { - name = "OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED" - value = "false" - } } } } diff --git a/terraform/java/k8s/deploy/resources/frontend-service-depl.yaml b/terraform/java/k8s/deploy/resources/frontend-service-depl.yaml index 3ea16c5d8..7d2e01211 100644 --- a/terraform/java/k8s/deploy/resources/frontend-service-depl.yaml +++ b/terraform/java/k8s/deploy/resources/frontend-service-depl.yaml @@ -24,7 +24,5 @@ spec: env: - name: "OTEL_SERVICE_NAME" value: "sample-application-${TESTING_ID}" - - name: "OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED" - value: "false" imagePullSecrets: - name: ecr-secret \ No newline at end of file diff --git a/terraform/java/k8s/deploy/resources/remote-service-depl.yaml b/terraform/java/k8s/deploy/resources/remote-service-depl.yaml index 0fca47431..947da8eae 100644 --- a/terraform/java/k8s/deploy/resources/remote-service-depl.yaml +++ b/terraform/java/k8s/deploy/resources/remote-service-depl.yaml @@ -21,8 +21,5 @@ spec: image: ${IMAGE} ports: - containerPort: 8081 - env: - - name: OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED - value: "false" imagePullSecrets: - name: ecr-secret \ No newline at end of file diff --git a/terraform/python/ec2/asg/main.tf b/terraform/python/ec2/asg/main.tf index 7baa2fbf1..33da30e16 100644 --- a/terraform/python/ec2/asg/main.tf +++ b/terraform/python/ec2/asg/main.tf @@ -160,7 +160,6 @@ resource "aws_launch_configuration" "launch_configuration" { export OTEL_METRICS_EXPORTER=none export OTEL_TRACES_EXPORTER=otlp export OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true - export OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED=false export OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT=http://localhost:4315 export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4315 export OTEL_EXPORTER_OTLP_TRACES_PROTOCOL=grpc @@ -295,7 +294,6 @@ resource "null_resource" "remote_service_setup" { export OTEL_METRICS_EXPORTER=none export OTEL_TRACES_EXPORTER=otlp export OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true - export OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED=false export OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT=http://localhost:4315 export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4315 export OTEL_EXPORTER_OTLP_TRACES_PROTOCOL=grpc diff --git a/terraform/python/ec2/default/main.tf b/terraform/python/ec2/default/main.tf index 2a578b86d..a7673f16e 100644 --- a/terraform/python/ec2/default/main.tf +++ b/terraform/python/ec2/default/main.tf @@ -141,6 +141,9 @@ resource "null_resource" "main_service_setup" { sudo dnf install -y python${var.language_version}-pip fi + # enable ec2 instance connect for debug + sudo yum install ec2-instance-connect -y + # Copy in CW Agent configuration agent_config='${replace(replace(file("./amazon-cloudwatch-agent.json"), "/\\s+/", ""), "$REGION", var.aws_region)}' echo $agent_config > amazon-cloudwatch-agent.json @@ -170,7 +173,6 @@ resource "null_resource" "main_service_setup" { export OTEL_METRICS_EXPORTER=none export OTEL_TRACES_EXPORTER=otlp export OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true - export OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED=false export OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT=http://localhost:4315 export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4315 export OTEL_EXPORTER_OTLP_TRACES_PROTOCOL=grpc @@ -269,6 +271,9 @@ resource "null_resource" "remote_service_setup" { sudo dnf install -y python${var.language_version}-pip fi + # enable ec2 instance connect for debug + sudo yum install ec2-instance-connect -y + # Copy in CW Agent configuration agent_config='${replace(replace(file("./amazon-cloudwatch-agent.json"), "/\\s+/", ""), "$REGION", var.aws_region)}' echo $agent_config > amazon-cloudwatch-agent.json @@ -298,7 +303,6 @@ resource "null_resource" "remote_service_setup" { export OTEL_METRICS_EXPORTER=none export OTEL_TRACES_EXPORTER=otlp export OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true - export OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED=false export OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT=http://localhost:4315 export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4315 export OTEL_EXPORTER_OTLP_TRACES_PROTOCOL=grpc diff --git a/terraform/python/ecs/resources/main-service.json.tpl b/terraform/python/ecs/resources/main-service.json.tpl index 4bffe094b..9f820fb6e 100644 --- a/terraform/python/ecs/resources/main-service.json.tpl +++ b/terraform/python/ecs/resources/main-service.json.tpl @@ -59,10 +59,6 @@ "name": "OTEL_AWS_APPLICATION_SIGNALS_ENABLED", "value": "true" }, - { - "name": "OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED", - "value": "false" - }, { "name": "OTEL_RESOURCE_ATTRIBUTES", "value": "service.name=${app_service_name}" diff --git a/terraform/python/eks/main.tf b/terraform/python/eks/main.tf index 78ca2905a..0fbafde7f 100644 --- a/terraform/python/eks/main.tf +++ b/terraform/python/eks/main.tf @@ -135,10 +135,6 @@ resource "kubernetes_deployment" "python_app_deployment" { name = "RDS_MYSQL_CLUSTER_PASSWORD" value = var.rds_mysql_cluster_password } - env { - name = "OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED" - value = "false" - } port { container_port = 8000 } @@ -209,10 +205,6 @@ resource "kubernetes_deployment" "python_r_app_deployment" { name = "DJANGO_SETTINGS_MODULE" value = "django_remote_service.settings" } - env { - name = "OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED" - value = "false" - } port { container_port = 8001 } diff --git a/terraform/python/k8s/deploy/resources/python-frontend-service-depl.yaml b/terraform/python/k8s/deploy/resources/python-frontend-service-depl.yaml index 466a9484b..6ff969095 100644 --- a/terraform/python/k8s/deploy/resources/python-frontend-service-depl.yaml +++ b/terraform/python/k8s/deploy/resources/python-frontend-service-depl.yaml @@ -32,7 +32,5 @@ spec: value: "/django_frontend_app" - name: "DJANGO_SETTINGS_MODULE" value: "django_frontend_service.settings" - - name: "OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED" - value: "false" imagePullSecrets: - name: ecr-secret \ No newline at end of file diff --git a/terraform/python/k8s/deploy/resources/python-remote-service-depl.yaml b/terraform/python/k8s/deploy/resources/python-remote-service-depl.yaml index 943556029..0527b7f7c 100644 --- a/terraform/python/k8s/deploy/resources/python-remote-service-depl.yaml +++ b/terraform/python/k8s/deploy/resources/python-remote-service-depl.yaml @@ -28,8 +28,6 @@ spec: value: "/django_remote_app" - name: "DJANGO_SETTINGS_MODULE" value: "django_remote_service.settings" - - name: "OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED" - value: "false" ports: - containerPort: 8001 imagePullSecrets: diff --git a/validator/src/main/resources/validations/java/ec2/asg/log-validation.yml b/validator/src/main/resources/validations/java/ec2/asg/log-validation.yml index 39490f833..49b4ae086 100644 --- a/validator/src/main/resources/validations/java/ec2/asg/log-validation.yml +++ b/validator/src/main/resources/validations/java/ec2/asg/log-validation.yml @@ -22,4 +22,7 @@ httpMethod: "get" callingType: "http" expectedLogStructureTemplate: "JAVA_EC2_ASG_CLIENT_CALL_LOG" - +- + validationType: "cw-log" + callingType: "none" + expectedLogStructureTemplate: "JAVA_RUNTIME_METRIC_LOG" \ No newline at end of file diff --git a/validator/src/main/resources/validations/java/ec2/asg/metric-validation.yml b/validator/src/main/resources/validations/java/ec2/asg/metric-validation.yml index 2fbb21459..39b77fab5 100644 --- a/validator/src/main/resources/validations/java/ec2/asg/metric-validation.yml +++ b/validator/src/main/resources/validations/java/ec2/asg/metric-validation.yml @@ -22,4 +22,7 @@ httpMethod: "get" callingType: "http" expectedMetricTemplate: "JAVA_EC2_ASG_CLIENT_CALL_METRIC" - +- + validationType: "cw-metric" + callingType: "none" + expectedMetricTemplate: "JAVA_RUNTIME_METRIC" diff --git a/validator/src/main/resources/validations/java/ec2/default/log-validation.yml b/validator/src/main/resources/validations/java/ec2/default/log-validation.yml index 08e419214..6c51bbf97 100644 --- a/validator/src/main/resources/validations/java/ec2/default/log-validation.yml +++ b/validator/src/main/resources/validations/java/ec2/default/log-validation.yml @@ -22,4 +22,7 @@ httpMethod: "get" callingType: "http" expectedLogStructureTemplate: "JAVA_EC2_DEFAULT_CLIENT_CALL_LOG" - +- + validationType: "cw-log" + callingType: "none" + expectedLogStructureTemplate: "JAVA_RUNTIME_METRIC_LOG" \ No newline at end of file diff --git a/validator/src/main/resources/validations/java/ec2/default/metric-validation.yml b/validator/src/main/resources/validations/java/ec2/default/metric-validation.yml index 2e8bfce7a..92ee0d4f5 100644 --- a/validator/src/main/resources/validations/java/ec2/default/metric-validation.yml +++ b/validator/src/main/resources/validations/java/ec2/default/metric-validation.yml @@ -22,4 +22,7 @@ httpMethod: "get" callingType: "http" expectedMetricTemplate: "JAVA_EC2_DEFAULT_CLIENT_CALL_METRIC" - +- + validationType: "cw-metric" + callingType: "none" + expectedMetricTemplate: "JAVA_RUNTIME_METRIC" \ No newline at end of file diff --git a/validator/src/main/resources/validations/java/ecs/log-validation.yml b/validator/src/main/resources/validations/java/ecs/log-validation.yml index 0302f1965..09c2630b7 100644 --- a/validator/src/main/resources/validations/java/ecs/log-validation.yml +++ b/validator/src/main/resources/validations/java/ecs/log-validation.yml @@ -1,4 +1,8 @@ - validationType: "cw-log" callingType: "none" - expectedLogStructureTemplate: "JAVA_ECS_HC_CALL_LOG" \ No newline at end of file + expectedLogStructureTemplate: "JAVA_ECS_HC_CALL_LOG" +- + validationType: "cw-log" + callingType: "none" + expectedLogStructureTemplate: "JAVA_RUNTIME_METRIC_LOG" \ No newline at end of file diff --git a/validator/src/main/resources/validations/java/ecs/metric-validation.yml b/validator/src/main/resources/validations/java/ecs/metric-validation.yml index c1cea45e4..ef2195972 100644 --- a/validator/src/main/resources/validations/java/ecs/metric-validation.yml +++ b/validator/src/main/resources/validations/java/ecs/metric-validation.yml @@ -1,4 +1,8 @@ - validationType: "cw-metric" callingType: "none" - expectedMetricTemplate: "JAVA_ECS_HC_CALL_METRIC" \ No newline at end of file + expectedMetricTemplate: "JAVA_ECS_HC_CALL_METRIC" +- + validationType: "cw-metric" + callingType: "none" + expectedMetricTemplate: "JAVA_RUNTIME_METRIC" \ No newline at end of file diff --git a/validator/src/main/resources/validations/java/eks/log-validation.yml b/validator/src/main/resources/validations/java/eks/log-validation.yml index 7373eb3f3..738436b1e 100644 --- a/validator/src/main/resources/validations/java/eks/log-validation.yml +++ b/validator/src/main/resources/validations/java/eks/log-validation.yml @@ -27,4 +27,8 @@ httpPath: "/mysql" httpMethod: "get" callingType: "http" - expectedLogStructureTemplate: "JAVA_EKS_RDS_MYSQL_LOG" \ No newline at end of file + expectedLogStructureTemplate: "JAVA_EKS_RDS_MYSQL_LOG" +- + validationType: "cw-log" + callingType: "none" + expectedLogStructureTemplate: "JAVA_RUNTIME_METRIC_LOG" \ No newline at end of file diff --git a/validator/src/main/resources/validations/java/eks/metric-validation.yml b/validator/src/main/resources/validations/java/eks/metric-validation.yml index 73394bbad..16f958911 100644 --- a/validator/src/main/resources/validations/java/eks/metric-validation.yml +++ b/validator/src/main/resources/validations/java/eks/metric-validation.yml @@ -28,3 +28,7 @@ httpMethod: "get" callingType: "http" expectedMetricTemplate: "JAVA_EKS_RDS_MYSQL_METRIC" +- + validationType: "cw-metric" + callingType: "none" + expectedMetricTemplate: "JAVA_RUNTIME_METRIC" diff --git a/validator/src/main/resources/validations/java/k8s/log-validation.yml b/validator/src/main/resources/validations/java/k8s/log-validation.yml index d8bdf33bc..d1b806a75 100644 --- a/validator/src/main/resources/validations/java/k8s/log-validation.yml +++ b/validator/src/main/resources/validations/java/k8s/log-validation.yml @@ -21,4 +21,8 @@ httpPath: "/client-call" httpMethod: "get" callingType: "http" - expectedLogStructureTemplate: "JAVA_K8S_CLIENT_CALL_LOG" \ No newline at end of file + expectedLogStructureTemplate: "JAVA_K8S_CLIENT_CALL_LOG" +- + validationType: "cw-log" + callingType: "none" + expectedLogStructureTemplate: "JAVA_RUNTIME_METRIC_LOG" \ No newline at end of file diff --git a/validator/src/main/resources/validations/java/k8s/metric-validation.yml b/validator/src/main/resources/validations/java/k8s/metric-validation.yml index 96246b48f..7971be2e4 100644 --- a/validator/src/main/resources/validations/java/k8s/metric-validation.yml +++ b/validator/src/main/resources/validations/java/k8s/metric-validation.yml @@ -22,3 +22,7 @@ httpMethod: "get" callingType: "http" expectedMetricTemplate: "JAVA_K8S_CLIENT_CALL_METRIC" +- + validationType: "cw-metric" + callingType: "none" + expectedMetricTemplate: "JAVA_RUNTIME_METRIC" \ No newline at end of file diff --git a/validator/src/main/resources/validations/python/ec2/asg/log-validation.yml b/validator/src/main/resources/validations/python/ec2/asg/log-validation.yml index 220bc9ee6..b8fb8bd5b 100644 --- a/validator/src/main/resources/validations/python/ec2/asg/log-validation.yml +++ b/validator/src/main/resources/validations/python/ec2/asg/log-validation.yml @@ -22,4 +22,7 @@ httpMethod: "get" callingType: "http" expectedLogStructureTemplate: "PYTHON_EC2_ASG_CLIENT_CALL_LOG" - +- + validationType: "cw-log" + callingType: "none" + expectedLogStructureTemplate: "PYTHON_RUNTIME_METRIC_LOG" \ No newline at end of file diff --git a/validator/src/main/resources/validations/python/ec2/asg/metric-validation.yml b/validator/src/main/resources/validations/python/ec2/asg/metric-validation.yml index 6a163be0d..54bd6e16e 100644 --- a/validator/src/main/resources/validations/python/ec2/asg/metric-validation.yml +++ b/validator/src/main/resources/validations/python/ec2/asg/metric-validation.yml @@ -22,4 +22,7 @@ httpMethod: "get" callingType: "http" expectedMetricTemplate: "PYTHON_EC2_ASG_CLIENT_CALL_METRIC" - +- + validationType: "cw-metric" + callingType: "none" + expectedMetricTemplate: "PYTHON_RUNTIME_METRIC" \ No newline at end of file diff --git a/validator/src/main/resources/validations/python/ec2/default/log-validation.yml b/validator/src/main/resources/validations/python/ec2/default/log-validation.yml index 0a810c235..4e7364d99 100644 --- a/validator/src/main/resources/validations/python/ec2/default/log-validation.yml +++ b/validator/src/main/resources/validations/python/ec2/default/log-validation.yml @@ -22,4 +22,7 @@ httpMethod: "get" callingType: "http" expectedLogStructureTemplate: "PYTHON_EC2_DEFAULT_CLIENT_CALL_LOG" - +- + validationType: "cw-log" + callingType: "none" + expectedLogStructureTemplate: "PYTHON_RUNTIME_METRIC_LOG" \ No newline at end of file diff --git a/validator/src/main/resources/validations/python/ec2/default/metric-validation.yml b/validator/src/main/resources/validations/python/ec2/default/metric-validation.yml index e75abaaba..addeba20a 100644 --- a/validator/src/main/resources/validations/python/ec2/default/metric-validation.yml +++ b/validator/src/main/resources/validations/python/ec2/default/metric-validation.yml @@ -22,4 +22,7 @@ httpMethod: "get" callingType: "http" expectedMetricTemplate: "PYTHON_EC2_DEFAULT_CLIENT_CALL_METRIC" - +- + validationType: "cw-metric" + callingType: "none" + expectedMetricTemplate: "PYTHON_RUNTIME_METRIC" \ No newline at end of file diff --git a/validator/src/main/resources/validations/python/ecs/log-validation.yml b/validator/src/main/resources/validations/python/ecs/log-validation.yml index 473ffb2ee..1516bc444 100644 --- a/validator/src/main/resources/validations/python/ecs/log-validation.yml +++ b/validator/src/main/resources/validations/python/ecs/log-validation.yml @@ -1,4 +1,8 @@ - validationType: "cw-log" callingType: "none" - expectedLogStructureTemplate: "PYTHON_ECS_HC_CALL_LOG" \ No newline at end of file + expectedLogStructureTemplate: "PYTHON_ECS_HC_CALL_LOG" +- + validationType: "cw-log" + callingType: "none" + expectedLogStructureTemplate: "PYTHON_RUNTIME_METRIC_LOG" \ No newline at end of file diff --git a/validator/src/main/resources/validations/python/ecs/metric-validation.yml b/validator/src/main/resources/validations/python/ecs/metric-validation.yml index d1365d4bd..b4a206fa5 100644 --- a/validator/src/main/resources/validations/python/ecs/metric-validation.yml +++ b/validator/src/main/resources/validations/python/ecs/metric-validation.yml @@ -1,4 +1,8 @@ - validationType: "cw-metric" callingType: "none" - expectedMetricTemplate: "PYTHON_ECS_HC_CALL_METRIC" \ No newline at end of file + expectedMetricTemplate: "PYTHON_ECS_HC_CALL_METRIC" +- + validationType: "cw-metric" + callingType: "none" + expectedMetricTemplate: "PYTHON_RUNTIME_METRIC" \ No newline at end of file diff --git a/validator/src/main/resources/validations/python/eks/log-validation.yml b/validator/src/main/resources/validations/python/eks/log-validation.yml index 15bf2759a..10fc17b6b 100644 --- a/validator/src/main/resources/validations/python/eks/log-validation.yml +++ b/validator/src/main/resources/validations/python/eks/log-validation.yml @@ -27,4 +27,8 @@ httpPath: "mysql" httpMethod: "get" callingType: "http" - expectedLogStructureTemplate: "PYTHON_EKS_RDS_MYSQL_LOG" \ No newline at end of file + expectedLogStructureTemplate: "PYTHON_EKS_RDS_MYSQL_LOG" +- + validationType: "cw-log" + callingType: "none" + expectedLogStructureTemplate: "PYTHON_RUNTIME_METRIC_LOG" \ No newline at end of file diff --git a/validator/src/main/resources/validations/python/eks/metric-validation.yml b/validator/src/main/resources/validations/python/eks/metric-validation.yml index 68c92d767..08cb62789 100644 --- a/validator/src/main/resources/validations/python/eks/metric-validation.yml +++ b/validator/src/main/resources/validations/python/eks/metric-validation.yml @@ -28,3 +28,7 @@ httpMethod: "get" callingType: "http" expectedMetricTemplate: "PYTHON_EKS_RDS_MYSQL_METRIC" +- + validationType: "cw-metric" + callingType: "none" + expectedMetricTemplate: "PYTHON_RUNTIME_METRIC" \ No newline at end of file diff --git a/validator/src/main/resources/validations/python/k8s/log-validation.yml b/validator/src/main/resources/validations/python/k8s/log-validation.yml index 881930dea..acd9049b6 100644 --- a/validator/src/main/resources/validations/python/k8s/log-validation.yml +++ b/validator/src/main/resources/validations/python/k8s/log-validation.yml @@ -21,4 +21,8 @@ httpPath: "client-call" httpMethod: "get" callingType: "http" - expectedLogStructureTemplate: "PYTHON_K8S_CLIENT_CALL_LOG" \ No newline at end of file + expectedLogStructureTemplate: "PYTHON_K8S_CLIENT_CALL_LOG" +- + validationType: "cw-log" + callingType: "none" + expectedLogStructureTemplate: "PYTHON_RUNTIME_METRIC_LOG" \ No newline at end of file diff --git a/validator/src/main/resources/validations/python/k8s/metric-validation.yml b/validator/src/main/resources/validations/python/k8s/metric-validation.yml index ddca110dc..0ded13833 100644 --- a/validator/src/main/resources/validations/python/k8s/metric-validation.yml +++ b/validator/src/main/resources/validations/python/k8s/metric-validation.yml @@ -21,4 +21,8 @@ httpPath: "client-call" httpMethod: "get" callingType: "http" - expectedMetricTemplate: "PYTHON_K8S_CLIENT_CALL_METRIC" \ No newline at end of file + expectedMetricTemplate: "PYTHON_K8S_CLIENT_CALL_METRIC" +- + validationType: "cw-metric" + callingType: "none" + expectedMetricTemplate: "PYTHON_RUNTIME_METRIC" \ No newline at end of file