From ea7bfb4005cac9bc6a1e45420dfdd0e4850ab1c5 Mon Sep 17 00:00:00 2001 From: Mohamed Asaker Date: Wed, 30 Oct 2024 12:13:32 -0700 Subject: [PATCH 1/9] Updated E2E DotNet Operation after route template fix --- .../dotnet/ec2/asg/aws-sdk-call-log.mustache | 2 +- .../ec2/asg/aws-sdk-call-metric.mustache | 12 ++++++------ .../dotnet/ec2/asg/aws-sdk-call-trace.mustache | 2 +- .../ec2/asg/outgoing-http-call-log.mustache | 2 +- .../ec2/asg/outgoing-http-call-metric.mustache | 6 +++--- .../ec2/asg/outgoing-http-call-trace.mustache | 2 +- .../dotnet/ec2/asg/remote-service-log.mustache | 2 +- .../ec2/asg/remote-service-metric.mustache | 6 +++--- .../ec2/asg/remote-service-trace.mustache | 2 +- .../ec2/default/aws-sdk-call-log.mustache | 4 ++-- .../ec2/default/aws-sdk-call-metric.mustache | 18 +++++++++--------- .../ec2/default/aws-sdk-call-trace.mustache | 4 ++-- .../default/outgoing-http-call-log.mustache | 4 ++-- .../default/outgoing-http-call-metric.mustache | 12 ++++++------ .../default/outgoing-http-call-trace.mustache | 4 ++-- .../ec2/default/remote-service-log.mustache | 4 ++-- .../ec2/default/remote-service-metric.mustache | 12 ++++++------ .../ec2/default/remote-service-trace.mustache | 4 ++-- .../ec2/windows/aws-sdk-call-log.mustache | 4 ++-- .../ec2/windows/aws-sdk-call-metric.mustache | 18 +++++++++--------- .../ec2/windows/aws-sdk-call-trace.mustache | 4 ++-- .../windows/outgoing-http-call-log.mustache | 4 ++-- .../windows/outgoing-http-call-metric.mustache | 12 ++++++------ .../windows/outgoing-http-call-trace.mustache | 4 ++-- .../ec2/windows/remote-service-log.mustache | 4 ++-- .../ec2/windows/remote-service-metric.mustache | 12 ++++++------ .../ec2/windows/remote-service-trace.mustache | 4 ++-- .../dotnet/eks/linux/aws-sdk-call-log.mustache | 4 ++-- .../eks/linux/aws-sdk-call-metric.mustache | 18 +++++++++--------- .../eks/linux/aws-sdk-call-trace.mustache | 4 ++-- .../eks/linux/outgoing-http-call-log.mustache | 4 ++-- .../linux/outgoing-http-call-metric.mustache | 12 ++++++------ .../linux/outgoing-http-call-trace.mustache | 4 ++-- .../eks/linux/remote-service-log.mustache | 4 ++-- .../eks/linux/remote-service-metric.mustache | 18 +++++++++--------- .../eks/linux/remote-service-trace.mustache | 4 ++-- .../dotnet/k8s/aws-sdk-call-log.mustache | 4 ++-- .../dotnet/k8s/aws-sdk-call-metric.mustache | 18 +++++++++--------- .../dotnet/k8s/aws-sdk-call-trace.mustache | 4 ++-- .../dotnet/k8s/outgoing-http-call-log.mustache | 4 ++-- .../k8s/outgoing-http-call-metric.mustache | 12 ++++++------ .../k8s/outgoing-http-call-trace.mustache | 4 ++-- .../dotnet/k8s/remote-service-log.mustache | 4 ++-- .../dotnet/k8s/remote-service-metric.mustache | 18 +++++++++--------- .../dotnet/k8s/remote-service-trace.mustache | 4 ++-- 45 files changed, 156 insertions(+), 156 deletions(-) diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/aws-sdk-call-log.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/aws-sdk-call-log.mustache index 7df6917e8..7f690dd96 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/aws-sdk-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/aws-sdk-call-log.mustache @@ -11,7 +11,7 @@ "EC2.InstanceId": "^{{instanceId}}$", "Environment": "^ec2:{{platformInfo}}$", "PlatformType": "^AWS::EC2$", - "Operation": "GET /aws-sdk-call", + "Operation": "GET aws-sdk-call", "Version": "^1$", "RemoteService": "AWS::S3", "RemoteOperation": "GetBucketLocation", diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/aws-sdk-call-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/aws-sdk-call-metric.mustache index 64d0aa44e..7327551ec 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/aws-sdk-call-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/aws-sdk-call-metric.mustache @@ -29,7 +29,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -80,7 +80,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -154,7 +154,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -205,7 +205,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -279,7 +279,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -330,7 +330,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/aws-sdk-call-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/aws-sdk-call-trace.mustache index f2ba38a72..13ea133a2 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/aws-sdk-call-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/aws-sdk-call-trace.mustache @@ -35,7 +35,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /aws-sdk-call$", + "aws.local.operation": "^GET aws-sdk-call$", "aws.remote.service": "^AWS::S3$", "aws.remote.operation": "^GetBucketLocation$", "aws.local.environment": "^ec2:{{platformInfo}}$", diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/outgoing-http-call-log.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/outgoing-http-call-log.mustache index e8f925afa..769e927d9 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/outgoing-http-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/outgoing-http-call-log.mustache @@ -11,7 +11,7 @@ "EC2.InstanceId": "^{{instanceId}}$", "Environment": "^ec2:{{platformInfo}}$", "PlatformType": "^AWS::EC2$", - "Operation": "GET /outgoing-http-call", + "Operation": "GET outgoing-http-call", "Version": "^1$", "RemoteService": "aws.amazon.com:443", "RemoteOperation": "GET /", diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/outgoing-http-call-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/outgoing-http-call-metric.mustache index b06b677d4..d08bef06e 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/outgoing-http-call-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/outgoing-http-call-metric.mustache @@ -29,7 +29,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -105,7 +105,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -181,7 +181,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/outgoing-http-call-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/outgoing-http-call-trace.mustache index 6e20859b0..d1e079be9 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/outgoing-http-call-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/outgoing-http-call-trace.mustache @@ -38,7 +38,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /outgoing-http-call$", + "aws.local.operation": "^GET outgoing-http-call$", "aws.remote.service": "^aws.amazon.com:443$", "aws.remote.operation": "^GET /$", "aws.local.environment": "^ec2:{{platformInfo}}$" diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/remote-service-log.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/remote-service-log.mustache index cc1ba315f..0432ab980 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/remote-service-log.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/remote-service-log.mustache @@ -11,7 +11,7 @@ "EC2.InstanceId": "^{{instanceId}}$", "Environment": "^ec2:{{platformInfo}}$", "PlatformType": "^AWS::EC2$", - "Operation": "GET /remote-service", + "Operation": "GET remote-service", "Version": "^1$", "RemoteService": "{{remoteServiceDeploymentName}}", "RemoteOperation": "GET /healthcheck", diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/remote-service-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/remote-service-metric.mustache index c50e7ed1d..32f673b95 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/remote-service-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/remote-service-metric.mustache @@ -18,7 +18,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -127,7 +127,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -236,7 +236,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/remote-service-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/remote-service-trace.mustache index be675ac59..68f74e394 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/remote-service-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/asg/remote-service-trace.mustache @@ -38,7 +38,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /remote-service$", + "aws.local.operation": "^GET remote-service$", "aws.remote.service": "^{{remoteServiceDeploymentName}}$", "aws.remote.operation": "^GET /healthcheck$", "aws.local.environment": "^ec2:{{platformInfo}}$" diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-log.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-log.mustache index 06f8fadda..765527c87 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-log.mustache @@ -2,7 +2,7 @@ "EC2.InstanceId": "^{{instanceId}}$", "Environment": "^ec2:default$", "PlatformType": "^AWS::EC2$", - "Operation": "GET /aws-sdk-call", + "Operation": "GET aws-sdk-call", "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Host": "^ip(-[0-9]{1,3}){4}.*$" @@ -11,7 +11,7 @@ "EC2.InstanceId": "^{{instanceId}}$", "Environment": "^ec2:default$", "PlatformType": "^AWS::EC2$", - "Operation": "GET /aws-sdk-call", + "Operation": "GET aws-sdk-call", "Version": "^1$", "RemoteService": "AWS::S3", "RemoteOperation": "GetBucketLocation", diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-metric.mustache index ea61b697a..490dc9f45 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-metric.mustache @@ -15,7 +15,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -29,7 +29,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -80,7 +80,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -140,7 +140,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -154,7 +154,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -205,7 +205,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -265,7 +265,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -279,7 +279,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -331,7 +331,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-trace.mustache index 385f1b713..d0db82391 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-trace.mustache @@ -11,7 +11,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /aws-sdk-call$", + "aws.local.operation": "^GET aws-sdk-call$", "aws.local.environment": "^ec2:default$" }, "metadata": { @@ -31,7 +31,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /aws-sdk-call$", + "aws.local.operation": "^GET aws-sdk-call$", "aws.remote.service": "^AWS::S3$", "aws.remote.operation": "^GetBucketLocation$", "aws.local.environment": "^ec2:default$", diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-log.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-log.mustache index 848e84902..237ad1e7d 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-log.mustache @@ -2,7 +2,7 @@ "EC2.InstanceId": "^{{instanceId}}$", "Environment": "^ec2:default$", "PlatformType": "^AWS::EC2$", - "Operation": "GET /outgoing-http-call", + "Operation": "GET outgoing-http-call", "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Host": "^ip(-[0-9]{1,3}){4}.*$" @@ -11,7 +11,7 @@ "EC2.InstanceId": "^{{instanceId}}$", "Environment": "^ec2:default$", "PlatformType": "^AWS::EC2$", - "Operation": "GET /outgoing-http-call", + "Operation": "GET outgoing-http-call", "Version": "^1$", "RemoteService": "aws.amazon.com:443", "RemoteOperation": "GET /", diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-metric.mustache index 748e05178..e0e2bdcb7 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-metric.mustache @@ -15,7 +15,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -29,7 +29,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -91,7 +91,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -105,7 +105,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -167,7 +167,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -181,7 +181,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-trace.mustache index af1885d7e..c35b12f29 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-trace.mustache @@ -11,7 +11,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /outgoing-http-call$", + "aws.local.operation": "^GET outgoing-http-call$", "aws.local.environment": "^ec2:default$" }, "metadata": { @@ -34,7 +34,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /outgoing-http-call$", + "aws.local.operation": "^GET outgoing-http-call$", "aws.remote.service": "^aws.amazon.com:443$", "aws.remote.operation": "^GET /$", "aws.local.environment": "^ec2:default$" diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-log.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-log.mustache index cd457dc7b..603ef48a1 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-log.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-log.mustache @@ -2,7 +2,7 @@ "EC2.InstanceId": "^{{instanceId}}$", "Environment": "^ec2:default$", "PlatformType": "^AWS::EC2$", - "Operation": "GET /remote-service", + "Operation": "GET remote-service", "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Host": "^ip(-[0-9]{1,3}){4}.*$" @@ -11,7 +11,7 @@ "EC2.InstanceId": "^{{instanceId}}$", "Environment": "^ec2:default$", "PlatformType": "^AWS::EC2$", - "Operation": "GET /remote-service", + "Operation": "GET remote-service", "Version": "^1$", "RemoteService": "{{remoteServiceDeploymentName}}", "RemoteOperation": "GET /healthcheck", diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-metric.mustache index 4b1f0ad9c..0a7676ed0 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-metric.mustache @@ -4,7 +4,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -18,7 +18,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -113,7 +113,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -127,7 +127,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -222,7 +222,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -236,7 +236,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-trace.mustache index 15687c87f..77bb8cd01 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-trace.mustache @@ -11,7 +11,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /remote-service$", + "aws.local.operation": "^GET remote-service$", "aws.local.environment": "^ec2:default$" }, "metadata": { @@ -34,7 +34,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /remote-service$", + "aws.local.operation": "^GET remote-service$", "aws.remote.service": "^{{remoteServiceDeploymentName}}$", "aws.remote.operation": "^GET /healthcheck$", "aws.local.environment": "^ec2:default$" diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/aws-sdk-call-log.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/aws-sdk-call-log.mustache index 06f8fadda..765527c87 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/aws-sdk-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/aws-sdk-call-log.mustache @@ -2,7 +2,7 @@ "EC2.InstanceId": "^{{instanceId}}$", "Environment": "^ec2:default$", "PlatformType": "^AWS::EC2$", - "Operation": "GET /aws-sdk-call", + "Operation": "GET aws-sdk-call", "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Host": "^ip(-[0-9]{1,3}){4}.*$" @@ -11,7 +11,7 @@ "EC2.InstanceId": "^{{instanceId}}$", "Environment": "^ec2:default$", "PlatformType": "^AWS::EC2$", - "Operation": "GET /aws-sdk-call", + "Operation": "GET aws-sdk-call", "Version": "^1$", "RemoteService": "AWS::S3", "RemoteOperation": "GetBucketLocation", diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/aws-sdk-call-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/aws-sdk-call-metric.mustache index 22d8da7a7..0e2a0996c 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/aws-sdk-call-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/aws-sdk-call-metric.mustache @@ -15,7 +15,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -29,7 +29,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -80,7 +80,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -140,7 +140,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -154,7 +154,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -205,7 +205,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -265,7 +265,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -279,7 +279,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -330,7 +330,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/aws-sdk-call-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/aws-sdk-call-trace.mustache index ef4a9759a..d258a29cc 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/aws-sdk-call-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/aws-sdk-call-trace.mustache @@ -11,7 +11,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /aws-sdk-call$", + "aws.local.operation": "^GET aws-sdk-call$", "aws.local.environment": "^ec2:default$" }, "metadata": { @@ -31,7 +31,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /aws-sdk-call$", + "aws.local.operation": "^GET aws-sdk-call$", "aws.remote.service": "^AWS::S3$", "aws.remote.operation": "^GetBucketLocation$", "aws.local.environment": "^ec2:default$", diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/outgoing-http-call-log.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/outgoing-http-call-log.mustache index 848e84902..237ad1e7d 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/outgoing-http-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/outgoing-http-call-log.mustache @@ -2,7 +2,7 @@ "EC2.InstanceId": "^{{instanceId}}$", "Environment": "^ec2:default$", "PlatformType": "^AWS::EC2$", - "Operation": "GET /outgoing-http-call", + "Operation": "GET outgoing-http-call", "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Host": "^ip(-[0-9]{1,3}){4}.*$" @@ -11,7 +11,7 @@ "EC2.InstanceId": "^{{instanceId}}$", "Environment": "^ec2:default$", "PlatformType": "^AWS::EC2$", - "Operation": "GET /outgoing-http-call", + "Operation": "GET outgoing-http-call", "Version": "^1$", "RemoteService": "aws.amazon.com:443", "RemoteOperation": "GET /", diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/outgoing-http-call-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/outgoing-http-call-metric.mustache index 748e05178..e0e2bdcb7 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/outgoing-http-call-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/outgoing-http-call-metric.mustache @@ -15,7 +15,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -29,7 +29,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -91,7 +91,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -105,7 +105,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -167,7 +167,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -181,7 +181,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/outgoing-http-call-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/outgoing-http-call-trace.mustache index 44a9c334b..b49f7cb5a 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/outgoing-http-call-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/outgoing-http-call-trace.mustache @@ -11,7 +11,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /outgoing-http-call$", + "aws.local.operation": "^GET outgoing-http-call$", "aws.local.environment": "^ec2:default$" }, "metadata": { @@ -34,7 +34,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /outgoing-http-call$", + "aws.local.operation": "^GET outgoing-http-call$", "aws.remote.service": "^aws.amazon.com:443$", "aws.remote.operation": "^GET /$", "aws.local.environment": "^ec2:default$" diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-log.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-log.mustache index cd457dc7b..603ef48a1 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-log.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-log.mustache @@ -2,7 +2,7 @@ "EC2.InstanceId": "^{{instanceId}}$", "Environment": "^ec2:default$", "PlatformType": "^AWS::EC2$", - "Operation": "GET /remote-service", + "Operation": "GET remote-service", "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Host": "^ip(-[0-9]{1,3}){4}.*$" @@ -11,7 +11,7 @@ "EC2.InstanceId": "^{{instanceId}}$", "Environment": "^ec2:default$", "PlatformType": "^AWS::EC2$", - "Operation": "GET /remote-service", + "Operation": "GET remote-service", "Version": "^1$", "RemoteService": "{{remoteServiceDeploymentName}}", "RemoteOperation": "GET /healthcheck", diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-metric.mustache index bb5445d2f..f5b33ff2d 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-metric.mustache @@ -4,7 +4,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -18,7 +18,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -99,7 +99,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -113,7 +113,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -208,7 +208,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -222,7 +222,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-trace.mustache index bd5d2404f..c613079b0 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-trace.mustache @@ -11,7 +11,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /remote-service$", + "aws.local.operation": "^GET remote-service$", "aws.local.environment": "^ec2:default$" }, "metadata": { @@ -34,7 +34,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /remote-service$", + "aws.local.operation": "^GET remote-service$", "aws.remote.service": "^{{remoteServiceDeploymentName}}$", "aws.remote.operation": "^GET /healthcheck$", "aws.local.environment": "^ec2:default$" diff --git a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/aws-sdk-call-log.mustache b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/aws-sdk-call-log.mustache index ece6a4816..2ab1e1031 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/aws-sdk-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/aws-sdk-call-log.mustache @@ -9,7 +9,7 @@ "K8s.Workload": "^dotnet-app-deployment-{{testingId}}$", "PlatformType": "^AWS::EKS$", "Service": "^{{serviceName}}$", - "Operation": "GET /aws-sdk-call", + "Operation": "GET aws-sdk-call", "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Host": "^ip(-[0-9]{1,3}){4}.*$" @@ -25,7 +25,7 @@ "K8s.Workload": "^dotnet-app-deployment-{{testingId}}$", "PlatformType": "^AWS::EKS$", "Service": "^{{serviceName}}$", - "Operation": "GET /aws-sdk-call", + "Operation": "GET aws-sdk-call", "Version": "^1$", "RemoteService": "AWS::S3", "RemoteOperation": "GetBucketLocation", diff --git a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/aws-sdk-call-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/aws-sdk-call-metric.mustache index 740415ee0..09daa3d48 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/aws-sdk-call-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/aws-sdk-call-metric.mustache @@ -4,7 +4,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -18,7 +18,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -80,7 +80,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -129,7 +129,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -143,7 +143,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -205,7 +205,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -255,7 +255,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -269,7 +269,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -331,7 +331,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} diff --git a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/aws-sdk-call-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/aws-sdk-call-trace.mustache index f02320fee..7451f0d9d 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/aws-sdk-call-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/aws-sdk-call-trace.mustache @@ -11,7 +11,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /aws-sdk-call$", + "aws.local.operation": "^GET aws-sdk-call$", "aws.local.environment": "^eks:{{platformInfo}}/{{appNamespace}}$" }, "metadata": { @@ -36,7 +36,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /aws-sdk-call$", + "aws.local.operation": "^GET aws-sdk-call$", "aws.remote.service": "^AWS::S3$", "aws.remote.operation": "^GetBucketLocation$", "aws.local.environment": "^eks:{{platformInfo}}/{{appNamespace}}$", diff --git a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/outgoing-http-call-log.mustache b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/outgoing-http-call-log.mustache index 65c5bb307..5704f94b6 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/outgoing-http-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/outgoing-http-call-log.mustache @@ -9,7 +9,7 @@ "K8s.Workload": "^dotnet-app-deployment-{{testingId}}$", "PlatformType": "^AWS::EKS$", "Service": "^{{serviceName}}$", - "Operation": "GET /outgoing-http-call", + "Operation": "GET outgoing-http-call", "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Host": "^ip(-[0-9]{1,3}){4}.*$" @@ -25,7 +25,7 @@ "K8s.Workload": "^dotnet-app-deployment-{{testingId}}$", "PlatformType": "^AWS::EKS$", "Service": "^{{serviceName}}$", - "Operation": "GET /outgoing-http-call", + "Operation": "GET outgoing-http-call", "Version": "^1$", "RemoteService": "aws.amazon.com:443", "RemoteOperation": "GET /", diff --git a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/outgoing-http-call-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/outgoing-http-call-metric.mustache index 6a3ac4242..3fbd08a5d 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/outgoing-http-call-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/outgoing-http-call-metric.mustache @@ -4,7 +4,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -18,7 +18,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -80,7 +80,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -94,7 +94,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -156,7 +156,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -170,7 +170,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} diff --git a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/outgoing-http-call-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/outgoing-http-call-trace.mustache index b4d22c545..e84b11596 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/outgoing-http-call-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/outgoing-http-call-trace.mustache @@ -11,7 +11,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /outgoing-http-call$", + "aws.local.operation": "^GET outgoing-http-call$", "aws.local.environment": "^eks:{{platformInfo}}/{{appNamespace}}$" }, "metadata": { @@ -38,7 +38,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /outgoing-http-call$", + "aws.local.operation": "^GET outgoing-http-call$", "aws.remote.service": "^aws.amazon.com:443$", "aws.remote.operation": "^GET /$", "aws.local.environment": "^eks:{{platformInfo}}/{{appNamespace}}$" diff --git a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/remote-service-log.mustache b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/remote-service-log.mustache index d32e68b4b..71196a6cc 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/remote-service-log.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/remote-service-log.mustache @@ -9,7 +9,7 @@ "K8s.Workload": "^dotnet-app-deployment-{{testingId}}$", "PlatformType": "^AWS::EKS$", "Service": "^{{serviceName}}$", - "Operation": "GET /remote-service", + "Operation": "GET remote-service", "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Host": "^ip(-[0-9]{1,3}){4}.*$" @@ -26,7 +26,7 @@ "K8s.Workload": "^dotnet-app-deployment-{{testingId}}$", "PlatformType": "^AWS::EKS$", "Service": "^{{serviceName}}$", - "Operation": "GET /remote-service", + "Operation": "GET remote-service", "Version": "^1$", "RemoteService": "{{remoteServiceDeploymentName}}", "RemoteOperation": "GET /healthcheck", diff --git a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/remote-service-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/remote-service-metric.mustache index 928652d25..172acd60d 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/remote-service-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/remote-service-metric.mustache @@ -4,7 +4,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -18,7 +18,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -156,7 +156,7 @@ value: eks:{{platformInfo}}/{{appNamespace}} - name: Operation - value: GET /remote-service + value: GET remote-service - name: RemoteOperation value: GET /healthcheck @@ -173,7 +173,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -187,7 +187,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -325,7 +325,7 @@ value: eks:{{platformInfo}}/{{appNamespace}} - name: Operation - value: GET /remote-service + value: GET remote-service - name: RemoteOperation value: GET /healthcheck @@ -342,7 +342,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -356,7 +356,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -494,7 +494,7 @@ value: eks:{{platformInfo}}/{{appNamespace}} - name: Operation - value: GET /remote-service + value: GET remote-service - name: RemoteOperation value: GET /healthcheck diff --git a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/remote-service-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/remote-service-trace.mustache index c42b164cf..74c8f77c7 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/remote-service-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/remote-service-trace.mustache @@ -11,7 +11,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /remote-service$", + "aws.local.operation": "^GET remote-service$", "aws.local.environment": "^eks:{{platformInfo}}/{{appNamespace}}$" }, "metadata": { @@ -38,7 +38,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /remote-service$", + "aws.local.operation": "^GET remote-service$", "aws.remote.service": "^{{remoteServiceDeploymentName}}$", "aws.remote.operation": "^GET /healthcheck$", "aws.local.environment": "^eks:{{platformInfo}}/{{appNamespace}}$", diff --git a/validator/src/main/resources/expected-data-template/dotnet/k8s/aws-sdk-call-log.mustache b/validator/src/main/resources/expected-data-template/dotnet/k8s/aws-sdk-call-log.mustache index 72a85e6d1..e5cfe92d1 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/k8s/aws-sdk-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/k8s/aws-sdk-call-log.mustache @@ -7,7 +7,7 @@ "K8s.Workload": "^dotnet-sample-app-deployment-{{testingId}}$", "PlatformType": "^K8s$", "Service": "^{{serviceName}}$", - "Operation": "GET /aws-sdk-call", + "Operation": "GET aws-sdk-call", "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Host": "^ip(-[0-9]{1,3}){4}.*$" @@ -21,7 +21,7 @@ "K8s.Workload": "^dotnet-sample-app-deployment-{{testingId}}$", "PlatformType": "^K8s$", "Service": "^{{serviceName}}$", - "Operation": "GET /aws-sdk-call", + "Operation": "GET aws-sdk-call", "Version": "^1$", "RemoteService": "AWS::S3", "RemoteOperation": "GetBucketLocation", diff --git a/validator/src/main/resources/expected-data-template/dotnet/k8s/aws-sdk-call-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/k8s/aws-sdk-call-metric.mustache index 0648873c8..da30d7ad3 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/k8s/aws-sdk-call-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/k8s/aws-sdk-call-metric.mustache @@ -4,7 +4,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -18,7 +18,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -80,7 +80,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -129,7 +129,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -143,7 +143,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -205,7 +205,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -255,7 +255,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -269,7 +269,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} @@ -331,7 +331,7 @@ dimensions: - name: Operation - value: GET /aws-sdk-call + value: GET aws-sdk-call - name: Service value: {{serviceName}} diff --git a/validator/src/main/resources/expected-data-template/dotnet/k8s/aws-sdk-call-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/k8s/aws-sdk-call-trace.mustache index 374460077..cb4f5183a 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/k8s/aws-sdk-call-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/k8s/aws-sdk-call-trace.mustache @@ -11,7 +11,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /aws-sdk-call$", + "aws.local.operation": "^GET aws-sdk-call$", "aws.local.environment": "^k8s:{{platformInfo}}/{{appNamespace}}$" }, "metadata": { @@ -34,7 +34,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /aws-sdk-call$", + "aws.local.operation": "^GET aws-sdk-call$", "aws.remote.service": "^AWS::S3$", "aws.remote.operation": "^GetBucketLocation$", "aws.local.environment": "^k8s:{{platformInfo}}/{{appNamespace}}$", diff --git a/validator/src/main/resources/expected-data-template/dotnet/k8s/outgoing-http-call-log.mustache b/validator/src/main/resources/expected-data-template/dotnet/k8s/outgoing-http-call-log.mustache index a37a63490..61111829d 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/k8s/outgoing-http-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/k8s/outgoing-http-call-log.mustache @@ -7,7 +7,7 @@ "K8s.Workload": "^dotnet-sample-app-deployment-{{testingId}}$", "PlatformType": "^K8s$", "Service": "^{{serviceName}}$", - "Operation": "GET /outgoing-http-call", + "Operation": "GET outgoing-http-call", "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Host": "^ip(-[0-9]{1,3}){4}.*$" @@ -21,7 +21,7 @@ "K8s.Workload": "^dotnet-sample-app-deployment-{{testingId}}$", "PlatformType": "^K8s$", "Service": "^{{serviceName}}$", - "Operation": "GET /outgoing-http-call", + "Operation": "GET outgoing-http-call", "Version": "^1$", "RemoteService": "aws.amazon.com:443", "RemoteOperation": "GET /", diff --git a/validator/src/main/resources/expected-data-template/dotnet/k8s/outgoing-http-call-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/k8s/outgoing-http-call-metric.mustache index 102f2727e..c0f79243f 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/k8s/outgoing-http-call-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/k8s/outgoing-http-call-metric.mustache @@ -4,7 +4,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -18,7 +18,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -80,7 +80,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -94,7 +94,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -156,7 +156,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} @@ -170,7 +170,7 @@ dimensions: - name: Operation - value: GET /outgoing-http-call + value: GET outgoing-http-call - name: Service value: {{serviceName}} diff --git a/validator/src/main/resources/expected-data-template/dotnet/k8s/outgoing-http-call-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/k8s/outgoing-http-call-trace.mustache index 22f4494b4..fa5ac4b86 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/k8s/outgoing-http-call-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/k8s/outgoing-http-call-trace.mustache @@ -11,7 +11,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /outgoing-http-call$", + "aws.local.operation": "^GET outgoing-http-call$", "aws.local.environment": "^k8s:{{platformInfo}}/{{appNamespace}}$" }, "metadata": { @@ -36,7 +36,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /outgoing-http-call$", + "aws.local.operation": "^GET outgoing-http-call$", "aws.remote.service": "^aws.amazon.com:443$", "aws.remote.operation": "^GET /$", "aws.local.environment": "^k8s:{{platformInfo}}/{{appNamespace}}$" diff --git a/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-log.mustache b/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-log.mustache index ab1cbd19b..ef43968e8 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-log.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-log.mustache @@ -7,7 +7,7 @@ "K8s.Workload": "^dotnet-sample-app-deployment-{{testingId}}$", "PlatformType": "^K8s$", "Service": "^{{serviceName}}$", - "Operation": "GET /remote-service", + "Operation": "GET remote-service", "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Host": "^ip(-[0-9]{1,3}){4}.*$" @@ -22,7 +22,7 @@ "K8s.Workload": "^dotnet-sample-app-deployment-{{testingId}}$", "PlatformType": "^K8s$", "Service": "^{{serviceName}}$", - "Operation": "GET /remote-service", + "Operation": "GET remote-service", "Version": "^1$", "RemoteService": "{{remoteServiceDeploymentName}}", "RemoteOperation": "GET /healthcheck", diff --git a/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-metric.mustache index d74ea2273..1cedd2f50 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-metric.mustache @@ -4,7 +4,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -18,7 +18,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -156,7 +156,7 @@ value: k8s:{{platformInfo}}/{{appNamespace}} - name: Operation - value: GET /remote-service + value: GET remote-service - name: RemoteOperation value: GET /healthcheck @@ -173,7 +173,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -187,7 +187,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -325,7 +325,7 @@ value: k8s:{{platformInfo}}/{{appNamespace}} - name: Operation - value: GET /remote-service + value: GET remote-service - name: RemoteOperation value: GET /healthcheck @@ -342,7 +342,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -356,7 +356,7 @@ dimensions: - name: Operation - value: GET /remote-service + value: GET remote-service - name: Service value: {{serviceName}} @@ -494,7 +494,7 @@ value: k8s:{{platformInfo}}/{{appNamespace}} - name: Operation - value: GET /remote-service + value: GET remote-service - name: RemoteOperation value: GET /healthcheck diff --git a/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-trace.mustache index 000fa41db..51dbb2e90 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-trace.mustache @@ -11,7 +11,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /remote-service$", + "aws.local.operation": "^GET remote-service$", "aws.local.environment": "^k8s:{{platformInfo}}/{{appNamespace}}$" }, "metadata": { @@ -36,7 +36,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET /remote-service$", + "aws.local.operation": "^GET remote-service$", "aws.remote.service": "^{{remoteServiceDeploymentName}}$", "aws.remote.operation": "^GET /healthcheck$", "aws.local.environment": "^k8s:{{platformInfo}}/{{appNamespace}}$", From 13417d337ba650a4046cd1e13d8c46c697ad5f4b Mon Sep 17 00:00:00 2001 From: Mohamed Asaker Date: Wed, 20 Nov 2024 21:35:26 -0800 Subject: [PATCH 2/9] Revert "Set dotnet E2E test target for dotnet sdk v1.3.2 and cloudwatch helm charts v2.2.0 (#309)" This reverts commit 51ae3cb89a64b6a5b68e1205bbdc06ca85141cbd. --- .github/workflows/dotnet-ec2-default-test.yml | 2 +- terraform/dotnet/k8s/deploy/main.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-ec2-default-test.yml b/.github/workflows/dotnet-ec2-default-test.yml index 3f3e38fea..9d09da3cd 100644 --- a/.github/workflows/dotnet-ec2-default-test.yml +++ b/.github/workflows/dotnet-ec2-default-test.yml @@ -94,7 +94,7 @@ jobs: echo GET_ADOT_DISTRO_COMMAND="aws s3 cp s3://adot-autoinstrumentation-dotnet-staging/${{ env.ADOT_DISTRO_NAME }} ./${{ env.ADOT_DISTRO_NAME }} && unzip -d dotnet-distro ${{ env.ADOT_DISTRO_NAME }}" >> $GITHUB_ENV else # After Release will switch to latest tag instead of hard code version for canary purpose - echo GET_ADOT_DISTRO_COMMAND="wget -O aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip https://github.com/aws-observability/aws-otel-dotnet-instrumentation/releases/download/v1.3.2/aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip && unzip -d dotnet-distro aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip" >> $GITHUB_ENV + echo GET_ADOT_DISTRO_COMMAND="wget -O aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip https://github.com/aws-observability/aws-otel-dotnet-instrumentation/releases/latest/download/aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip && unzip -d dotnet-distro aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip" >> $GITHUB_ENV fi - name: Set Get CW Agent command environment variable diff --git a/terraform/dotnet/k8s/deploy/main.tf b/terraform/dotnet/k8s/deploy/main.tf index 23bba04b1..277c7a49e 100644 --- a/terraform/dotnet/k8s/deploy/main.tf +++ b/terraform/dotnet/k8s/deploy/main.tf @@ -37,7 +37,7 @@ resource "null_resource" "deploy" { [ ! -e dotnet-remote-service-depl.yaml ] || rm dotnet-remote-service-depl.yaml echo "LOG: Getting latest helm chart release URL" - latest_version_url=$(curl -s https://api.github.com/repos/aws-observability/helm-charts/releases/182005608 | grep "tarball_url" | cut -d '"' -f 4) + latest_version_url=$(curl -s https://api.github.com/repos/aws-observability/helm-charts/releases/latest | grep "tarball_url" | cut -d '"' -f 4) echo "LOG: The latest helm chart version url is $latest_version_url" echo "LOG: Downloading and unpacking the helm chart repo" curl -L $latest_version_url -o aws-observability-helm-charts-latest.tar.gz From 40636fc13be6a5496f7e1f5180ba1cf14fcf1444 Mon Sep 17 00:00:00 2001 From: Mohamed Asaker Date: Wed, 20 Nov 2024 21:35:40 -0800 Subject: [PATCH 3/9] Revert "Set dotnet E2E nuget test target for dotnet sdk v1.3.2 (#310)" This reverts commit f6bc748aaacf7667a6076b4aa545c3792c4d9e12. --- terraform/dotnet/ec2/nuget/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/dotnet/ec2/nuget/main.tf b/terraform/dotnet/ec2/nuget/main.tf index 83cac16f0..15400beab 100644 --- a/terraform/dotnet/ec2/nuget/main.tf +++ b/terraform/dotnet/ec2/nuget/main.tf @@ -142,7 +142,7 @@ resource "null_resource" "main_service_setup" { export OTEL_RESOURCE_ATTRIBUTES=service.name=dotnet-sample-application-${var.test_id} cd ./asp_frontend_service - dotnet add package AWS.Distro.OpenTelemetry.AutoInstrumentation --version 1.3.2 + dotnet add package AWS.Distro.OpenTelemetry.AutoInstrumentation --prerelease dotnet build --runtime linux-x64 dos2unix bin/Debug/netcoreapp8.0/linux-x64/adot-launch.sh nohup sh bin/Debug/netcoreapp8.0/linux-x64/adot-launch.sh dotnet bin/Debug/netcoreapp8.0/linux-x64/asp_frontend_service.dll & @@ -236,7 +236,7 @@ resource "null_resource" "remote_service_setup" { export OTEL_RESOURCE_ATTRIBUTES=service.name=dotnet-sample-remote-application-${var.test_id} export ASPNETCORE_URLS=http://0.0.0.0:8081 - dotnet add package AWS.Distro.OpenTelemetry.AutoInstrumentation --version 1.3.2 + dotnet add package AWS.Distro.OpenTelemetry.AutoInstrumentation --prerelease dotnet build --runtime linux-x64 dos2unix bin/Debug/netcoreapp8.0/linux-x64/adot-launch.sh nohup sh bin/Debug/netcoreapp8.0/linux-x64/adot-launch.sh dotnet bin/Debug/netcoreapp8.0/linux-x64/asp_remote_service.dll & From d690cf12e51e1c29e1f2d6bb0ad52e80d80e620d Mon Sep 17 00:00:00 2001 From: Mohamed Asaker Date: Wed, 20 Nov 2024 21:35:52 -0800 Subject: [PATCH 4/9] Revert "Set EKS addon to v2.2.1-eksbuild.1 for dotnet E2E test (#313)" This reverts commit dcc40b1d2dec22fe02a54ddeec3cecf671375133. --- .github/workflows/dotnet-eks-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-eks-test.yml b/.github/workflows/dotnet-eks-test.yml index 2a8883929..26e20627d 100644 --- a/.github/workflows/dotnet-eks-test.yml +++ b/.github/workflows/dotnet-eks-test.yml @@ -76,7 +76,7 @@ jobs: uses: ./.github/workflows/actions/execute_and_retry with: pre-command: "mkdir enablement-script && cd enablement-script" - command: "wget https://raw.githubusercontent.com/aws-observability/application-signals-demo/dotnet-sdk-1_3_2/scripts/eks/appsignals/enable-app-signals.sh + command: "wget https://raw.githubusercontent.com/aws-observability/application-signals-demo/main/scripts/eks/appsignals/enable-app-signals.sh && wget https://raw.githubusercontent.com/aws-observability/application-signals-demo/main/scripts/eks/appsignals/clean-app-signals.sh" cleanup: "rm -f enable-app-signals.sh && rm -f clean-app-signals.sh" post-command: "chmod +x enable-app-signals.sh && chmod +x clean-app-signals.sh" From cf3fbe91b074d40bb5b9806a1706c652b9648d8f Mon Sep 17 00:00:00 2001 From: Mohamed Asaker Date: Thu, 21 Nov 2024 11:00:37 -0800 Subject: [PATCH 5/9] temporary branch change --- .github/workflows/dotnet-ec2-asg-test.yml | 2 +- .github/workflows/dotnet-ec2-default-test.yml | 2 +- .github/workflows/dotnet-ec2-nuget-test.yml | 2 +- .github/workflows/dotnet-ec2-windows-test.yml | 2 +- .github/workflows/dotnet-eks-test.yml | 2 +- .github/workflows/dotnet-eks-windows-test.yml | 2 +- .github/workflows/dotnet-k8s-test.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dotnet-ec2-asg-test.yml b/.github/workflows/dotnet-ec2-asg-test.yml index 76154e90a..d2f2e2966 100644 --- a/.github/workflows/dotnet-ec2-asg-test.yml +++ b/.github/workflows/dotnet-ec2-asg-test.yml @@ -53,7 +53,7 @@ jobs: - uses: actions/checkout@v4 with: repository: aws-observability/aws-application-signals-test-framework - ref: ${{ inputs.caller-workflow-name == 'main-build' && 'main' || github.ref }} + ref: dotnetE2ERouteFix fetch-depth: 0 - name: Initiate Gradlew Daemon diff --git a/.github/workflows/dotnet-ec2-default-test.yml b/.github/workflows/dotnet-ec2-default-test.yml index 9d09da3cd..d217be2a2 100644 --- a/.github/workflows/dotnet-ec2-default-test.yml +++ b/.github/workflows/dotnet-ec2-default-test.yml @@ -53,7 +53,7 @@ jobs: - uses: actions/checkout@v4 with: repository: 'aws-observability/aws-application-signals-test-framework' - ref: ${{ inputs.caller-workflow-name == 'main-build' && 'main' || github.ref }} + ref: dotnetE2ERouteFix fetch-depth: 0 - name: Initiate Gradlew Daemon diff --git a/.github/workflows/dotnet-ec2-nuget-test.yml b/.github/workflows/dotnet-ec2-nuget-test.yml index 54d843c9b..7e58608eb 100644 --- a/.github/workflows/dotnet-ec2-nuget-test.yml +++ b/.github/workflows/dotnet-ec2-nuget-test.yml @@ -53,7 +53,7 @@ jobs: - uses: actions/checkout@v4 with: repository: 'aws-observability/aws-application-signals-test-framework' - ref: ${{ inputs.caller-workflow-name == 'main-build' && 'main' || github.ref }} + ref: dotnetE2ERouteFix fetch-depth: 0 - name: Initiate Gradlew Daemon diff --git a/.github/workflows/dotnet-ec2-windows-test.yml b/.github/workflows/dotnet-ec2-windows-test.yml index 4ab7108a1..84cb9e638 100644 --- a/.github/workflows/dotnet-ec2-windows-test.yml +++ b/.github/workflows/dotnet-ec2-windows-test.yml @@ -53,7 +53,7 @@ jobs: - uses: actions/checkout@v4 with: repository: 'aws-observability/aws-application-signals-test-framework' - ref: ${{ inputs.caller-workflow-name == 'main-build' && 'main' || github.ref }} + ref: dotnetE2ERouteFix fetch-depth: 0 - name: Initiate Gradlew Daemon diff --git a/.github/workflows/dotnet-eks-test.yml b/.github/workflows/dotnet-eks-test.yml index 26e20627d..01508968b 100644 --- a/.github/workflows/dotnet-eks-test.yml +++ b/.github/workflows/dotnet-eks-test.yml @@ -59,7 +59,7 @@ jobs: - uses: actions/checkout@v4 with: repository: 'aws-observability/aws-application-signals-test-framework' - ref: ${{ inputs.caller-workflow-name == 'main-build' && 'main' || github.ref }} + ref: dotnetE2ERouteFix fetch-depth: 0 - name: Initiate Gradlew Daemon diff --git a/.github/workflows/dotnet-eks-windows-test.yml b/.github/workflows/dotnet-eks-windows-test.yml index c0d3f0cbd..85f9fcc0f 100644 --- a/.github/workflows/dotnet-eks-windows-test.yml +++ b/.github/workflows/dotnet-eks-windows-test.yml @@ -61,7 +61,7 @@ jobs: - uses: actions/checkout@v4 with: repository: 'aws-observability/aws-application-signals-test-framework' - ref: ${{ inputs.caller-workflow-name == 'main-build' && 'main' || github.ref }} + ref: dotnetE2ERouteFix fetch-depth: 0 - name: Initiate Gradlew Daemon diff --git a/.github/workflows/dotnet-k8s-test.yml b/.github/workflows/dotnet-k8s-test.yml index 91815ab74..60c3cdf83 100644 --- a/.github/workflows/dotnet-k8s-test.yml +++ b/.github/workflows/dotnet-k8s-test.yml @@ -64,7 +64,7 @@ jobs: - uses: actions/checkout@v4 with: repository: 'aws-observability/aws-application-signals-test-framework' - ref: ${{ env.CALLER_WORKFLOW_NAME == 'main-build' && 'main' || github.ref }} + dotnetE2ERouteFix fetch-depth: 0 # We initialize Gradlew Daemon early on during the workflow because sometimes initialization From 0f2349204177e0f2e976b8bfe2aeaa9f5c7fafc2 Mon Sep 17 00:00:00 2001 From: Mohamed Asaker Date: Thu, 21 Nov 2024 11:36:26 -0800 Subject: [PATCH 6/9] added missing metric changes --- .../dotnet/ec2/default/remote-service-metric.mustache | 6 +++--- .../dotnet/ec2/windows/remote-service-metric.mustache | 4 ++-- .../dotnet/eks/linux/remote-service-metric.mustache | 6 +++--- .../dotnet/k8s/remote-service-metric.mustache | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-metric.mustache index 0a7676ed0..569d323d9 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-metric.mustache @@ -41,7 +41,7 @@ value: ec2:default - name: Operation - value: GET /healthcheck + value: GET healthcheck - name: Service value: {{remoteServiceName}} @@ -150,7 +150,7 @@ value: ec2:default - name: Operation - value: GET /healthcheck + value: GET healthcheck - name: Service value: {{remoteServiceName}} @@ -259,7 +259,7 @@ value: ec2:default - name: Operation - value: GET /healthcheck + value: GET healthcheck - name: Service value: {{remoteServiceName}} diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-metric.mustache index f5b33ff2d..1870c4248 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-metric.mustache @@ -136,7 +136,7 @@ value: ec2:default - name: Operation - value: GET /healthcheck + value: GET healthcheck - name: Service value: {{remoteServiceName}} @@ -245,7 +245,7 @@ value: ec2:default - name: Operation - value: GET /healthcheck + value: GET healthcheck - name: Service value: {{remoteServiceName}} diff --git a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/remote-service-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/remote-service-metric.mustache index 172acd60d..d40a92c42 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/remote-service-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/remote-service-metric.mustache @@ -41,7 +41,7 @@ value: eks:{{platformInfo}}/{{appNamespace}} - name: Operation - value: GET /healthcheck + value: GET healthcheck - name: Service value: {{remoteServiceDeploymentName}} @@ -210,7 +210,7 @@ value: eks:{{platformInfo}}/{{appNamespace}} - name: Operation - value: GET /healthcheck + value: GET healthcheck - name: Service value: {{remoteServiceDeploymentName}} @@ -379,7 +379,7 @@ value: eks:{{platformInfo}}/{{appNamespace}} - name: Operation - value: GET /healthcheck + value: GET healthcheck - name: Service value: {{remoteServiceDeploymentName}} diff --git a/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-metric.mustache index 1cedd2f50..36031463f 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-metric.mustache @@ -41,7 +41,7 @@ value: k8s:{{platformInfo}}/{{appNamespace}} - name: Operation - value: GET /healthcheck + value: GET healthcheck - name: Service value: {{remoteServiceDeploymentName}} @@ -210,7 +210,7 @@ value: k8s:{{platformInfo}}/{{appNamespace}} - name: Operation - value: GET /healthcheck + value: GET healthcheck - name: Service value: {{remoteServiceDeploymentName}} @@ -379,7 +379,7 @@ value: k8s:{{platformInfo}}/{{appNamespace}} - name: Operation - value: GET /healthcheck + value: GET healthcheck - name: Service value: {{remoteServiceDeploymentName}} From 7397ae21a5e67d33f633814684b53e239c707eb1 Mon Sep 17 00:00:00 2001 From: Mohamed Asaker Date: Thu, 21 Nov 2024 12:11:49 -0800 Subject: [PATCH 7/9] updated more validations and tests --- .../dotnet/eks/linux/client-call-metric.mustache | 6 +++--- .../dotnet/k8s/client-call-metric.mustache | 6 +++--- .../validations/dotnet/ec2/asg/log-validation.yml | 8 ++++---- .../validations/dotnet/ec2/asg/metric-validation.yml | 8 ++++---- .../validations/dotnet/ec2/asg/trace-validation.yml | 8 ++++---- .../validations/dotnet/ec2/default/log-validation.yml | 8 ++++---- .../validations/dotnet/ec2/default/metric-validation.yml | 8 ++++---- .../validations/dotnet/ec2/default/trace-validation.yml | 8 ++++---- .../validations/dotnet/ec2/windows/log-validation.yml | 8 ++++---- .../validations/dotnet/ec2/windows/metric-validation.yml | 8 ++++---- .../validations/dotnet/ec2/windows/trace-validation.yml | 8 ++++---- .../validations/dotnet/eks/linux/log-validation.yml | 8 ++++---- .../validations/dotnet/eks/linux/metric-validation.yml | 8 ++++---- .../validations/dotnet/eks/linux/trace-validation.yml | 8 ++++---- .../resources/validations/dotnet/k8s/log-validation.yml | 8 ++++---- .../validations/dotnet/k8s/metric-validation.yml | 8 ++++---- .../resources/validations/dotnet/k8s/trace-validation.yml | 8 ++++---- 17 files changed, 66 insertions(+), 66 deletions(-) diff --git a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/client-call-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/client-call-metric.mustache index 6c8a65eab..7ad4f362e 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/client-call-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/client-call-metric.mustache @@ -7,7 +7,7 @@ value: {{serviceName}} - name: Operation - value: GET /client-call + value: GET client-call - name: Environment value: eks:{{platformInfo}}/{{appNamespace}} @@ -97,7 +97,7 @@ value: {{serviceName}} - name: Operation - value: GET /client-call + value: GET client-call - name: Environment value: eks:{{platformInfo}}/{{appNamespace}} @@ -187,7 +187,7 @@ value: {{serviceName}} - name: Operation - value: GET /client-call + value: GET client-call - name: Environment value: eks:{{platformInfo}}/{{appNamespace}} diff --git a/validator/src/main/resources/expected-data-template/dotnet/k8s/client-call-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/k8s/client-call-metric.mustache index e49a78825..74b35db3a 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/k8s/client-call-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/k8s/client-call-metric.mustache @@ -7,7 +7,7 @@ value: {{serviceName}} - name: Operation - value: GET /client-call + value: GET client-call - name: Environment value: k8s:{{platformInfo}}/{{appNamespace}} @@ -97,7 +97,7 @@ value: {{serviceName}} - name: Operation - value: GET /client-call + value: GET client-call - name: Environment value: k8s:{{platformInfo}}/{{appNamespace}} @@ -187,7 +187,7 @@ value: {{serviceName}} - name: Operation - value: GET /client-call + value: GET client-call - name: Environment value: k8s:{{platformInfo}}/{{appNamespace}} diff --git a/validator/src/main/resources/validations/dotnet/ec2/asg/log-validation.yml b/validator/src/main/resources/validations/dotnet/ec2/asg/log-validation.yml index 4d7a0e9c4..c682fb09c 100644 --- a/validator/src/main/resources/validations/dotnet/ec2/asg/log-validation.yml +++ b/validator/src/main/resources/validations/dotnet/ec2/asg/log-validation.yml @@ -1,24 +1,24 @@ - validationType: "cw-log" - httpPath: "/outgoing-http-call" + httpPath: "outgoing-http-call" httpMethod: "get" callingType: "http" expectedLogStructureTemplate: "DOTNET_EC2_ASG_OUTGOING_HTTP_CALL_LOG" - validationType: "cw-log" - httpPath: "/aws-sdk-call" + httpPath: "aws-sdk-call" httpMethod: "get" callingType: "http-with-query" expectedLogStructureTemplate: "DOTNET_EC2_ASG_AWS_SDK_CALL_LOG" - validationType: "cw-log" - httpPath: "/remote-service" + httpPath: "remote-service" httpMethod: "get" callingType: "http-with-query" expectedLogStructureTemplate: "DOTNET_EC2_ASG_REMOTE_SERVICE_LOG" - validationType: "cw-log" - httpPath: "/client-call" + httpPath: "client-call" httpMethod: "get" callingType: "http" expectedLogStructureTemplate: "DOTNET_EC2_ASG_CLIENT_CALL_LOG" diff --git a/validator/src/main/resources/validations/dotnet/ec2/asg/metric-validation.yml b/validator/src/main/resources/validations/dotnet/ec2/asg/metric-validation.yml index c313f2758..ff6e1030d 100644 --- a/validator/src/main/resources/validations/dotnet/ec2/asg/metric-validation.yml +++ b/validator/src/main/resources/validations/dotnet/ec2/asg/metric-validation.yml @@ -1,24 +1,24 @@ - validationType: "cw-metric" - httpPath: "/outgoing-http-call" + httpPath: "outgoing-http-call" httpMethod: "get" callingType: "http" expectedMetricTemplate: "DOTNET_EC2_ASG_OUTGOING_HTTP_CALL_METRIC" - validationType: "cw-metric" - httpPath: "/aws-sdk-call" + httpPath: "aws-sdk-call" httpMethod: "get" callingType: "http-with-query" expectedMetricTemplate: "DOTNET_EC2_ASG_AWS_SDK_CALL_METRIC" - validationType: "cw-metric" - httpPath: "/remote-service" + httpPath: "remote-service" httpMethod: "get" callingType: "http-with-query" expectedMetricTemplate: "DOTNET_EC2_ASG_REMOTE_SERVICE_METRIC" - validationType: "cw-metric" - httpPath: "/client-call" + httpPath: "client-call" httpMethod: "get" callingType: "http" expectedMetricTemplate: "DOTNET_EC2_ASG_CLIENT_CALL_METRIC" diff --git a/validator/src/main/resources/validations/dotnet/ec2/asg/trace-validation.yml b/validator/src/main/resources/validations/dotnet/ec2/asg/trace-validation.yml index 53585a40e..0dfce9968 100644 --- a/validator/src/main/resources/validations/dotnet/ec2/asg/trace-validation.yml +++ b/validator/src/main/resources/validations/dotnet/ec2/asg/trace-validation.yml @@ -1,24 +1,24 @@ - validationType: "trace" - httpPath: "/outgoing-http-call" + httpPath: "outgoing-http-call" httpMethod: "get" callingType: "http" expectedTraceTemplate: "DOTNET_EC2_ASG_OUTGOING_HTTP_CALL_TRACE" - validationType: "trace" - httpPath: "/aws-sdk-call" + httpPath: "aws-sdk-call" httpMethod: "get" callingType: "http-with-query" expectedTraceTemplate: "DOTNET_EC2_ASG_AWS_SDK_CALL_TRACE" - validationType: "trace" - httpPath: "/remote-service" + httpPath: "remote-service" httpMethod: "get" callingType: "http-with-query" expectedTraceTemplate: "DOTNET_EC2_ASG_REMOTE_SERVICE_TRACE" - validationType: "trace" - httpPath: "/client-call" + httpPath: "client-call" httpMethod: "get" callingType: "http" expectedTraceTemplate: "DOTNET_EC2_ASG_CLIENT_CALL_TRACE" \ No newline at end of file diff --git a/validator/src/main/resources/validations/dotnet/ec2/default/log-validation.yml b/validator/src/main/resources/validations/dotnet/ec2/default/log-validation.yml index 637ec836a..82906ebdb 100644 --- a/validator/src/main/resources/validations/dotnet/ec2/default/log-validation.yml +++ b/validator/src/main/resources/validations/dotnet/ec2/default/log-validation.yml @@ -1,24 +1,24 @@ - validationType: "cw-log" - httpPath: "/outgoing-http-call" + httpPath: "outgoing-http-call" httpMethod: "get" callingType: "http" expectedLogStructureTemplate: "DOTNET_EC2_DEFAULT_OUTGOING_HTTP_CALL_LOG" - validationType: "cw-log" - httpPath: "/aws-sdk-call" + httpPath: "aws-sdk-call" httpMethod: "get" callingType: "http-with-query" expectedLogStructureTemplate: "DOTNET_EC2_DEFAULT_AWS_SDK_CALL_LOG" - validationType: "cw-log" - httpPath: "/remote-service" + httpPath: "remote-service" httpMethod: "get" callingType: "http-with-query" expectedLogStructureTemplate: "DOTNET_EC2_DEFAULT_REMOTE_SERVICE_LOG" - validationType: "cw-log" - httpPath: "/client-call" + httpPath: "client-call" httpMethod: "get" callingType: "http" expectedLogStructureTemplate: "DOTNET_EC2_DEFAULT_CLIENT_CALL_LOG" diff --git a/validator/src/main/resources/validations/dotnet/ec2/default/metric-validation.yml b/validator/src/main/resources/validations/dotnet/ec2/default/metric-validation.yml index ac33bda07..0cf6391d3 100644 --- a/validator/src/main/resources/validations/dotnet/ec2/default/metric-validation.yml +++ b/validator/src/main/resources/validations/dotnet/ec2/default/metric-validation.yml @@ -1,24 +1,24 @@ - validationType: "cw-metric" - httpPath: "/outgoing-http-call" + httpPath: "outgoing-http-call" httpMethod: "get" callingType: "http" expectedMetricTemplate: "DOTNET_EC2_DEFAULT_OUTGOING_HTTP_CALL_METRIC" - validationType: "cw-metric" - httpPath: "/aws-sdk-call" + httpPath: "aws-sdk-call" httpMethod: "get" callingType: "http-with-query" expectedMetricTemplate: "DOTNET_EC2_DEFAULT_AWS_SDK_CALL_METRIC" - validationType: "cw-metric" - httpPath: "/remote-service" + httpPath: "remote-service" httpMethod: "get" callingType: "http-with-query" expectedMetricTemplate: "DOTNET_EC2_DEFAULT_REMOTE_SERVICE_METRIC" - validationType: "cw-metric" - httpPath: "/client-call" + httpPath: "client-call" httpMethod: "get" callingType: "http" expectedMetricTemplate: "DOTNET_EC2_DEFAULT_CLIENT_CALL_METRIC" diff --git a/validator/src/main/resources/validations/dotnet/ec2/default/trace-validation.yml b/validator/src/main/resources/validations/dotnet/ec2/default/trace-validation.yml index b60415c49..c0c8d929c 100644 --- a/validator/src/main/resources/validations/dotnet/ec2/default/trace-validation.yml +++ b/validator/src/main/resources/validations/dotnet/ec2/default/trace-validation.yml @@ -1,24 +1,24 @@ - validationType: "trace" - httpPath: "/outgoing-http-call" + httpPath: "outgoing-http-call" httpMethod: "get" callingType: "http" expectedTraceTemplate: "DOTNET_EC2_DEFAULT_OUTGOING_HTTP_CALL_TRACE" - validationType: "trace" - httpPath: "/aws-sdk-call" + httpPath: "aws-sdk-call" httpMethod: "get" callingType: "http-with-query" expectedTraceTemplate: "DOTNET_EC2_DEFAULT_AWS_SDK_CALL_TRACE" - validationType: "trace" - httpPath: "/remote-service" + httpPath: "remote-service" httpMethod: "get" callingType: "http-with-query" expectedTraceTemplate: "DOTNET_EC2_DEFAULT_REMOTE_SERVICE_TRACE" - validationType: "trace" - httpPath: "/client-call" + httpPath: "client-call" httpMethod: "get" callingType: "http" expectedTraceTemplate: "DOTNET_EC2_DEFAULT_CLIENT_CALL_TRACE" \ No newline at end of file diff --git a/validator/src/main/resources/validations/dotnet/ec2/windows/log-validation.yml b/validator/src/main/resources/validations/dotnet/ec2/windows/log-validation.yml index 3c91dc73c..61aa7d1a3 100644 --- a/validator/src/main/resources/validations/dotnet/ec2/windows/log-validation.yml +++ b/validator/src/main/resources/validations/dotnet/ec2/windows/log-validation.yml @@ -1,24 +1,24 @@ - validationType: "cw-log" - httpPath: "/outgoing-http-call" + httpPath: "outgoing-http-call" httpMethod: "get" callingType: "http" expectedLogStructureTemplate: "DOTNET_EC2_WINDOWS_DEFAULT_OUTGOING_HTTP_CALL_LOG" - validationType: "cw-log" - httpPath: "/aws-sdk-call" + httpPath: "aws-sdk-call" httpMethod: "get" callingType: "http-with-query" expectedLogStructureTemplate: "DOTNET_EC2_WINDOWS_DEFAULT_AWS_SDK_CALL_LOG" - validationType: "cw-log" - httpPath: "/remote-service" + httpPath: "remote-service" httpMethod: "get" callingType: "http-with-query" expectedLogStructureTemplate: "DOTNET_EC2_WINDOWS_DEFAULT_REMOTE_SERVICE_LOG" - validationType: "cw-log" - httpPath: "/client-call" + httpPath: "client-call" httpMethod: "get" callingType: "http" expectedLogStructureTemplate: "DOTNET_EC2_WINDOWS_DEFAULT_CLIENT_CALL_LOG" diff --git a/validator/src/main/resources/validations/dotnet/ec2/windows/metric-validation.yml b/validator/src/main/resources/validations/dotnet/ec2/windows/metric-validation.yml index 6ee4c7e86..6b96e0399 100644 --- a/validator/src/main/resources/validations/dotnet/ec2/windows/metric-validation.yml +++ b/validator/src/main/resources/validations/dotnet/ec2/windows/metric-validation.yml @@ -1,24 +1,24 @@ - validationType: "cw-metric" - httpPath: "/outgoing-http-call" + httpPath: "outgoing-http-call" httpMethod: "get" callingType: "http" expectedMetricTemplate: "DOTNET_EC2_WINDOWS_DEFAULT_OUTGOING_HTTP_CALL_METRIC" - validationType: "cw-metric" - httpPath: "/aws-sdk-call" + httpPath: "aws-sdk-call" httpMethod: "get" callingType: "http-with-query" expectedMetricTemplate: "DOTNET_EC2_WINDOWS_DEFAULT_AWS_SDK_CALL_METRIC" - validationType: "cw-metric" - httpPath: "/remote-service" + httpPath: "remote-service" httpMethod: "get" callingType: "http-with-query" expectedMetricTemplate: "DOTNET_EC2_WINDOWS_DEFAULT_REMOTE_SERVICE_METRIC" - validationType: "cw-metric" - httpPath: "/client-call" + httpPath: "client-call" httpMethod: "get" callingType: "http" expectedMetricTemplate: "DOTNET_EC2_WINDOWS_DEFAULT_CLIENT_CALL_METRIC" diff --git a/validator/src/main/resources/validations/dotnet/ec2/windows/trace-validation.yml b/validator/src/main/resources/validations/dotnet/ec2/windows/trace-validation.yml index f9b96e830..28a81bdbc 100644 --- a/validator/src/main/resources/validations/dotnet/ec2/windows/trace-validation.yml +++ b/validator/src/main/resources/validations/dotnet/ec2/windows/trace-validation.yml @@ -1,12 +1,12 @@ - validationType: "trace" - httpPath: "/outgoing-http-call" + httpPath: "outgoing-http-call" httpMethod: "get" callingType: "http" expectedTraceTemplate: "DOTNET_EC2_WINDOWS_DEFAULT_OUTGOING_HTTP_CALL_TRACE" - validationType: "trace" - httpPath: "/aws-sdk-call" + httpPath: "aws-sdk-call" httpMethod: "get" callingType: "http-with-query" expectedTraceTemplate: "DOTNET_EC2_WINDOWS_DEFAULT_AWS_SDK_CALL_TRACE" @@ -14,13 +14,13 @@ # Because of a time sync issue, block the remote service trace check for now #- # validationType: "trace" -# httpPath: "/remote-service" +# httpPath: "remote-service" # httpMethod: "get" # callingType: "http-with-query" # expectedTraceTemplate: "DOTNET_EC2_WINDOWS_DEFAULT_REMOTE_SERVICE_TRACE" - validationType: "trace" - httpPath: "/client-call" + httpPath: "client-call" httpMethod: "get" callingType: "http" expectedTraceTemplate: "DOTNET_EC2_WINDOWS_DEFAULT_CLIENT_CALL_TRACE" \ No newline at end of file diff --git a/validator/src/main/resources/validations/dotnet/eks/linux/log-validation.yml b/validator/src/main/resources/validations/dotnet/eks/linux/log-validation.yml index 6084d95f5..f85bf4ac4 100644 --- a/validator/src/main/resources/validations/dotnet/eks/linux/log-validation.yml +++ b/validator/src/main/resources/validations/dotnet/eks/linux/log-validation.yml @@ -1,24 +1,24 @@ - validationType: "cw-log" - httpPath: "/outgoing-http-call" + httpPath: "outgoing-http-call" httpMethod: "get" callingType: "http" expectedLogStructureTemplate: "DOTNET_EKS_LINUX_OUTGOING_HTTP_CALL_LOG" - validationType: "cw-log" - httpPath: "/aws-sdk-call" + httpPath: "aws-sdk-call" httpMethod: "get" callingType: "http-with-query" expectedLogStructureTemplate: "DOTNET_EKS_LINUX_AWS_SDK_CALL_LOG" - validationType: "cw-log" - httpPath: "/remote-service" + httpPath: "remote-service" httpMethod: "get" callingType: "http-with-query" expectedLogStructureTemplate: "DOTNET_EKS_LINUX_REMOTE_SERVICE_LOG" - validationType: "cw-log" - httpPath: "/client-call" + httpPath: "client-call" httpMethod: "get" callingType: "http" expectedLogStructureTemplate: "DOTNET_EKS_LINUX_CLIENT_CALL_LOG" \ No newline at end of file diff --git a/validator/src/main/resources/validations/dotnet/eks/linux/metric-validation.yml b/validator/src/main/resources/validations/dotnet/eks/linux/metric-validation.yml index cee097e0d..2e414e1d0 100644 --- a/validator/src/main/resources/validations/dotnet/eks/linux/metric-validation.yml +++ b/validator/src/main/resources/validations/dotnet/eks/linux/metric-validation.yml @@ -1,24 +1,24 @@ - validationType: "cw-metric" - httpPath: "/outgoing-http-call" + httpPath: "outgoing-http-call" httpMethod: "get" callingType: "http" expectedMetricTemplate: "DOTNET_EKS_LINUX_OUTGOING_HTTP_CALL_METRIC" - validationType: "cw-metric" - httpPath: "/aws-sdk-call" + httpPath: "aws-sdk-call" httpMethod: "get" callingType: "http-with-query" expectedMetricTemplate: "DOTNET_EKS_LINUX_AWS_SDK_CALL_METRIC" - validationType: "cw-metric" - httpPath: "/remote-service" + httpPath: "remote-service" httpMethod: "get" callingType: "http-with-query" expectedMetricTemplate: "DOTNET_EKS_LINUX_REMOTE_SERVICE_METRIC" - validationType: "cw-metric" - httpPath: "/client-call" + httpPath: "client-call" httpMethod: "get" callingType: "http" expectedMetricTemplate: "DOTNET_EKS_LINUX_CLIENT_CALL_METRIC" diff --git a/validator/src/main/resources/validations/dotnet/eks/linux/trace-validation.yml b/validator/src/main/resources/validations/dotnet/eks/linux/trace-validation.yml index 07e7429a6..3c2f5be6f 100644 --- a/validator/src/main/resources/validations/dotnet/eks/linux/trace-validation.yml +++ b/validator/src/main/resources/validations/dotnet/eks/linux/trace-validation.yml @@ -1,24 +1,24 @@ - validationType: "trace" - httpPath: "/outgoing-http-call" + httpPath: "outgoing-http-call" httpMethod: "get" callingType: "http" expectedTraceTemplate: "DOTNET_EKS_LINUX_OUTGOING_HTTP_CALL_TRACE" - validationType: "trace" - httpPath: "/aws-sdk-call" + httpPath: "aws-sdk-call" httpMethod: "get" callingType: "http-with-query" expectedTraceTemplate: "DOTNET_EKS_LINUX_AWS_SDK_CALL_TRACE" - validationType: "trace" - httpPath: "/remote-service" + httpPath: "remote-service" httpMethod: "get" callingType: "http-with-query" expectedTraceTemplate: "DOTNET_EKS_LINUX_REMOTE_SERVICE_TRACE" - validationType: "trace" - httpPath: "/client-call" + httpPath: "client-call" httpMethod: "get" callingType: "http" expectedTraceTemplate: "DOTNET_EKS_LINUX_CLIENT_CALL_TRACE" \ No newline at end of file diff --git a/validator/src/main/resources/validations/dotnet/k8s/log-validation.yml b/validator/src/main/resources/validations/dotnet/k8s/log-validation.yml index 2d8b35261..39b700be3 100644 --- a/validator/src/main/resources/validations/dotnet/k8s/log-validation.yml +++ b/validator/src/main/resources/validations/dotnet/k8s/log-validation.yml @@ -1,24 +1,24 @@ - validationType: "cw-log" - httpPath: "/outgoing-http-call" + httpPath: "outgoing-http-call" httpMethod: "get" callingType: "http" expectedLogStructureTemplate: "DOTNET_K8S_OUTGOING_HTTP_CALL_LOG" - validationType: "cw-log" - httpPath: "/aws-sdk-call" + httpPath: "aws-sdk-call" httpMethod: "get" callingType: "http-with-query" expectedLogStructureTemplate: "DOTNET_K8S_AWS_SDK_CALL_LOG" - validationType: "cw-log" - httpPath: "/remote-service" + httpPath: "remote-service" httpMethod: "get" callingType: "http-with-query" expectedLogStructureTemplate: "DOTNET_K8S_REMOTE_SERVICE_LOG" - validationType: "cw-log" - httpPath: "/client-call" + httpPath: "client-call" httpMethod: "get" callingType: "http" expectedLogStructureTemplate: "DOTNET_K8S_CLIENT_CALL_LOG" \ No newline at end of file diff --git a/validator/src/main/resources/validations/dotnet/k8s/metric-validation.yml b/validator/src/main/resources/validations/dotnet/k8s/metric-validation.yml index 5c1cd06f5..2acc34b15 100644 --- a/validator/src/main/resources/validations/dotnet/k8s/metric-validation.yml +++ b/validator/src/main/resources/validations/dotnet/k8s/metric-validation.yml @@ -1,24 +1,24 @@ - validationType: "cw-metric" - httpPath: "/outgoing-http-call" + httpPath: "outgoing-http-call" httpMethod: "get" callingType: "http" expectedMetricTemplate: "DOTNET_K8S_OUTGOING_HTTP_CALL_METRIC" - validationType: "cw-metric" - httpPath: "/aws-sdk-call" + httpPath: "aws-sdk-call" httpMethod: "get" callingType: "http-with-query" expectedMetricTemplate: "DOTNET_K8S_AWS_SDK_CALL_METRIC" - validationType: "cw-metric" - httpPath: "/remote-service" + httpPath: "remote-service" httpMethod: "get" callingType: "http-with-query" expectedMetricTemplate: "DOTNET_K8S_REMOTE_SERVICE_METRIC" - validationType: "cw-metric" - httpPath: "/client-call" + httpPath: "client-call" httpMethod: "get" callingType: "http" expectedMetricTemplate: "DOTNET_K8S_CLIENT_CALL_METRIC" \ No newline at end of file diff --git a/validator/src/main/resources/validations/dotnet/k8s/trace-validation.yml b/validator/src/main/resources/validations/dotnet/k8s/trace-validation.yml index 705686df8..53a6b39bb 100644 --- a/validator/src/main/resources/validations/dotnet/k8s/trace-validation.yml +++ b/validator/src/main/resources/validations/dotnet/k8s/trace-validation.yml @@ -1,24 +1,24 @@ - validationType: "trace" - httpPath: "/outgoing-http-call" + httpPath: "outgoing-http-call" httpMethod: "get" callingType: "http" expectedTraceTemplate: "DOTNET_K8S_OUTGOING_HTTP_CALL_TRACE" - validationType: "trace" - httpPath: "/aws-sdk-call" + httpPath: "aws-sdk-call" httpMethod: "get" callingType: "http-with-query" expectedTraceTemplate: "DOTNET_K8S_AWS_SDK_CALL_TRACE" - validationType: "trace" - httpPath: "/remote-service" + httpPath: "remote-service" httpMethod: "get" callingType: "http-with-query" expectedTraceTemplate: "DOTNET_K8S_REMOTE_SERVICE_TRACE" - validationType: "trace" - httpPath: "/client-call" + httpPath: "client-call" httpMethod: "get" callingType: "http" expectedTraceTemplate: "DOTNET_K8S_CLIENT_CALL_TRACE" \ No newline at end of file From 851341be35c7e07a455b9a970bde101e78897b7f Mon Sep 17 00:00:00 2001 From: Mohamed Asaker Date: Thu, 21 Nov 2024 12:27:18 -0800 Subject: [PATCH 8/9] =?UTF-8?q?final=20change=20=F0=9F=A4=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dotnet/ec2/default/remote-service-trace.mustache | 2 +- .../dotnet/ec2/windows/remote-service-trace.mustache | 2 +- .../dotnet/eks/linux/remote-service-trace.mustache | 2 +- .../dotnet/k8s/remote-service-trace.mustache | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-trace.mustache index 77bb8cd01..8de9e45fb 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-trace.mustache @@ -60,7 +60,7 @@ }, "annotations": { "aws.local.service": "^{{remoteServiceName}}$", - "aws.local.operation": "^GET /healthcheck$", + "aws.local.operation": "^GET healthcheck$", "aws.local.environment": "^ec2:default$" }, "metadata": { diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-trace.mustache index c613079b0..3963ba2b4 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/windows/remote-service-trace.mustache @@ -60,7 +60,7 @@ }, "annotations": { "aws.local.service": "^{{remoteServiceName}}$", - "aws.local.operation": "^GET /healthcheck$", + "aws.local.operation": "^GET healthcheck$", "aws.local.environment": "^ec2:default$" }, "metadata": { diff --git a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/remote-service-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/remote-service-trace.mustache index 74c8f77c7..14bda5899 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/eks/linux/remote-service-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/eks/linux/remote-service-trace.mustache @@ -67,7 +67,7 @@ }, "annotations": { "aws.local.service": "^{{remoteServiceDeploymentName}}$", - "aws.local.operation": "^GET /healthcheck$", + "aws.local.operation": "^GET healthcheck$", "aws.local.environment": "^eks:{{platformInfo}}/{{appNamespace}}$" }, "metadata": { diff --git a/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-trace.mustache index 51dbb2e90..18fdbbba0 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-trace.mustache @@ -63,7 +63,7 @@ }, "annotations": { "aws.local.service": "^{{remoteServiceDeploymentName}}$", - "aws.local.operation": "^GET /healthcheck$", + "aws.local.operation": "^GET healthcheck$", "aws.local.environment": "^k8s:{{platformInfo}}/{{appNamespace}}$" }, "metadata": { From 171ef6d2484d45c17a44383c6738016cd119a98e Mon Sep 17 00:00:00 2001 From: Mohamed Asaker Date: Thu, 21 Nov 2024 12:37:20 -0800 Subject: [PATCH 9/9] Revert "temporary branch change" This reverts commit cf3fbe91b074d40bb5b9806a1706c652b9648d8f. --- .github/workflows/dotnet-ec2-asg-test.yml | 2 +- .github/workflows/dotnet-ec2-default-test.yml | 2 +- .github/workflows/dotnet-ec2-nuget-test.yml | 2 +- .github/workflows/dotnet-ec2-windows-test.yml | 2 +- .github/workflows/dotnet-eks-test.yml | 2 +- .github/workflows/dotnet-eks-windows-test.yml | 2 +- .github/workflows/dotnet-k8s-test.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dotnet-ec2-asg-test.yml b/.github/workflows/dotnet-ec2-asg-test.yml index d2f2e2966..76154e90a 100644 --- a/.github/workflows/dotnet-ec2-asg-test.yml +++ b/.github/workflows/dotnet-ec2-asg-test.yml @@ -53,7 +53,7 @@ jobs: - uses: actions/checkout@v4 with: repository: aws-observability/aws-application-signals-test-framework - ref: dotnetE2ERouteFix + ref: ${{ inputs.caller-workflow-name == 'main-build' && 'main' || github.ref }} fetch-depth: 0 - name: Initiate Gradlew Daemon diff --git a/.github/workflows/dotnet-ec2-default-test.yml b/.github/workflows/dotnet-ec2-default-test.yml index d217be2a2..9d09da3cd 100644 --- a/.github/workflows/dotnet-ec2-default-test.yml +++ b/.github/workflows/dotnet-ec2-default-test.yml @@ -53,7 +53,7 @@ jobs: - uses: actions/checkout@v4 with: repository: 'aws-observability/aws-application-signals-test-framework' - ref: dotnetE2ERouteFix + ref: ${{ inputs.caller-workflow-name == 'main-build' && 'main' || github.ref }} fetch-depth: 0 - name: Initiate Gradlew Daemon diff --git a/.github/workflows/dotnet-ec2-nuget-test.yml b/.github/workflows/dotnet-ec2-nuget-test.yml index 7e58608eb..54d843c9b 100644 --- a/.github/workflows/dotnet-ec2-nuget-test.yml +++ b/.github/workflows/dotnet-ec2-nuget-test.yml @@ -53,7 +53,7 @@ jobs: - uses: actions/checkout@v4 with: repository: 'aws-observability/aws-application-signals-test-framework' - ref: dotnetE2ERouteFix + ref: ${{ inputs.caller-workflow-name == 'main-build' && 'main' || github.ref }} fetch-depth: 0 - name: Initiate Gradlew Daemon diff --git a/.github/workflows/dotnet-ec2-windows-test.yml b/.github/workflows/dotnet-ec2-windows-test.yml index 84cb9e638..4ab7108a1 100644 --- a/.github/workflows/dotnet-ec2-windows-test.yml +++ b/.github/workflows/dotnet-ec2-windows-test.yml @@ -53,7 +53,7 @@ jobs: - uses: actions/checkout@v4 with: repository: 'aws-observability/aws-application-signals-test-framework' - ref: dotnetE2ERouteFix + ref: ${{ inputs.caller-workflow-name == 'main-build' && 'main' || github.ref }} fetch-depth: 0 - name: Initiate Gradlew Daemon diff --git a/.github/workflows/dotnet-eks-test.yml b/.github/workflows/dotnet-eks-test.yml index 01508968b..26e20627d 100644 --- a/.github/workflows/dotnet-eks-test.yml +++ b/.github/workflows/dotnet-eks-test.yml @@ -59,7 +59,7 @@ jobs: - uses: actions/checkout@v4 with: repository: 'aws-observability/aws-application-signals-test-framework' - ref: dotnetE2ERouteFix + ref: ${{ inputs.caller-workflow-name == 'main-build' && 'main' || github.ref }} fetch-depth: 0 - name: Initiate Gradlew Daemon diff --git a/.github/workflows/dotnet-eks-windows-test.yml b/.github/workflows/dotnet-eks-windows-test.yml index 85f9fcc0f..c0d3f0cbd 100644 --- a/.github/workflows/dotnet-eks-windows-test.yml +++ b/.github/workflows/dotnet-eks-windows-test.yml @@ -61,7 +61,7 @@ jobs: - uses: actions/checkout@v4 with: repository: 'aws-observability/aws-application-signals-test-framework' - ref: dotnetE2ERouteFix + ref: ${{ inputs.caller-workflow-name == 'main-build' && 'main' || github.ref }} fetch-depth: 0 - name: Initiate Gradlew Daemon diff --git a/.github/workflows/dotnet-k8s-test.yml b/.github/workflows/dotnet-k8s-test.yml index 60c3cdf83..91815ab74 100644 --- a/.github/workflows/dotnet-k8s-test.yml +++ b/.github/workflows/dotnet-k8s-test.yml @@ -64,7 +64,7 @@ jobs: - uses: actions/checkout@v4 with: repository: 'aws-observability/aws-application-signals-test-framework' - dotnetE2ERouteFix + ref: ${{ env.CALLER_WORKFLOW_NAME == 'main-build' && 'main' || github.ref }} fetch-depth: 0 # We initialize Gradlew Daemon early on during the workflow because sometimes initialization