Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update E2E Tests Expected Data for K8s #65

Merged
merged 3 commits into from
May 13, 2024
Merged

Update E2E Tests Expected Data for K8s #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4a0822
update k8s tests to test updated metric rollups
jj22ee May 12, 2024
5a5b243
update logs and traces tests for consistency
jj22ee May 13, 2024
056bed0
update advanced telemetry data
jj22ee May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/appsignals-e2e-k8s-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@ jobs:
- name: Call all test APIs
continue-on-error: true
run: |
curl -S -s http://${{ env.MAIN_SERVICE_ENDPOINT }}:30100/outgoing-http-call/; echo
curl -S -s http://${{ env.MAIN_SERVICE_ENDPOINT }}:30100/aws-sdk-call/; echo
curl -S -s http://${{ env.MAIN_SERVICE_ENDPOINT }}:30100/remote-service?ip=${{ env.REMOTE_SERVICE_IP }}/; echo
curl -S -s http://${{ env.MAIN_SERVICE_ENDPOINT }}:30100/client-call/; echo
curl -S -s http://${{ env.MAIN_SERVICE_ENDPOINT }}:30100/outgoing-http-call; echo
curl -S -s http://${{ env.MAIN_SERVICE_ENDPOINT }}:30100/aws-sdk-call?ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}; echo
curl -S -s http://${{ env.MAIN_SERVICE_ENDPOINT }}:30100/remote-service?ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}; echo
curl -S -s http://${{ env.MAIN_SERVICE_ENDPOINT }}:30100/client-call; echo

# Validation for pulse telemetry data
- name: Validate generated EMF logs
Expand All @@ -120,7 +120,7 @@ jobs:
--app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
--service-name sample-application-${{ env.TESTING_ID }}
--remote-service-name sample-r-app-deployment-${{ env.TESTING_ID }}
--query-string ip=${{ env.REMOTE_SERVICE_IP }}
--query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
--rollup'

- name: Validate generated metrics
Expand All @@ -138,7 +138,7 @@ jobs:
--service-name sample-application-${{ env.TESTING_ID }}
--remote-service-name sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-deployment-name sample-r-app-deployment-${{ env.TESTING_ID }}
--query-string ip=${{ env.REMOTE_SERVICE_IP }}
--query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
--rollup'

- name: Validate generated traces
Expand All @@ -156,7 +156,7 @@ jobs:
--service-name sample-application-${{ env.TESTING_ID }}
--remote-service-name sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-deployment-name sample-r-app-deployment-${{ env.TESTING_ID }}
--query-string ip=${{ env.REMOTE_SERVICE_IP }}
--query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
--rollup'

- name: Publish metric on test result
Expand Down
2 changes: 1 addition & 1 deletion validator/src/main/resources/expected-data-template/k8s/aws-sdk-call-log.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"Version": "^1$",
"RemoteService": "AWS.SDK.S3",
"RemoteOperation": "GetBucketLocation",
"RemoteTarget": "::s3:::e2e-test-bucket-name",
"RemoteTarget": "^::s3:::e2e-test-bucket-name-{{testingId}}$",
"aws.span.kind": "^CLIENT$",
"host.name": "^ip(-[0-9]{1,3}){4}\\.ec2\\.internal$"
}]
105 changes: 99 additions & 6 deletions validator/src/main/resources/expected-data-template/k8s/aws-sdk-call-metric.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
value: AWS.SDK.S3
-
name: RemoteTarget
value: ::s3:::e2e-test-bucket-name
value: ::s3:::e2e-test-bucket-name-{{testingId}}

-
metricName: Latency
Expand All @@ -136,7 +136,38 @@
value: AWS.SDK.S3
-
name: RemoteTarget
value: ::s3:::e2e-test-bucket-name
value: ::s3:::e2e-test-bucket-name-{{testingId}}

-
metricName: Latency
namespace: {{metricNamespace}}
dimensions:
-
name: Service
value: {{serviceName}}
-
name: HostedIn.K8s.Cluster
value: {{platformInfo}}
-
name: HostedIn.K8s.Namespace
value: {{appNamespace}}
-
name: RemoteService
value: AWS.SDK.S3
-
name: RemoteTarget
value: ::s3:::e2e-test-bucket-name-{{testingId}}

-
metricName: Latency
namespace: {{metricNamespace}}
dimensions:
-
name: RemoteService
value: AWS.SDK.S3
-
name: RemoteTarget
value: ::s3:::e2e-test-bucket-name-{{testingId}}

-
metricName: Error
Expand Down Expand Up @@ -253,7 +284,7 @@
value: AWS.SDK.S3
-
name: RemoteTarget
value: ::s3:::e2e-test-bucket-name
value: ::s3:::e2e-test-bucket-name-{{testingId}}

-
metricName: Error
Expand All @@ -276,7 +307,38 @@
value: AWS.SDK.S3
-
name: RemoteTarget
value: ::s3:::e2e-test-bucket-name
value: ::s3:::e2e-test-bucket-name-{{testingId}}

-
metricName: Error
namespace: {{metricNamespace}}
dimensions:
-
name: Service
value: {{serviceName}}
-
name: HostedIn.K8s.Cluster
value: {{platformInfo}}
-
name: HostedIn.K8s.Namespace
value: {{appNamespace}}
-
name: RemoteService
value: AWS.SDK.S3
-
name: RemoteTarget
value: ::s3:::e2e-test-bucket-name-{{testingId}}

-
metricName: Error
namespace: {{metricNamespace}}
dimensions:
-
name: RemoteService
value: AWS.SDK.S3
-
name: RemoteTarget
value: ::s3:::e2e-test-bucket-name-{{testingId}}

-
metricName: Fault
Expand Down Expand Up @@ -393,7 +455,7 @@
value: AWS.SDK.S3
-
name: RemoteTarget
value: ::s3:::e2e-test-bucket-name
value: ::s3:::e2e-test-bucket-name-{{testingId}}

-
metricName: Fault
Expand All @@ -416,4 +478,35 @@
value: AWS.SDK.S3
-
name: RemoteTarget
value: ::s3:::e2e-test-bucket-name
value: ::s3:::e2e-test-bucket-name-{{testingId}}

-
metricName: Fault
namespace: {{metricNamespace}}
dimensions:
-
name: Service
value: {{serviceName}}
-
name: HostedIn.K8s.Cluster
value: {{platformInfo}}
-
name: HostedIn.K8s.Namespace
value: {{appNamespace}}
-
name: RemoteService
value: AWS.SDK.S3
-
name: RemoteTarget
value: ::s3:::e2e-test-bucket-name-{{testingId}}

-
metricName: Fault
namespace: {{metricNamespace}}
dimensions:
-
name: RemoteService
value: AWS.SDK.S3
-
name: RemoteTarget
value: ::s3:::e2e-test-bucket-name-{{testingId}}
6 changes: 3 additions & 3 deletions validator/src/main/resources/expected-data-template/k8s/aws-sdk-call-trace.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "^{{serviceName}}$",
"http": {
"request": {
"url": "^{{endpoint}}/aws-sdk-call$",
"url": "^{{endpoint}}/aws-sdk-call\\?ip=(([0-9]{1,3}.){3}[0-9]{1,3})&testingId={{testingId}}$",
"method": "^GET$"
},
"response": {
Expand Down Expand Up @@ -33,7 +33,7 @@
"name": "^S3$",
"http": {
"request": {
"url": "^https://e2e-test-bucket-name.s3.{{region}}.amazonaws.com\\?location$",
"url": "^https://e2e-test-bucket-name-{{testingId}}.s3.{{region}}.amazonaws.com\\?location$",
"method": "^GET$"
}
},
Expand All @@ -44,7 +44,7 @@
"aws.local.operation": "^GET /aws-sdk-call$",
"aws.remote.service": "^AWS\\.SDK\\.S3$",
"aws.remote.operation": "GetBucketLocation",
"aws.remote.target": "::s3:::e2e-test-bucket-name"
"aws.remote.target": "^::s3:::e2e-test-bucket-name-{{testingId}}$"
},
"metadata": {
"default": {
Expand Down
2 changes: 1 addition & 1 deletion validator/src/main/resources/expected-data-template/k8s/remote-service-trace.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "^{{serviceName}}$",
"http": {
"request": {
"url": "^{{endpoint}}/remote-service\\?ip=(([0-9]{1,3}.){3}[0-9]{1,3})$",
"url": "^{{endpoint}}/remote-service\\?ip=(([0-9]{1,3}.){3}[0-9]{1,3})&testingId={{testingId}}$",
"method": "^GET$"
},
"response": {
Expand Down
2 changes: 1 addition & 1 deletion validator/src/main/resources/validations/k8s/log-validation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
validationType: "cw-log"
httpPath: "/aws-sdk-call"
httpMethod: "get"
callingType: "http"
callingType: "http-with-query"
expectedLogStructureTemplate: "K8S_AWS_SDK_CALL_LOG"
-
validationType: "cw-log"
Expand Down
2 changes: 1 addition & 1 deletion validator/src/main/resources/validations/k8s/metric-validation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
validationType: "cw-metric"
httpPath: "/aws-sdk-call"
httpMethod: "get"
callingType: "http"
callingType: "http-with-query"
expectedMetricTemplate: "K8S_AWS_SDK_CALL_METRIC"
-
validationType: "cw-metric"
Expand Down
2 changes: 1 addition & 1 deletion validator/src/main/resources/validations/k8s/trace-validation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
validationType: "trace"
httpPath: "/aws-sdk-call"
httpMethod: "get"
callingType: "http"
callingType: "http-with-query"
expectedTraceTemplate: "K8S_AWS_SDK_CALL_TRACE"
-
validationType: "trace"
Expand Down