Merge pull request #1645 from aws-observability/feat/collector_args

Allow test cases to specify arguments for the collector
aws-observability · Jun 14, 2024 · 45baf87 · 45baf87
2 parents b184bd6 + d89a557
commit 45baf87
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 4 deletions.
diff --git a/terraform/mock/main.tf b/terraform/mock/main.tf
@@ -23,6 +23,7 @@ locals {
   otconfig_template_path = fileexists("${var.testcase}/otconfig.tpl") ? "${var.testcase}/otconfig.tpl" : module.common.default_otconfig_path
   otconfig_file_path     = "./otconfig.yml"
   docker_compose_path    = "./docker_compose.yml"
+  collector_args         = concat(["--config=/tmp/otconfig.yaml"], var.otconfig_args)
 
   mock_endpoint             = var.mock_endpoint
   sample_app_listen_address = "${module.common.sample_app_listen_address_ip}:${module.common.sample_app_listen_address_port}"
@@ -59,7 +60,7 @@ data "template_file" "docker_compose" {
 
   vars = {
     collector_repo_path            = var.collector_repo_path
-    otconfig_path                  = local.otconfig_file_path
+    collector_args                 = jsonencode(local.collector_args)
     grpc_port                      = module.common.grpc_port
     udp_port                       = module.common.udp_port
     http_port                      = module.common.http_port

diff --git a/terraform/mock/variables.tf b/terraform/mock/variables.tf
@@ -21,5 +21,6 @@ variable "mock_endpoint" {
   default = "mocked-server/put-data"
 }
 
-
-
+variable "otconfig_args" {
+  default = []
+}
diff --git a/terraform/templates/local/docker_compose.tpl b/terraform/templates/local/docker_compose.tpl
@@ -15,7 +15,7 @@ services:
       args:
         BUILDMODE: copy
 
-    command: ["--config=/tmp/otconfig.yaml"]
+    command: ${collector_args}
     volumes:
       - ./otconfig.yml:/tmp/otconfig.yaml
       - "../../mocked_servers/https/certificates/ssl/certificate.crt:/etc/ssl/certs/ca-certificates.crt"

diff --git a/terraform/testcases/datadog_exporter_metric_mock/parameters.tfvars b/terraform/testcases/datadog_exporter_metric_mock/parameters.tfvars
@@ -4,3 +4,5 @@ soaking_data_mode = "metric"
 sample_app = "spark"
 
 sample_app_image = "public.ecr.aws/aws-otel-test/aws-otel-java-spark:latest"
+
+otconfig_args = ["--feature-gates=-adot.exporter.datadogexporter.deprecation"]
diff --git a/terraform/testcases/datadog_exporter_trace_mock/parameters.tfvars b/terraform/testcases/datadog_exporter_trace_mock/parameters.tfvars
@@ -4,3 +4,5 @@ soaking_data_mode = "trace"
 sample_app = "spark"
 
 sample_app_image = "public.ecr.aws/aws-otel-test/aws-otel-java-spark:latest"
+
+otconfig_args = ["--feature-gates=-adot.exporter.datadogexporter.deprecation"]
diff --git a/terraform/testcases/logzio_exporter_trace_mock/parameters.tfvars b/terraform/testcases/logzio_exporter_trace_mock/parameters.tfvars
@@ -4,3 +4,5 @@ soaking_data_mode = "trace"
 sample_app = "spark"
 
 sample_app_image = "public.ecr.aws/aws-otel-test/aws-otel-java-spark:latest"
+
+otconfig_args = ["--feature-gates=-adot.exporter.logzioexporter.deprecation"]
diff --git a/terraform/testcases/sapm_exporter_trace_mock/parameters.tfvars b/terraform/testcases/sapm_exporter_trace_mock/parameters.tfvars
@@ -4,3 +4,5 @@ soaking_data_mode = "trace"
 sample_app = "spark"
 
 sample_app_image = "public.ecr.aws/aws-otel-test/aws-otel-java-spark:latest"
+
+otconfig_args = ["--feature-gates=-adot.exporter.sapmexporter.deprecation"]
diff --git a/terraform/testcases/signalfx_exporter_metric_mock/parameters.tfvars b/terraform/testcases/signalfx_exporter_metric_mock/parameters.tfvars
@@ -4,3 +4,5 @@ soaking_data_mode = "metric"
 sample_app = "spark"
 
 sample_app_image = "public.ecr.aws/aws-otel-test/aws-otel-java-spark:latest"
+
+otconfig_args = ["--feature-gates=-adot.exporter.signalfxexporter.deprecation"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,5 @@ soaking_data_mode = "metric"
		sample_app = "spark"

		sample_app_image = "public.ecr.aws/aws-otel-test/aws-otel-java-spark:latest"

		otconfig_args = ["--feature-gates=-adot.exporter.datadogexporter.deprecation"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,5 @@ soaking_data_mode = "trace"
		sample_app = "spark"

		sample_app_image = "public.ecr.aws/aws-otel-test/aws-otel-java-spark:latest"

		otconfig_args = ["--feature-gates=-adot.exporter.datadogexporter.deprecation"]