Skip to content

Commit 7573ce0

Browse files
ezhang6811ezhang6811
authored
Update Java EKS OTLP OCB canary test (#397)
*Issue description:* Canary test failing due to backend team updating values of Operation and RemoteService metrics. *Description of changes:* Updated dimension values to correctly validate those generated by the backend. Passing test run: https://github.com/aws-observability/aws-application-signals-test-framework/actions/runs/14804860068 *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.
1 parent 570ee54 commit 7573ce0

File tree

6 files changed

+28
-28
lines changed

6 files changed

+28
-28
lines changed

‎validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-log.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"Environment": "^generic:default$",
1414
"PlatformType": "^Generic$",
1515
"Service": "^{{serviceName}}$",
16-
"Operation": "UnmappedOperation",
16+
"Operation": "GET /aws-sdk-call",
1717
"RemoteService": "AWS::S3",
1818
"RemoteOperation": "GetBucketLocation",
1919
"RemoteResourceIdentifier": "^e2e-test-bucket-name-{{testingId}}$",

‎validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-metric.mustache‎

Lines changed: 6 additions & 6 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}}
@@ -100,7 +100,7 @@
100100
dimensions:
101101
-
102102
name: Operation
103-
value: UnmappedOperation
103+
value: GET /aws-sdk-call
104104
-
105105
name: Service
106106
value: {{serviceName}}
@@ -163,7 +163,7 @@
163163
dimensions:
164164
-
165165
name: Operation
166-
value: UnmappedOperation
166+
value: GET /aws-sdk-call
167167
-
168168
name: Service
169169
value: {{serviceName}}
@@ -245,7 +245,7 @@
245245
dimensions:
246246
-
247247
name: Operation
248-
value: UnmappedOperation
248+
value: GET /aws-sdk-call
249249
-
250250
name: Service
251251
value: {{serviceName}}
@@ -308,7 +308,7 @@
308308
dimensions:
309309
-
310310
name: Operation
311-
value: UnmappedOperation
311+
value: GET /aws-sdk-call
312312
-
313313
name: Service
314314
value: {{serviceName}}
@@ -390,7 +390,7 @@
390390
dimensions:
391391
-
392392
name: Operation
393-
value: UnmappedOperation
393+
value: GET /aws-sdk-call
394394
-
395395
name: Service
396396
value: {{serviceName}}

‎validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-log.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"Environment": "^generic:default$",
1414
"PlatformType": "^Generic$",
1515
"Service": "^{{serviceName}}$",
16-
"Operation": "UnmappedOperation",
16+
"Operation": "GET /outgoing-http-call",
1717
"RemoteService": "www.amazon.com",
1818
"RemoteOperation": "GET /",
1919
"Host": "^ip(-[0-9]{1,3}){4}.*$"

‎validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/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/java/eks-otlp-ocb/remote-service-log.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"Environment": "^generic:default$",
1414
"PlatformType": "^Generic$",
1515
"Service": "^{{serviceName}}$",
16-
"Operation": "UnmappedOperation",
17-
"RemoteService": "{{remoteServiceIp}}:8080",
16+
"Operation": "GET /remote-service",
17+
"RemoteService": "{{remoteServiceDeploymentName}}",
1818
"RemoteOperation": "GET /healthcheck",
1919
"Host": "^ip(-[0-9]{1,3}){4}.*$"
2020
}]

‎validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-metric.mustache‎

Lines changed: 15 additions & 15 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}}
@@ -30,7 +30,7 @@
3030
value: GET /healthcheck
3131
-
3232
name: RemoteService
33-
value: {{remoteServiceIp}}:8080
33+
value: {{remoteServiceDeploymentName}}
3434

3535
-
3636
metricName: Latency
@@ -80,7 +80,7 @@
8080
value: generic:default
8181
-
8282
name: RemoteService
83-
value: {{remoteServiceIp}}:8080
83+
value: {{remoteServiceDeploymentName}}
8484

8585
-
8686
metricName: Latency
@@ -97,15 +97,15 @@
9797
value: GET /healthcheck
9898
-
9999
name: RemoteService
100-
value: {{remoteServiceIp}}:8080
100+
value: {{remoteServiceDeploymentName}}
101101

102102
-
103103
metricName: Latency
104104
namespace: {{metricNamespace}}
105105
dimensions:
106106
-
107107
name: RemoteService
108-
value: {{remoteServiceIp}}:8080
108+
value: {{remoteServiceDeploymentName}}
109109

110110
-
111111
metricName: Error
@@ -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}}
@@ -139,7 +139,7 @@
139139
value: GET /healthcheck
140140
-
141141
name: RemoteService
142-
value: {{remoteServiceIp}}:8080
142+
value: {{remoteServiceDeploymentName}}
143143

144144
-
145145
metricName: Error
@@ -189,7 +189,7 @@
189189
value: generic:default
190190
-
191191
name: RemoteService
192-
value: {{remoteServiceIp}}:8080
192+
value: {{remoteServiceDeploymentName}}
193193

194194
-
195195
metricName: Error
@@ -206,15 +206,15 @@
206206
value: GET /healthcheck
207207
-
208208
name: RemoteService
209-
value: {{remoteServiceIp}}:8080
209+
value: {{remoteServiceDeploymentName}}
210210

211211
-
212212
metricName: Error
213213
namespace: {{metricNamespace}}
214214
dimensions:
215215
-
216216
name: RemoteService
217-
value: {{remoteServiceIp}}:8080
217+
value: {{remoteServiceDeploymentName}}
218218

219219
-
220220
metricName: Fault
@@ -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}}
@@ -248,7 +248,7 @@
248248
value: GET /healthcheck
249249
-
250250
name: RemoteService
251-
value: {{remoteServiceIp}}:8080
251+
value: {{remoteServiceDeploymentName}}
252252

253253
-
254254
metricName: Fault
@@ -298,7 +298,7 @@
298298
value: generic:default
299299
-
300300
name: RemoteService
301-
value: {{remoteServiceIp}}:8080
301+
value: {{remoteServiceDeploymentName}}
302302

303303
-
304304
metricName: Fault
@@ -315,12 +315,12 @@
315315
value: GET /healthcheck
316316
-
317317
name: RemoteService
318-
value: {{remoteServiceIp}}:8080
318+
value: {{remoteServiceDeploymentName}}
319319

320320
-
321321
metricName: Fault
322322
namespace: {{metricNamespace}}
323323
dimensions:
324324
-
325325
name: RemoteService
326-
value: {{remoteServiceIp}}:8080
326+
value: {{remoteServiceDeploymentName}}

0 commit comments

Comments
 (0)