Skip to content

Commit 3646850

Browse files
authored
[OTLP] Remove K8s validations for EMF Logs for OCB tests (#347)
*Issue description:* Fixes issue in: https://github.com/aws-observability/aws-application-signals-test-framework/actions/runs/12640530531/job/35221123310 OTLP endpoint removed some fields in the generated EMF logs such as `K8s.Namespace, K8s.Node, and K8s.WorkLoad`, breaking the tests. *Description of changes:* Removed EMF log validations for the `K8s.*` fields. *Testing:* Tested in: https://github.com/aws-observability/aws-application-signals-test-framework/actions/runs/12640719415/job/35221670504 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent c270c00 commit 3646850

File tree

4 files changed

+0
-14
lines changed

4 files changed

+0
-14
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
"EC2.AutoScalingGroup": "^eks-.+",
33
"EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
44
"Environment": "^generic:default$",
5-
"K8s.Namespace": "^{{appNamespace}}$",
6-
"K8s.Node": "^ip(-[0-9]{1,3}){4}.*$",
75
"PlatformType": "^Generic$",
86
"Service": "^{{serviceName}}$",
97
"Operation": "GET /aws-sdk-call",
@@ -13,8 +11,6 @@
1311
"EC2.AutoScalingGroup": "^eks-.+",
1412
"EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
1513
"Environment": "^generic:default$",
16-
"K8s.Namespace": "^{{appNamespace}}$",
17-
"K8s.Node": "^ip(-[0-9]{1,3}){4}.*$",
1814
"PlatformType": "^Generic$",
1915
"Service": "^{{serviceName}}$",
2016
"Operation": "UnmappedOperation",

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
@@ -2,8 +2,6 @@
22
"EC2.AutoScalingGroup": "^eks-.+",
33
"EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
44
"Environment": "^generic:default$",
5-
"K8s.Namespace": "^{{appNamespace}}$",
6-
"K8s.Node": "^ip(-[0-9]{1,3}){4}.*$",
75
"PlatformType": "^Generic$",
86
"Service": "^{{serviceName}}$",
97
"Operation": "InternalOperation",

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
"EC2.AutoScalingGroup": "^eks-.+",
33
"EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
44
"Environment": "^generic:default$",
5-
"K8s.Namespace": "^{{appNamespace}}$",
6-
"K8s.Node": "^ip(-[0-9]{1,3}){4}.*$",
75
"PlatformType": "^Generic$",
86
"Service": "^{{serviceName}}$",
97
"Operation": "GET /outgoing-http-call",
@@ -13,8 +11,6 @@
1311
"EC2.AutoScalingGroup": "^eks-.+",
1412
"EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
1513
"Environment": "^generic:default$",
16-
"K8s.Namespace": "^{{appNamespace}}$",
17-
"K8s.Node": "^ip(-[0-9]{1,3}){4}.*$",
1814
"PlatformType": "^Generic$",
1915
"Service": "^{{serviceName}}$",
2016
"Operation": "UnmappedOperation",

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
"EC2.AutoScalingGroup": "^eks-.+",
33
"EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
44
"Environment": "^generic:default$",
5-
"K8s.Namespace": "^{{appNamespace}}$",
6-
"K8s.Node": "^ip(-[0-9]{1,3}){4}.*$",
75
"PlatformType": "^Generic$",
86
"Service": "^{{serviceName}}$",
97
"Operation": "GET /remote-service",
@@ -13,8 +11,6 @@
1311
"EC2.AutoScalingGroup": "^eks-.+",
1412
"EC2.InstanceId": "^i-[A-Za-z0-9]{17}$",
1513
"Environment": "^generic:default$",
16-
"K8s.Namespace": "^{{appNamespace}}$",
17-
"K8s.Node": "^ip(-[0-9]{1,3}){4}.*$",
1814
"PlatformType": "^Generic$",
1915
"Service": "^{{serviceName}}$",
2016
"Operation": "UnmappedOperation",

0 commit comments

Comments
 (0)