From 7df00cf9f7cf66f884c337d373d50bbbded872d7 Mon Sep 17 00:00:00 2001 From: Xinran Zhang Date: Thu, 12 Sep 2024 09:27:52 -0700 Subject: [PATCH 1/6] Fix expect based on latest --- .../dotnet/k8s/aws-sdk-call-log.mustache | 2 +- .../dotnet/k8s/aws-sdk-call-metric.mustache | 6 +++--- .../dotnet/k8s/aws-sdk-call-trace.mustache | 2 +- .../dotnet/k8s/client-call-metric.mustache | 6 +++--- .../dotnet/k8s/outgoing-http-call-log.mustache | 2 +- .../dotnet/k8s/outgoing-http-call-metric.mustache | 6 +++--- .../dotnet/k8s/outgoing-http-call-trace.mustache | 2 +- .../dotnet/k8s/remote-service-log.mustache | 2 +- .../dotnet/k8s/remote-service-metric.mustache | 12 ++++++------ .../dotnet/k8s/remote-service-trace.mustache | 4 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) 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 3870db763..72a85e6d1 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}.*$" 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 be2ace17c..0648873c8 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}} @@ -129,7 +129,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}} 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 4c17aefc4..374460077 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": { 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 74b35db3a..e49a78825 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/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 96cf074d2..a37a63490 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}.*$" 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 83b87f1c1..102f2727e 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}} @@ -80,7 +80,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}} 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 8dfb15916..22f4494b4 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": { 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 6331b0480..ab1cbd19b 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}.*$" 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 b26243617..d74ea2273 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}} @@ -41,7 +41,7 @@ value: k8s:{{platformInfo}}/{{appNamespace}} - name: Operation - value: GET healthcheck + value: GET /healthcheck - name: Service value: {{remoteServiceDeploymentName}} @@ -173,7 +173,7 @@ dimensions: - name: Operation - value: GET remote-service + value: GET /remote-service - name: Service value: {{serviceName}} @@ -210,7 +210,7 @@ value: k8s:{{platformInfo}}/{{appNamespace}} - name: Operation - value: GET healthcheck + value: GET /healthcheck - name: Service value: {{remoteServiceDeploymentName}} @@ -342,7 +342,7 @@ dimensions: - name: Operation - value: GET remote-service + value: GET /remote-service - name: Service value: {{serviceName}} @@ -379,7 +379,7 @@ value: k8s:{{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-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/k8s/remote-service-trace.mustache index add3ad454..000fa41db 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": { @@ -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 6ab8bd74daca5bbe5e6a019a661ced9ebd1116aa Mon Sep 17 00:00:00 2001 From: Xinran Zhang Date: Fri, 13 Sep 2024 11:43:37 -0700 Subject: [PATCH 2/6] test --- .github/workflows/dotnet-k8s-canary.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/dotnet-k8s-canary.yml b/.github/workflows/dotnet-k8s-canary.yml index 3a19463a6..59a2d0b2b 100644 --- a/.github/workflows/dotnet-k8s-canary.yml +++ b/.github/workflows/dotnet-k8s-canary.yml @@ -11,6 +11,9 @@ on: schedule: - cron: '*/15 * * * *' # run the workflow every 15 minutes workflow_dispatch: # be able to run the workflow on demand + push: + branches: + - "dotnet-k8s-fix-expect" permissions: id-token: write From 9799400d235f579e951e71f34e8f63d976bc521d Mon Sep 17 00:00:00 2001 From: Xinran Zhang Date: Fri, 13 Sep 2024 11:44:29 -0700 Subject: [PATCH 3/6] Revert "test" This reverts commit 6ab8bd74daca5bbe5e6a019a661ced9ebd1116aa. --- .github/workflows/dotnet-k8s-canary.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/dotnet-k8s-canary.yml b/.github/workflows/dotnet-k8s-canary.yml index 59a2d0b2b..3a19463a6 100644 --- a/.github/workflows/dotnet-k8s-canary.yml +++ b/.github/workflows/dotnet-k8s-canary.yml @@ -11,9 +11,6 @@ on: schedule: - cron: '*/15 * * * *' # run the workflow every 15 minutes workflow_dispatch: # be able to run the workflow on demand - push: - branches: - - "dotnet-k8s-fix-expect" permissions: id-token: write From e3b3779cb944f5bafe6378130081676f922dcb70 Mon Sep 17 00:00:00 2001 From: Xinran Zhang Date: Fri, 13 Sep 2024 11:44:53 -0700 Subject: [PATCH 4/6] Revert "Revert "test"" This reverts commit 9799400d235f579e951e71f34e8f63d976bc521d. --- .github/workflows/dotnet-k8s-canary.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/dotnet-k8s-canary.yml b/.github/workflows/dotnet-k8s-canary.yml index 3a19463a6..59a2d0b2b 100644 --- a/.github/workflows/dotnet-k8s-canary.yml +++ b/.github/workflows/dotnet-k8s-canary.yml @@ -11,6 +11,9 @@ on: schedule: - cron: '*/15 * * * *' # run the workflow every 15 minutes workflow_dispatch: # be able to run the workflow on demand + push: + branches: + - "dotnet-k8s-fix-expect" permissions: id-token: write From e602258d54dacb917122a0c6014ad05b796243e2 Mon Sep 17 00:00:00 2001 From: Xinran Zhang Date: Fri, 13 Sep 2024 12:12:14 -0700 Subject: [PATCH 5/6] Update expect K8s validation yaml --- .../resources/validations/dotnet/k8s/log-validation.yml | 8 ++++---- .../validations/dotnet/k8s/metric-validation.yml | 8 ++++---- .../resources/validations/dotnet/k8s/trace-validation.yml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) 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 39b700be3..2d8b35261 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 2acc34b15..5c1cd06f5 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 53a6b39bb..705686df8 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 8af2eb3c980d9b099a9d5944210d085fddd15bd1 Mon Sep 17 00:00:00 2001 From: Xinran Zhang Date: Fri, 13 Sep 2024 12:19:34 -0700 Subject: [PATCH 6/6] Revert "Revert "Revert "test""" This reverts commit e3b3779cb944f5bafe6378130081676f922dcb70. --- .github/workflows/dotnet-k8s-canary.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/dotnet-k8s-canary.yml b/.github/workflows/dotnet-k8s-canary.yml index 59a2d0b2b..3a19463a6 100644 --- a/.github/workflows/dotnet-k8s-canary.yml +++ b/.github/workflows/dotnet-k8s-canary.yml @@ -11,9 +11,6 @@ on: schedule: - cron: '*/15 * * * *' # run the workflow every 15 minutes workflow_dispatch: # be able to run the workflow on demand - push: - branches: - - "dotnet-k8s-fix-expect" permissions: id-token: write