From 1ed349a3fb8c88e48fc71435ce72b197eb85aadf Mon Sep 17 00:00:00 2001 From: Zhonghao Zhao Date: Mon, 16 Dec 2024 09:52:23 -0800 Subject: [PATCH] Test adot v2. --- .github/workflows/java-eks-canary.yml | 2 +- terraform/java/ec2/asg/main.tf | 2 ++ terraform/java/ec2/default/main.tf | 2 ++ terraform/java/ecs/resources/main-service.json.tpl | 6 +++++- terraform/java/eks-otlp-ocb/main.tf | 8 ++++++++ terraform/java/eks/main.tf | 8 ++++++++ .../java/k8s/deploy/resources/frontend-service-depl.yaml | 2 ++ .../java/k8s/deploy/resources/remote-service-depl.yaml | 3 +++ .../java/ec2/asg/aws-sdk-call-trace.mustache | 2 +- .../java/ec2/asg/remote-service-trace.mustache | 2 +- .../java/ec2/default/aws-sdk-call-trace.mustache | 2 +- .../java/ec2/default/outgoing-http-call-trace.mustache | 2 +- .../java/ec2/default/remote-service-trace.mustache | 6 ++---- .../expected-data-template/java/ecs/hc-log.mustache | 2 +- .../java/eks/aws-sdk-call-trace.mustache | 2 +- .../java/eks/rds-mysql-trace.mustache | 4 ++-- .../java/eks/remote-service-trace.mustache | 2 +- .../java/k8s/aws-sdk-call-log.mustache | 4 ++-- .../java/k8s/aws-sdk-call-trace.mustache | 2 +- .../java/k8s/client-call-log.mustache | 4 ++-- .../java/k8s/outgoing-http-call-log.mustache | 4 ++-- .../java/k8s/remote-service-log.mustache | 4 ++-- .../java/k8s/remote-service-trace.mustache | 2 +- .../java/runtime/runtime-log.mustache | 2 +- .../expected-data-template/node/ecs/hc-log.mustache | 2 +- .../node/eks/aws-sdk-call-log.mustache | 4 ++-- .../node/k8s/aws-sdk-call-log.mustache | 4 ++-- .../node/k8s/client-call-log.mustache | 4 ++-- .../node/k8s/outgoing-http-call-log.mustache | 4 ++-- .../node/k8s/remote-service-log.mustache | 4 ++-- .../expected-data-template/python/ecs/hc-log.mustache | 2 +- .../python/k8s/aws-sdk-call-log.mustache | 4 ++-- .../python/k8s/client-call-log.mustache | 4 ++-- .../python/k8s/outgoing-http-call-log.mustache | 4 ++-- .../python/k8s/remote-service-log.mustache | 4 ++-- .../python/runtime/runtime-log.mustache | 2 +- .../src/test/test-resources/log/expected-runtime.mustache | 2 +- 37 files changed, 75 insertions(+), 48 deletions(-) diff --git a/.github/workflows/java-eks-canary.yml b/.github/workflows/java-eks-canary.yml index c76f65d93..56b121ed8 100644 --- a/.github/workflows/java-eks-canary.yml +++ b/.github/workflows/java-eks-canary.yml @@ -28,6 +28,6 @@ jobs: secrets: inherit with: aws-region: ${{ matrix.aws-region }} - test-cluster-name: 'e2e-canary-test' + test-cluster-name: 'e2e-playground' caller-workflow-name: 'appsignals-e2e-eks-canary-test' java-version: '11' diff --git a/terraform/java/ec2/asg/main.tf b/terraform/java/ec2/asg/main.tf index 46c033ad8..b5c702f68 100644 --- 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 @@ -236,6 +237,7 @@ resource "null_resource" "remote_service_setup" { 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} \ + OTEL_INSTRUMENTATION_COMMON_EXPERIMENTAL_CONTROLLER_TELEMETRY_ENABLED=true \ 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 diff --git a/terraform/java/ec2/default/main.tf b/terraform/java/ec2/default/main.tf index 36dfd369d..8dfb6905a 100644 --- a/terraform/java/ec2/default/main.tf +++ b/terraform/java/ec2/default/main.tf @@ -145,6 +145,7 @@ resource "null_resource" "main_service_setup" { 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 -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 @@ -242,6 +243,7 @@ resource "null_resource" "remote_service_setup" { 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} \ + OTEL_INSTRUMENTATION_COMMON_EXPERIMENTAL_CONTROLLER_TELEMETRY_ENABLED=true \ 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 diff --git a/terraform/java/ecs/resources/main-service.json.tpl b/terraform/java/ecs/resources/main-service.json.tpl index 4649b5b96..858f66bbd 100644 --- 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 index 6566bf0ef..96b244de1 100644 --- 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 } @@ -187,6 +191,10 @@ resource "kubernetes_deployment" "sample_remote_app_deployment" { name = "OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED" value = "false" } + env { + name = "OTEL_INSTRUMENTATION_COMMON_EXPERIMENTAL_CONTROLLER_TELEMETRY_ENABLED" + value = "true" + } } } } diff --git a/terraform/java/eks/main.tf b/terraform/java/eks/main.tf index 2aac0df51..1a9a738d9 100644 --- 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 } @@ -188,6 +192,10 @@ resource "kubernetes_deployment" "sample_remote_app_deployment" { name = "back-end" image = var.sample_remote_app_image image_pull_policy = "Always" + env { + name = "OTEL_INSTRUMENTATION_COMMON_EXPERIMENTAL_CONTROLLER_TELEMETRY_ENABLED" + value = "true" + } port { container_port = 8080 } diff --git a/terraform/java/k8s/deploy/resources/frontend-service-depl.yaml b/terraform/java/k8s/deploy/resources/frontend-service-depl.yaml index 3819e4676..000b78574 100644 --- 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 \ 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 b909f58f9..b70e985d1 100644 --- a/terraform/java/k8s/deploy/resources/remote-service-depl.yaml +++ b/terraform/java/k8s/deploy/resources/remote-service-depl.yaml @@ -22,5 +22,8 @@ spec: imagePullPolicy: Always ports: - containerPort: 8081 + env: + - name: "OTEL_INSTRUMENTATION_COMMON_EXPERIMENTAL_CONTROLLER_TELEMETRY_ENABLED" + value: "true" imagePullSecrets: - name: ecr-secret \ No newline at end of file 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 index a4153fef4..58e4b33d9 100644 --- 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/validator/src/main/resources/expected-data-template/java/ec2/asg/remote-service-trace.mustache b/validator/src/main/resources/expected-data-template/java/ec2/asg/remote-service-trace.mustache index d79ff91ca..32043f035 100644 --- a/validator/src/main/resources/expected-data-template/java/ec2/asg/remote-service-trace.mustache +++ b/validator/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/validator/src/main/resources/expected-data-template/java/ec2/default/aws-sdk-call-trace.mustache b/validator/src/main/resources/expected-data-template/java/ec2/default/aws-sdk-call-trace.mustache index b91731e9a..488ce397b 100644 --- a/validator/src/main/resources/expected-data-template/java/ec2/default/aws-sdk-call-trace.mustache +++ b/validator/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/validator/src/main/resources/expected-data-template/java/ec2/default/outgoing-http-call-trace.mustache b/validator/src/main/resources/expected-data-template/java/ec2/default/outgoing-http-call-trace.mustache index 503d48ab4..c1a91c841 100644 --- a/validator/src/main/resources/expected-data-template/java/ec2/default/outgoing-http-call-trace.mustache +++ b/validator/src/main/resources/expected-data-template/java/ec2/default/outgoing-http-call-trace.mustache @@ -59,4 +59,4 @@ }, { "name": "^www.amazon.com$" -}] +}] \ No newline at end of file diff --git a/validator/src/main/resources/expected-data-template/java/ec2/default/remote-service-trace.mustache b/validator/src/main/resources/expected-data-template/java/ec2/default/remote-service-trace.mustache index 7c171516c..2ef1f4d74 100644 --- a/validator/src/main/resources/expected-data-template/java/ec2/default/remote-service-trace.mustache +++ b/validator/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": { @@ -94,6 +94,4 @@ } } ] -}] - - +}] \ No newline at end of file diff --git a/validator/src/main/resources/expected-data-template/java/ecs/hc-log.mustache b/validator/src/main/resources/expected-data-template/java/ecs/hc-log.mustache index 5eab3c70c..4ab583baf 100644 --- a/validator/src/main/resources/expected-data-template/java/ecs/hc-log.mustache +++ b/validator/src/main/resources/expected-data-template/java/ecs/hc-log.mustache @@ -8,6 +8,6 @@ "PlatformType": "^AWS::ECS$", "Service": "^{{serviceName}}$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),java,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),java,Auto$", "Telemetry.Source": "^LocalRootSpan$" }] \ No newline at end of file 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 index dba0da090..c782cb51c 100644 --- 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}}/aws-sdk-call(?:\\?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/rds-mysql-trace.mustache b/validator/src/main/resources/expected-data-template/java/eks/rds-mysql-trace.mustache index d30d80aa5..11cb3d4f7 100644 --- a/validator/src/main/resources/expected-data-template/java/eks/rds-mysql-trace.mustache +++ b/validator/src/main/resources/expected-data-template/java/eks/rds-mysql-trace.mustache @@ -13,7 +13,7 @@ "aws": { "account_id": "^{{accountId}}$", "xray": { - "auto_instrumentation": true, + "auto_instrumentation": "^(true|false)$", "sdk": "^opentelemetry for" } }, @@ -42,7 +42,7 @@ "aws": { "account_id": "^{{accountId}}$", "xray": { - "auto_instrumentation": true, + "auto_instrumentation": "^(true|false)$", "sdk": "^opentelemetry for" } }, 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 index 781de9f64..3b56838ad 100644 --- 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-log.mustache b/validator/src/main/resources/expected-data-template/java/k8s/aws-sdk-call-log.mustache index 3ed6a83e6..630354b41 100644 --- a/validator/src/main/resources/expected-data-template/java/k8s/aws-sdk-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/java/k8s/aws-sdk-call-log.mustache @@ -12,7 +12,7 @@ "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),java,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),java,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }, { @@ -33,6 +33,6 @@ "RemoteResourceType": "AWS::S3::Bucket", "Telemetry.Source": "^ClientSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),java,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),java,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }] \ No newline at end of file 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 index 38a1b616b..045421d91 100644 --- 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}}/aws-sdk-call(?:\\?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/client-call-log.mustache b/validator/src/main/resources/expected-data-template/java/k8s/client-call-log.mustache index 02fa014e1..a36c96408 100644 --- a/validator/src/main/resources/expected-data-template/java/k8s/client-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/java/k8s/client-call-log.mustache @@ -12,7 +12,7 @@ "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),java,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),java,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }, { @@ -31,6 +31,6 @@ "RemoteOperation": "GET /", "Telemetry.Source": "^ClientSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),java,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),java,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }] \ No newline at end of file diff --git a/validator/src/main/resources/expected-data-template/java/k8s/outgoing-http-call-log.mustache b/validator/src/main/resources/expected-data-template/java/k8s/outgoing-http-call-log.mustache index e66209644..eb564cd66 100644 --- a/validator/src/main/resources/expected-data-template/java/k8s/outgoing-http-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/java/k8s/outgoing-http-call-log.mustache @@ -12,7 +12,7 @@ "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),java,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),java,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }, { @@ -31,7 +31,7 @@ "RemoteOperation": "GET /", "Telemetry.Source": "^ClientSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),java,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),java,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }] diff --git a/validator/src/main/resources/expected-data-template/java/k8s/remote-service-log.mustache b/validator/src/main/resources/expected-data-template/java/k8s/remote-service-log.mustache index 76af151b4..7f38f8fbd 100644 --- a/validator/src/main/resources/expected-data-template/java/k8s/remote-service-log.mustache +++ b/validator/src/main/resources/expected-data-template/java/k8s/remote-service-log.mustache @@ -12,7 +12,7 @@ "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),java,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),java,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }, { @@ -32,6 +32,6 @@ "RemoteOperation": "GET /healthcheck", "Telemetry.Source": "^ClientSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),java,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),java,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }] \ No newline at end of file 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 index 79a8a3bb2..7180ff677 100644 --- 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": { diff --git a/validator/src/main/resources/expected-data-template/java/runtime/runtime-log.mustache b/validator/src/main/resources/expected-data-template/java/runtime/runtime-log.mustache index 296d37f98..c280b354b 100644 --- a/validator/src/main/resources/expected-data-template/java/runtime/runtime-log.mustache +++ b/validator/src/main/resources/expected-data-template/java/runtime/runtime-log.mustache @@ -1,4 +1,4 @@ [{ - "Telemetry.SDK": "opentelemetry,.*,java,Auto", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),.*,java,Auto", "Telemetry.Source": "^RuntimeMetric$" }] \ No newline at end of file diff --git a/validator/src/main/resources/expected-data-template/node/ecs/hc-log.mustache b/validator/src/main/resources/expected-data-template/node/ecs/hc-log.mustache index 6c0d0704b..b72f650ba 100644 --- a/validator/src/main/resources/expected-data-template/node/ecs/hc-log.mustache +++ b/validator/src/main/resources/expected-data-template/node/ecs/hc-log.mustache @@ -8,7 +8,7 @@ "PlatformType": "^AWS::ECS$", "Service": "^{{serviceName}}$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),nodejs,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),nodejs,Auto$", "Telemetry.Source": "^LocalRootSpan$", "aws.log.group.names": "^/ecs/node-e2e-test$" }] \ No newline at end of file diff --git a/validator/src/main/resources/expected-data-template/node/eks/aws-sdk-call-log.mustache b/validator/src/main/resources/expected-data-template/node/eks/aws-sdk-call-log.mustache index 9f4ac2bb1..e4338f086 100644 --- a/validator/src/main/resources/expected-data-template/node/eks/aws-sdk-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/node/eks/aws-sdk-call-log.mustache @@ -13,7 +13,7 @@ "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),nodejs,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),nodejs,Auto$", "Host": "^ip(-[0-9]{1,3}){4}.*$" }, { @@ -35,6 +35,6 @@ "RemoteResourceType": "^AWS::S3::Bucket$", "Telemetry.Source": "^ClientSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),nodejs,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),nodejs,Auto$", "Host": "^ip(-[0-9]{1,3}){4}.*$" }] \ No newline at end of file diff --git a/validator/src/main/resources/expected-data-template/node/k8s/aws-sdk-call-log.mustache b/validator/src/main/resources/expected-data-template/node/k8s/aws-sdk-call-log.mustache index f3556bd28..554a958fa 100644 --- a/validator/src/main/resources/expected-data-template/node/k8s/aws-sdk-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/node/k8s/aws-sdk-call-log.mustache @@ -12,7 +12,7 @@ "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),nodejs,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),nodejs,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }, { @@ -33,6 +33,6 @@ "RemoteResourceType": "AWS::S3::Bucket", "Telemetry.Source": "^ClientSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),nodejs,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),nodejs,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }] \ No newline at end of file diff --git a/validator/src/main/resources/expected-data-template/node/k8s/client-call-log.mustache b/validator/src/main/resources/expected-data-template/node/k8s/client-call-log.mustache index f147882b8..8c2c8b770 100644 --- a/validator/src/main/resources/expected-data-template/node/k8s/client-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/node/k8s/client-call-log.mustache @@ -12,7 +12,7 @@ "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),nodejs,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),nodejs,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }, { @@ -31,6 +31,6 @@ "RemoteOperation": "GET /", "Telemetry.Source": "^ClientSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),nodejs,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),nodejs,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }] \ No newline at end of file diff --git a/validator/src/main/resources/expected-data-template/node/k8s/outgoing-http-call-log.mustache b/validator/src/main/resources/expected-data-template/node/k8s/outgoing-http-call-log.mustache index b0abcebbc..27cba8d83 100644 --- a/validator/src/main/resources/expected-data-template/node/k8s/outgoing-http-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/node/k8s/outgoing-http-call-log.mustache @@ -12,7 +12,7 @@ "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),nodejs,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),nodejs,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }, { @@ -31,7 +31,7 @@ "RemoteOperation": "GET /", "Telemetry.Source": "^ClientSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),nodejs,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),nodejs,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }] diff --git a/validator/src/main/resources/expected-data-template/node/k8s/remote-service-log.mustache b/validator/src/main/resources/expected-data-template/node/k8s/remote-service-log.mustache index c48ea7626..fae742151 100644 --- a/validator/src/main/resources/expected-data-template/node/k8s/remote-service-log.mustache +++ b/validator/src/main/resources/expected-data-template/node/k8s/remote-service-log.mustache @@ -12,7 +12,7 @@ "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),nodejs,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),nodejs,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }, { @@ -32,6 +32,6 @@ "RemoteOperation": "GET /healthcheck", "Telemetry.Source": "^ClientSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),nodejs,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),nodejs,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }] \ No newline at end of file diff --git a/validator/src/main/resources/expected-data-template/python/ecs/hc-log.mustache b/validator/src/main/resources/expected-data-template/python/ecs/hc-log.mustache index e453f0310..df1b7533d 100644 --- a/validator/src/main/resources/expected-data-template/python/ecs/hc-log.mustache +++ b/validator/src/main/resources/expected-data-template/python/ecs/hc-log.mustache @@ -8,6 +8,6 @@ "PlatformType": "^AWS::ECS$", "Service": "^{{serviceName}}$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),python,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),python,Auto$", "Telemetry.Source": "^LocalRootSpan$" }] \ No newline at end of file diff --git a/validator/src/main/resources/expected-data-template/python/k8s/aws-sdk-call-log.mustache b/validator/src/main/resources/expected-data-template/python/k8s/aws-sdk-call-log.mustache index 9a5ac3279..8492e0d45 100644 --- a/validator/src/main/resources/expected-data-template/python/k8s/aws-sdk-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/python/k8s/aws-sdk-call-log.mustache @@ -12,7 +12,7 @@ "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),python,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),python,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }, { @@ -33,6 +33,6 @@ "RemoteResourceType": "AWS::S3::Bucket", "Telemetry.Source": "^ClientSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),python,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),python,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }] \ No newline at end of file diff --git a/validator/src/main/resources/expected-data-template/python/k8s/client-call-log.mustache b/validator/src/main/resources/expected-data-template/python/k8s/client-call-log.mustache index 322b58ee1..6dc3d6971 100644 --- a/validator/src/main/resources/expected-data-template/python/k8s/client-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/python/k8s/client-call-log.mustache @@ -12,7 +12,7 @@ "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),python,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),python,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }, { @@ -31,6 +31,6 @@ "RemoteOperation": "GET /", "Telemetry.Source": "^ClientSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),python,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),python,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }] \ No newline at end of file diff --git a/validator/src/main/resources/expected-data-template/python/k8s/outgoing-http-call-log.mustache b/validator/src/main/resources/expected-data-template/python/k8s/outgoing-http-call-log.mustache index 6fe0a684e..d9be4eb57 100644 --- a/validator/src/main/resources/expected-data-template/python/k8s/outgoing-http-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/python/k8s/outgoing-http-call-log.mustache @@ -12,7 +12,7 @@ "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),python,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),python,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }, { @@ -31,6 +31,6 @@ "RemoteOperation": "GET /", "Telemetry.Source": "^ClientSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),python,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),python,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }] \ No newline at end of file diff --git a/validator/src/main/resources/expected-data-template/python/k8s/remote-service-log.mustache b/validator/src/main/resources/expected-data-template/python/k8s/remote-service-log.mustache index 1e26e9c97..78253052a 100644 --- a/validator/src/main/resources/expected-data-template/python/k8s/remote-service-log.mustache +++ b/validator/src/main/resources/expected-data-template/python/k8s/remote-service-log.mustache @@ -12,7 +12,7 @@ "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),python,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),python,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }, { @@ -32,6 +32,6 @@ "RemoteOperation": "GET /healthcheck", "Telemetry.Source": "^ClientSpan$", "Telemetry.Agent": "^CWAgent\/([A-Za-z0-9.-]*)$", - "Telemetry.SDK": "^opentelemetry,([A-Za-z0-9-.]*),python,Auto$", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),([A-Za-z0-9-.]*),python,Auto$", "Host": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$" }] \ No newline at end of file diff --git a/validator/src/main/resources/expected-data-template/python/runtime/runtime-log.mustache b/validator/src/main/resources/expected-data-template/python/runtime/runtime-log.mustache index 3f07b7c01..6ea9767fe 100644 --- a/validator/src/main/resources/expected-data-template/python/runtime/runtime-log.mustache +++ b/validator/src/main/resources/expected-data-template/python/runtime/runtime-log.mustache @@ -1,4 +1,4 @@ [{ - "Telemetry.SDK": "opentelemetry,.*,python,Auto", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),.*,python,Auto", "Telemetry.Source": "^RuntimeMetric$" }] \ No newline at end of file diff --git a/validator/src/test/test-resources/log/expected-runtime.mustache b/validator/src/test/test-resources/log/expected-runtime.mustache index 296d37f98..c280b354b 100644 --- a/validator/src/test/test-resources/log/expected-runtime.mustache +++ b/validator/src/test/test-resources/log/expected-runtime.mustache @@ -1,4 +1,4 @@ [{ - "Telemetry.SDK": "opentelemetry,.*,java,Auto", + "Telemetry.SDK": "^(opentelemetry|opentelemetry-java-instrumentation),.*,java,Auto", "Telemetry.Source": "^RuntimeMetric$" }] \ No newline at end of file