Skip to content

Commit 71a884f

Browse files
Jeel-mehtaJeel Mehtaliustve
authored
[Dotnet] Fix sig v4 test (#403)
*Issue description:* The ADOT Dotnet Sigv4 test was failing because the Xray backend team changed the value of the dimensions of Metric validator. *Description of changes:* The dimension values were updated to be consistent with the changes from the backend. Test run: https://github.com/aws-observability/aws-application-signals-test-framework/actions/runs/14938571788/job/41971542923 *Rollback procedure:* <Can we safely revert this commit if needed? If not, detail what must be done to safely revert and why it is needed.> *Ensure you've run the following tests on your changes and include the link below:* To do so, create a `test.yml` file with `name: Test` and workflow description to test your changes, then remove the file for your PR. Link your test run in your PR description. This process is a short term solution while we work on creating a staging environment for testing. NOTE: TESTS RUNNING ON A SINGLE EKS CLUSTER CANNOT BE RUN IN PARALLEL. See the [needs](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idneeds) keyword to run tests in succession. - Run Java EKS on `e2e-playground` in us-east-1 and eu-central-2 - Run Python EKS on `e2e-playground` in us-east-1 and eu-central-2 - Run metric limiter on EKS cluster `e2e-playground` in us-east-1 and eu-central-2 - Run EC2 tests in all regions - Run K8s on a separate K8s cluster (check IAD test account for master node endpoints; these will change as we create and destroy clusters for OS patching) By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Co-authored-by: Jeel Mehta <[email protected]> Co-authored-by: Steve Liu <[email protected]>
1 parent 5485d9e commit 71a884f

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

.github/workflows/dotnet-ec2-adot-sigv4-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ jobs:
178178
run: ./gradlew validator:run --args='-c dotnet/ec2/adot-sigv4/metric-validation.yml
179179
--testing-id ${{ env.TESTING_ID }}
180180
--endpoint http://localhost:8080
181-
--remote-service-deployment-name ${{ env.REMOTE_SERVICE_IP }}:8081
181+
--remote-service-deployment-name dotnet-sample-remote-application-${{ env.TESTING_ID }}
182182
--region ${{ env.E2E_TEST_AWS_REGION }}
183183
--metric-namespace ${{ env.METRIC_NAMESPACE }}
184184
--log-group ${{ env.LOG_GROUP_NAME }}

validator/src/main/resources/expected-data-template/dotnet/ec2/adot-sigv4/aws-sdk-call-metric.mustache

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
dimensions:
1919
-
2020
name: Operation
21-
value: UnmappedOperation
21+
value: GET aws-sdk-call
2222
-
2323
name: Service
2424
value: {{serviceName}}
@@ -94,7 +94,7 @@
9494
dimensions:
9595
-
9696
name: Operation
97-
value: UnmappedOperation
97+
value: GET aws-sdk-call
9898
-
9999
name: Service
100100
value: {{serviceName}}
@@ -170,7 +170,7 @@
170170
dimensions:
171171
-
172172
name: Operation
173-
value: UnmappedOperation
173+
value: GET aws-sdk-call
174174
-
175175
name: Service
176176
value: {{serviceName}}

validator/src/main/resources/expected-data-template/dotnet/ec2/adot-sigv4/outgoing-http-call-metric.mustache

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
dimensions:
1919
-
2020
name: Operation
21-
value: UnmappedOperation
21+
value: GET outgoing-http-call
2222
-
2323
name: Service
2424
value: {{serviceName}}
@@ -94,7 +94,7 @@
9494
dimensions:
9595
-
9696
name: Operation
97-
value: UnmappedOperation
97+
value: GET outgoing-http-call
9898
-
9999
name: Service
100100
value: {{serviceName}}
@@ -170,7 +170,7 @@
170170
dimensions:
171171
-
172172
name: Operation
173-
value: UnmappedOperation
173+
value: GET outgoing-http-call
174174
-
175175
name: Service
176176
value: {{serviceName}}

validator/src/main/resources/expected-data-template/dotnet/ec2/adot-sigv4/remote-service-metric.mustache

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
dimensions:
1919
-
2020
name: Operation
21-
value: UnmappedOperation
21+
value: GET remote-service
2222
-
2323
name: Service
2424
value: {{serviceName}}
@@ -27,7 +27,7 @@
2727
value: ec2:default
2828
-
2929
name: RemoteOperation
30-
value: GET /healthcheck
30+
value: GET healthcheck
3131
-
3232
name: RemoteService
3333
value: {{remoteServiceDeploymentName}}
@@ -94,7 +94,7 @@
9494
value: ec2:default
9595
-
9696
name: RemoteOperation
97-
value: GET /healthcheck
97+
value: GET healthcheck
9898
-
9999
name: RemoteService
100100
value: {{remoteServiceDeploymentName}}
@@ -127,7 +127,7 @@
127127
dimensions:
128128
-
129129
name: Operation
130-
value: UnmappedOperation
130+
value: GET remote-service
131131
-
132132
name: Service
133133
value: {{serviceName}}
@@ -136,7 +136,7 @@
136136
value: ec2:default
137137
-
138138
name: RemoteOperation
139-
value: GET /healthcheck
139+
value: GET healthcheck
140140
-
141141
name: RemoteService
142142
value: {{remoteServiceDeploymentName}}
@@ -203,7 +203,7 @@
203203
value: ec2:default
204204
-
205205
name: RemoteOperation
206-
value: GET /healthcheck
206+
value: GET healthcheck
207207
-
208208
name: RemoteService
209209
value: {{remoteServiceDeploymentName}}
@@ -236,7 +236,7 @@
236236
dimensions:
237237
-
238238
name: Operation
239-
value: UnmappedOperation
239+
value: GET remote-service
240240
-
241241
name: Service
242242
value: {{serviceName}}
@@ -245,7 +245,7 @@
245245
value: ec2:default
246246
-
247247
name: RemoteOperation
248-
value: GET /healthcheck
248+
value: GET healthcheck
249249
-
250250
name: RemoteService
251251
value: {{remoteServiceDeploymentName}}
@@ -312,7 +312,7 @@
312312
value: ec2:default
313313
-
314314
name: RemoteOperation
315-
value: GET /healthcheck
315+
value: GET healthcheck
316316
-
317317
name: RemoteService
318318
value: {{remoteServiceDeploymentName}}

0 commit comments

Comments
 (0)