Update trace validator.

aws-observability · Dec 17, 2024 · 18b2170 · 18b2170
1 parent 1a05590
commit 18b2170
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 10 deletions.
diff --git a/terraform/java/ec2/asg/main.tf b/terraform/java/ec2/asg/main.tf
@@ -135,6 +135,7 @@ resource "aws_launch_configuration" "launch_configuration" {
     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} \
+    OTEL_INSTRUMENTATION_COMMON_EXPERIMENTAL_CONTROLLER_TELEMETRY_ENABLED=true \
     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

diff --git a/terraform/java/ecs/resources/main-service.json.tpl b/terraform/java/ecs/resources/main-service.json.tpl
@@ -53,7 +53,11 @@
       {
         "name": "OTEL_PROPAGATORS",
         "value": "tracecontext,baggage,b3,xray"
-      }
+      },
+     {
+       "name": "OTEL_INSTRUMENTATION_COMMON_EXPERIMENTAL_CONTROLLER_TELEMETRY_ENABLED",
+       "value": "true"
+     }
     ],
     "mountPoints": [
       {

diff --git a/terraform/java/eks-otlp-ocb/main.tf b/terraform/java/eks-otlp-ocb/main.tf
@@ -115,6 +115,10 @@ resource "kubernetes_deployment" "sample_app_deployment" {
             name = "OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED"
             value = "false"
           }
+          env {
+            name = "OTEL_INSTRUMENTATION_COMMON_EXPERIMENTAL_CONTROLLER_TELEMETRY_ENABLED"
+            value = "true"
+          }
           port {
             container_port = 8080
           }

diff --git a/terraform/java/eks/main.tf b/terraform/java/eks/main.tf
@@ -123,6 +123,10 @@ resource "kubernetes_deployment" "sample_app_deployment" {
             name = "RDS_MYSQL_CLUSTER_PASSWORD"
             value = var.rds_mysql_cluster_password
           }
+          env {
+            name = "OTEL_INSTRUMENTATION_COMMON_EXPERIMENTAL_CONTROLLER_TELEMETRY_ENABLED"
+            value = "true"
+          }
           port {
             container_port = 8080
           }

diff --git a/terraform/java/k8s/deploy/main.tf b/terraform/java/k8s/deploy/main.tf
@@ -88,7 +88,7 @@ resource "null_resource" "deploy" {
         kubectl delete pods --all -n amazon-cloudwatch
         sleep 10
         kubectl wait --for=condition=Ready pod --all -n amazon-cloudwatch
-      elif [ "${var.repository}" = "aws-otel-java-instrumentation" ]; then
+      elif [ "${var.repository}" = "aws-application-signals-test-framework" ]; then
         kubectl patch deploy -n amazon-cloudwatch amazon-cloudwatch-observability-controller-manager --type='json' \
         -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/args/0", "value": "--auto-instrumentation-java-image=${var.patch_image_arn}"}]'
         kubectl delete pods --all -n amazon-cloudwatch

diff --git a/terraform/java/k8s/deploy/resources/frontend-service-depl.yaml b/terraform/java/k8s/deploy/resources/frontend-service-depl.yaml
@@ -25,5 +25,7 @@ spec:
           env:
             - name: "OTEL_SERVICE_NAME"
               value: "sample-application-${TESTING_ID}"
+            - name: "OTEL_INSTRUMENTATION_COMMON_EXPERIMENTAL_CONTROLLER_TELEMETRY_ENABLED"
+              value: "true"
       imagePullSecrets:
         - name: ecr-secret
diff --git a/validator/src/main/resources/expected-data-template/java/ec2/asg/aws-sdk-call-trace.mustache b/validator/src/main/resources/expected-data-template/java/ec2/asg/aws-sdk-call-trace.mustache
@@ -2,7 +2,7 @@
   "name": "^{{serviceName}}$",
   "http": {
     "request": {
-      "url": "^{{endpoint}}/aws-sdk-call\\?ip=(([0-9]{1,3}.){3}[0-9]{1,3})&testingId={{testingId}}$",
+      "url": "^{{endpoint}}/aws-sdk-call(?:\\?ip=(([0-9]{1,3}\\.){3}[0-9]{1,3})&testingId={{testingId}})?$",
       "method": "^GET$"
     },
     "response": {

diff --git a/...ator/src/main/resources/expected-data-template/java/ec2/asg/remote-service-trace.mustache b/...ator/src/main/resources/expected-data-template/java/ec2/asg/remote-service-trace.mustache
@@ -2,7 +2,7 @@
   "name": "^{{serviceName}}$",
   "http": {
     "request": {
-      "url": "^{{endpoint}}/remote-service\\?ip=(([0-9]{1,3}.){3}[0-9]{1,3})&testingId={{testingId}}$",
+      "url": "^{{endpoint}}/remote-service(?:\\?ip=(([0-9]{1,3}\\.){3}[0-9]{1,3})&testingId={{testingId}})?$",
       "method": "^GET$"
     },
     "response": {

diff --git a/...or/src/main/resources/expected-data-template/java/ec2/default/aws-sdk-call-trace.mustache b/...or/src/main/resources/expected-data-template/java/ec2/default/aws-sdk-call-trace.mustache
@@ -2,7 +2,7 @@
   "name": "^{{serviceName}}$",
   "http": {
     "request": {
-      "url": "^{{endpoint}}/aws-sdk-call\\?ip=(([0-9]{1,3}.){3}[0-9]{1,3})&testingId={{testingId}}$",
+      "url": "^{{endpoint}}/aws-sdk-call(?:\\?ip=(([0-9]{1,3}\\.){3}[0-9]{1,3})&testingId={{testingId}})?$",
       "method": "^GET$"
     },
     "response": {

diff --git a/.../src/main/resources/expected-data-template/java/ec2/default/remote-service-trace.mustache b/.../src/main/resources/expected-data-template/java/ec2/default/remote-service-trace.mustache
@@ -2,7 +2,7 @@
   "name": "^{{serviceName}}$",
   "http": {
     "request": {
-      "url": "^{{endpoint}}/remote-service\\?ip=(([0-9]{1,3}.){3}[0-9]{1,3})&testingId={{testingId}}$",
+      "url": "^{{endpoint}}/remote-service(?:\\?ip=(([0-9]{1,3}\\.){3}[0-9]{1,3})&testingId={{testingId}})?$",
       "method": "^GET$"
     },
     "response": {

diff --git a/validator/src/main/resources/expected-data-template/java/eks/aws-sdk-call-trace.mustache b/validator/src/main/resources/expected-data-template/java/eks/aws-sdk-call-trace.mustache
@@ -2,7 +2,7 @@
   "name": "^{{serviceName}}$",
   "http": {
     "request": {
-      "url": "^{{endpoint}}/aws-sdk-call\\?ip=(([0-9]{1,3}.){3}[0-9]{1,3})&testingId={{testingId}}$",
+      "url": "^{{endpoint}}/remote-service(?:\\?ip=(([0-9]{1,3}\\.){3}[0-9]{1,3})&testingId={{testingId}})?$",
       "method": "^GET$"
     },
     "response": {

diff --git a/validator/src/main/resources/expected-data-template/java/eks/remote-service-trace.mustache b/validator/src/main/resources/expected-data-template/java/eks/remote-service-trace.mustache
@@ -2,7 +2,7 @@
   "name": "^{{serviceName}}$",
   "http": {
     "request": {
-      "url": "^{{endpoint}}/remote-service\\?ip=(([0-9]{1,3}.){3}[0-9]{1,3})&testingId={{testingId}}$",
+      "url": "^{{endpoint}}/remote-service(?:\\?ip=(([0-9]{1,3}\\.){3}[0-9]{1,3})&testingId={{testingId}})?$",
       "method": "^GET$"
     },
     "response": {

diff --git a/validator/src/main/resources/expected-data-template/java/k8s/aws-sdk-call-trace.mustache b/validator/src/main/resources/expected-data-template/java/k8s/aws-sdk-call-trace.mustache
@@ -2,7 +2,7 @@
   "name": "^{{serviceName}}$",
   "http": {
     "request": {
-      "url": "^{{endpoint}}/aws-sdk-call\\?ip=(([0-9]{1,3}.){3}[0-9]{1,3})&testingId={{testingId}}$",
+      "url": "^{{endpoint}}/remote-service(?:\\?ip=(([0-9]{1,3}\\.){3}[0-9]{1,3})&testingId={{testingId}})?$",
       "method": "^GET$"
     },
     "response": {

diff --git a/validator/src/main/resources/expected-data-template/java/k8s/remote-service-trace.mustache b/validator/src/main/resources/expected-data-template/java/k8s/remote-service-trace.mustache
@@ -2,7 +2,7 @@
   "name": "^{{serviceName}}$",
   "http": {
     "request": {
-      "url": "^{{endpoint}}/remote-service\\?ip=(([0-9]{1,3}.){3}[0-9]{1,3})&testingId={{testingId}}$",
+      "url": "^{{endpoint}}/remote-service(?:\\?ip=(([0-9]{1,3}\\.){3}[0-9]{1,3})&testingId={{testingId}})?$",
       "method": "^GET$"
     },
     "response": {