Skip to content

Commit eff1b8f

Browse files
majanjua-amznmajanjua-amzn
committed
[Java/eks-otlp-ocb] Test validation adjustments
1 parent 4ea000a commit eff1b8f

File tree

13 files changed

+5
-221
lines changed

13 files changed

+5
-221
lines changed

‎.github/workflows/java-eks-otlp-ocb-test.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,6 @@ jobs:
265265
max_retry: 3
266266
sleep_time: 30
267267

268-
- name: Sleep
269-
run: sleep 30
270-
271268
# Validation for app signals telemetry data
272269
- name: Call endpoint and validate generated EMF logs
273270
id: log-validation

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
[{
2-
"EC2.AutoScalingGroup": "^eks-.+",
32
"EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
43
"EKS.Cluster": "^{{platformInfo}}$",
54
"Environment": "^eks:{{platformInfo}}/{{appNamespace}}$",
@@ -15,7 +14,6 @@
1514
"Host": "^ip(-[0-9]{1,3}){4}.*$"
1615
},
1716
{
18-
"EC2.AutoScalingGroup": "^eks-.+",
1917
"EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
2018
"EKS.Cluster": "^{{platformInfo}}$",
2119
"Environment": "^eks:{{platformInfo}}/{{appNamespace}}$",

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
},
2020
"metadata": {
2121
"default": {
22-
"EC2.AutoScalingGroup": "^eks-.+",
2322
"EKS.Cluster": "^{{platformInfo}}$",
2423
"K8s.Namespace": "^{{appNamespace}}",
2524
"otel.resource.K8s.Workload": "^sample-app-deployment-{{testingId}}",
@@ -37,7 +36,7 @@
3736
"name": "^S3$",
3837
"http": {
3938
"request": {
40-
"url": "^https://e2e-test-bucket-name-{{testingId}}.s3.{{region}}.amazonaws.com\\?location$",
39+
"url": "^https://e2e-test-bucket-name-{{testingId}}.s3.us-west-1.amazonaws.com\\?location$",
4140
"method": "^GET$"
4241
}
4342
},
@@ -52,7 +51,6 @@
5251
},
5352
"metadata": {
5453
"default": {
55-
"EC2.AutoScalingGroup": "^eks-.+",
5654
"EKS.Cluster": "^{{platformInfo}}$",
5755
"K8s.Namespace": "^{{appNamespace}}$",
5856
"PlatformType": "^AWS::EKS$",

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
[{
2-
"EC2.AutoScalingGroup": "^eks-.+",
32
"EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
43
"EKS.Cluster": "^{{platformInfo}}$",
54
"Environment": "^eks:{{platformInfo}}/{{appNamespace}}$",
@@ -15,7 +14,6 @@
1514
"Host": "^ip(-[0-9]{1,3}){4}.*$"
1615
},
1716
{
18-
"EC2.AutoScalingGroup": "^eks-.+",
1917
"EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
2018
"EKS.Cluster": "^{{platformInfo}}$",
2119
"Environment": "^eks:{{platformInfo}}/{{appNamespace}}$",

‎validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/client-call-trace.mustache‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
},
3232
"metadata": {
3333
"default": {
34-
"EC2.AutoScalingGroup": "^eks-.+",
3534
"EKS.Cluster": "^{{platformInfo}}$",
3635
"K8s.Namespace": "^{{appNamespace}}$",
3736
"PlatformType": "^AWS::EKS$",

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
[{
2-
"EC2.AutoScalingGroup": "^eks-.+",
32
"EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
43
"EKS.Cluster": "^{{platformInfo}}$",
54
"Environment": "^eks:{{platformInfo}}/{{appNamespace}}$",
@@ -15,7 +14,6 @@
1514
"Host": "^ip(-[0-9]{1,3}){4}.*$"
1615
},
1716
{
18-
"EC2.AutoScalingGroup": "^eks-.+",
1917
"EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
2018
"EKS.Cluster": "^{{platformInfo}}$",
2119
"Environment": "^eks:{{platformInfo}}/{{appNamespace}}$",

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
},
2020
"metadata": {
2121
"default": {
22-
"EC2.AutoScalingGroup": "^eks-.+",
2322
"EKS.Cluster": "^{{platformInfo}}$",
2423
"K8s.Namespace": "^{{appNamespace}}",
2524
"otel.resource.K8s.Workload": "^sample-app-deployment-{{testingId}}",
@@ -50,7 +49,6 @@
5049
},
5150
"metadata": {
5251
"default": {
53-
"EC2.AutoScalingGroup": "^eks-.+",
5452
"EKS.Cluster": "^{{platformInfo}}$",
5553
"K8s.Namespace": "^{{appNamespace}}$",
5654
"PlatformType": "^AWS::EKS$",

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
[{
2-
"EC2.AutoScalingGroup": "^eks-.+",
32
"EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
43
"EKS.Cluster": "^{{platformInfo}}$",
54
"Environment": "^eks:{{platformInfo}}/{{appNamespace}}$",
@@ -15,7 +14,6 @@
1514
"Host": "^ip(-[0-9]{1,3}){4}.*$"
1615
},
1716
{
18-
"EC2.AutoScalingGroup": "^eks-.+",
1917
"EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
2018
"EKS.Cluster": "^{{platformInfo}}$",
2119
"Environment": "^eks:{{platformInfo}}/{{appNamespace}}$",

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

Lines changed: 1 addition & 181 deletions
Original file line numberDiff line numberDiff line change
@@ -107,66 +107,6 @@
107107
name: RemoteService
108108
value: {{remoteServiceDeploymentName}}
109109

110-
-
111-
metricName: Latency
112-
namespace: {{metricNamespace}}
113-
dimensions:
114-
-
115-
name: Environment
116-
value: eks:{{platformInfo}}/{{appNamespace}}
117-
-
118-
name: RemoteEnvironment
119-
value: eks:{{platformInfo}}/{{appNamespace}}
120-
-
121-
name: RemoteService
122-
value: {{remoteServiceDeploymentName}}
123-
-
124-
name: Service
125-
value: {{serviceName}}
126-
127-
-
128-
metricName: Latency
129-
namespace: {{metricNamespace}}
130-
dimensions:
131-
-
132-
name: Environment
133-
value: eks:{{platformInfo}}/{{appNamespace}}
134-
-
135-
name: RemoteEnvironment
136-
value: eks:{{platformInfo}}/{{appNamespace}}
137-
-
138-
name: RemoteOperation
139-
value: GET /healthcheck
140-
-
141-
name: RemoteService
142-
value: {{remoteServiceDeploymentName}}
143-
-
144-
name: Service
145-
value: {{serviceName}}
146-
147-
-
148-
metricName: Latency
149-
namespace: {{metricNamespace}}
150-
dimensions:
151-
-
152-
name: Environment
153-
value: eks:{{platformInfo}}/{{appNamespace}}
154-
-
155-
name: RemoteEnvironment
156-
value: eks:{{platformInfo}}/{{appNamespace}}
157-
-
158-
name: Operation
159-
value: GET /remote-service
160-
-
161-
name: RemoteOperation
162-
value: GET /healthcheck
163-
-
164-
name: RemoteService
165-
value: {{remoteServiceDeploymentName}}
166-
-
167-
name: Service
168-
value: {{serviceName}}
169-
170110
-
171111
metricName: Error
172112
namespace: {{metricNamespace}}
@@ -276,66 +216,6 @@
276216
name: RemoteService
277217
value: {{remoteServiceDeploymentName}}
278218

279-
-
280-
metricName: Error
281-
namespace: {{metricNamespace}}
282-
dimensions:
283-
-
284-
name: Environment
285-
value: eks:{{platformInfo}}/{{appNamespace}}
286-
-
287-
name: RemoteEnvironment
288-
value: eks:{{platformInfo}}/{{appNamespace}}
289-
-
290-
name: RemoteService
291-
value: {{remoteServiceDeploymentName}}
292-
-
293-
name: Service
294-
value: {{serviceName}}
295-
296-
-
297-
metricName: Error
298-
namespace: {{metricNamespace}}
299-
dimensions:
300-
-
301-
name: Environment
302-
value: eks:{{platformInfo}}/{{appNamespace}}
303-
-
304-
name: RemoteEnvironment
305-
value: eks:{{platformInfo}}/{{appNamespace}}
306-
-
307-
name: RemoteOperation
308-
value: GET /healthcheck
309-
-
310-
name: RemoteService
311-
value: {{remoteServiceDeploymentName}}
312-
-
313-
name: Service
314-
value: {{serviceName}}
315-
316-
-
317-
metricName: Error
318-
namespace: {{metricNamespace}}
319-
dimensions:
320-
-
321-
name: Environment
322-
value: eks:{{platformInfo}}/{{appNamespace}}
323-
-
324-
name: RemoteEnvironment
325-
value: eks:{{platformInfo}}/{{appNamespace}}
326-
-
327-
name: Operation
328-
value: GET /remote-service
329-
-
330-
name: RemoteOperation
331-
value: GET /healthcheck
332-
-
333-
name: RemoteService
334-
value: {{remoteServiceDeploymentName}}
335-
-
336-
name: Service
337-
value: {{serviceName}}
338-
339219
-
340220
metricName: Fault
341221
namespace: {{metricNamespace}}
@@ -443,64 +323,4 @@
443323
dimensions:
444324
-
445325
name: RemoteService
446-
value: {{remoteServiceDeploymentName}}
447-
448-
-
449-
metricName: Fault
450-
namespace: {{metricNamespace}}
451-
dimensions:
452-
-
453-
name: Environment
454-
value: eks:{{platformInfo}}/{{appNamespace}}
455-
-
456-
name: RemoteEnvironment
457-
value: eks:{{platformInfo}}/{{appNamespace}}
458-
-
459-
name: RemoteService
460-
value: {{remoteServiceDeploymentName}}
461-
-
462-
name: Service
463-
value: {{serviceName}}
464-
465-
-
466-
metricName: Fault
467-
namespace: {{metricNamespace}}
468-
dimensions:
469-
-
470-
name: Environment
471-
value: eks:{{platformInfo}}/{{appNamespace}}
472-
-
473-
name: RemoteEnvironment
474-
value: eks:{{platformInfo}}/{{appNamespace}}
475-
-
476-
name: RemoteOperation
477-
value: GET /healthcheck
478-
-
479-
name: RemoteService
480-
value: {{remoteServiceDeploymentName}}
481-
-
482-
name: Service
483-
value: {{serviceName}}
484-
485-
-
486-
metricName: Fault
487-
namespace: {{metricNamespace}}
488-
dimensions:
489-
-
490-
name: Environment
491-
value: eks:{{platformInfo}}/{{appNamespace}}
492-
-
493-
name: RemoteEnvironment
494-
value: eks:{{platformInfo}}/{{appNamespace}}
495-
-
496-
name: Operation
497-
value: GET /remote-service
498-
-
499-
name: RemoteOperation
500-
value: GET /healthcheck
501-
-
502-
name: RemoteService
503-
value: {{remoteServiceDeploymentName}}
504-
-
505-
name: Service
506-
value: {{serviceName}}
326+
value: {{remoteServiceDeploymentName}}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
},
2020
"metadata": {
2121
"default": {
22-
"EC2.AutoScalingGroup": "^eks-.+",
2322
"EKS.Cluster": "^{{platformInfo}}$",
2423
"K8s.Namespace": "^{{appNamespace}}",
2524
"otel.resource.K8s.Workload": "^sample-app-deployment-{{testingId}}",
@@ -51,7 +50,6 @@
5150
},
5251
"metadata": {
5352
"default": {
54-
"EC2.AutoScalingGroup": "^eks-.+",
5553
"EKS.Cluster": "^{{platformInfo}}$",
5654
"K8s.Namespace": "^{{appNamespace}}$",
5755
"PlatformType": "^AWS::EKS$",

0 commit comments

Comments
 (0)