Remove defunct statsd feature gate tests and update instrumentation…

… scope (#1668) * remove defunct statsd feature gate test cases Signed-off-by: Anthony J Mirabella <[email protected]> * update instrumentation scope library expectation for statsd receiver Signed-off-by: Anthony J Mirabella <[email protected]> * remove statsd expectation type from validator Signed-off-by: Anthony J Mirabella <[email protected]> --------- Signed-off-by: Anthony J Mirabella <[email protected]>
aws-observability · Sep 30, 2024 · 8faf4d4 · 8faf4d4
1 parent 637526b
commit 8faf4d4
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 209 deletions.
diff --git a/terraform/testcases/statsd_instscopedisabled/otconfig.tpl b/terraform/testcases/statsd_instscopedisabled/otconfig.tpl
diff --git a/terraform/testcases/statsd_instscopedisabled/parameters.tfvars b/terraform/testcases/statsd_instscopedisabled/parameters.tfvars
diff --git a/terraform/testcases/statsd_instscopedisabled/soaking_docker_compose.tpl b/terraform/testcases/statsd_instscopedisabled/soaking_docker_compose.tpl
diff --git a/terraform/testcases/statsd_nootellib_instScopeEnabled/otconfig.tpl b/terraform/testcases/statsd_nootellib_instScopeEnabled/otconfig.tpl
diff --git a/terraform/testcases/statsd_nootellib_instScopeEnabled/parameters.tfvars b/terraform/testcases/statsd_nootellib_instScopeEnabled/parameters.tfvars
diff --git a/terraform/testcases/statsd_nootellib_instScopeEnabled/soaking_docker_compose.tpl b/terraform/testcases/statsd_nootellib_instScopeEnabled/soaking_docker_compose.tpl
diff --git a/terraform/testcases/statsd_otellib_instScopeEnabled/otconfig.tpl b/terraform/testcases/statsd_otellib_instScopeEnabled/otconfig.tpl
diff --git a/terraform/testcases/statsd_otellib_instScopeEnabled/parameters.tfvars b/terraform/testcases/statsd_otellib_instScopeEnabled/parameters.tfvars
diff --git a/terraform/testcases/statsd_otellib_instScopeEnabled/soaking_docker_compose.tpl b/terraform/testcases/statsd_otellib_instScopeEnabled/soaking_docker_compose.tpl
diff --git a/validator/src/main/java/com/amazon/aoc/fileconfigs/PredefinedExpectedTemplate.java b/validator/src/main/java/com/amazon/aoc/fileconfigs/PredefinedExpectedTemplate.java
@@ -30,7 +30,6 @@ public enum PredefinedExpectedTemplate implements FileConfig {
   K8S_ATTR_EXPECTED_METRIC("/expected-data-template/k8sExpectedMetric.mustache"),
   ENHANCED_EXPECTED_METRIC_TESTING_ID(
       "/expected-data-template/enhancedExpectedMetricTestingId.mustache"),
-  STATSD_EXPECTED_METRIC("/expected-data-template/statsdExpectedMetric.mustache"),
   STATSD_OTELLIB_EXPECTED_METRIC("/expected-data-template/statsDOtelLibExpectedMetric.mustache"),
   ECS_CONTAINER_EXPECTED_METRIC("/expected-data-template/ecsContainerExpectedMetric.mustache"),
   CONTAINER_INSIGHT_EKS_PROMETHEUS_METRIC(

diff --git a/validator/src/main/resources/expected-data-template/statsDOtelLibExpectedMetric.mustache b/validator/src/main/resources/expected-data-template/statsDOtelLibExpectedMetric.mustache
@@ -4,7 +4,7 @@
   dimensions:
     -
       name: OTelLib
-      value: otelcol/statsdreceiver
+      value: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver
     -
       name: mykey1
       value: myvalue1
@@ -18,7 +18,7 @@
   dimensions:
     -
       name: OTelLib
-      value: otelcol/statsdreceiver
+      value: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver
     -
       name: mykey3
       value: myvalue3
@@ -29,7 +29,7 @@
   dimensions:
     -
       name: OTelLib
-      value: otelcol/statsdreceiver
+      value: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver
     -
       name: mykey4
       value: myvalue4
@@ -40,7 +40,7 @@
   dimensions:
     -
       name: OTelLib
-      value: otelcol/statsdreceiver
+      value: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver
     -
       name: mykey5
       value: myvalue5
diff --git a/validator/src/main/resources/expected-data-template/statsdExpectedMetric.mustache b/validator/src/main/resources/expected-data-template/statsdExpectedMetric.mustache
diff --git a/validator/src/main/resources/validations/statsd-metric-validation.yml b/validator/src/main/resources/validations/statsd-metric-validation.yml