update metadata in entity

aws-observability · Nov 22, 2024 · efd82fd · efd82fd
1 parent 2fd8364
commit efd82fd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 19 deletions.
diff --git a/validator/src/main/java/com/amazon/aoc/models/xray/Entity.java b/validator/src/main/java/com/amazon/aoc/models/xray/Entity.java
@@ -57,6 +57,6 @@ public class Entity {
   private Map<String, Object> sql;
   private Map<String, Object> service;
 
-  private Map<String, Map<String, Object>> metadata;
+  private Map<String, Object> metadata;
   private Map<String, Object> annotations;
 }
diff --git a/...r/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-trace.mustache b/...r/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-trace.mustache
@@ -18,12 +18,10 @@
     "aws.local.environment": "^generic:default$"
   },
   "metadata": {
-    "default": {
       "EC2.AutoScalingGroup": "^eks-.+",
       "EKS.Cluster": "^{{platformInfo}}$",
       "K8s.Namespace": "^{{appNamespace}}",
       "PlatformType": "^Generic$"
-    }
   },
   "subsegments": [
     {
@@ -46,12 +44,10 @@
             "aws.local.environment": "^generic:default$"
           },
           "metadata": {
-            "default": {
               "EC2.AutoScalingGroup": "^eks-.+",
               "EKS.Cluster": "^{{platformInfo}}$",
               "K8s.Namespace": "^{{appNamespace}}$",
               "PlatformType": "^Generic$",
-            }
           },
           "namespace": "^aws$"
         }

diff --git a/...or/src/main/resources/expected-data-template/java/eks-otlp-ocb/client-call-trace.mustache b/...or/src/main/resources/expected-data-template/java/eks-otlp-ocb/client-call-trace.mustache
@@ -6,12 +6,10 @@
     "aws.local.environment": "^generic:default$"
   },
   "metadata": {
-    "default": {
       "EC2.AutoScalingGroup": "^eks-.+",
       "EKS.Cluster": "^{{platformInfo}}$",
       "K8s.Namespace": "^{{appNamespace}}",
       "PlatformType": "^Generic$"
-    }
   },
   "subsegments": [
     {
@@ -30,13 +28,11 @@
         "aws.local.environment": "^generic:default$"
       },
       "metadata": {
-        "default": {
           "EC2.AutoScalingGroup": "^eks-.+",
           "EKS.Cluster": "^{{platformInfo}}$",
           "K8s.Namespace": "^{{appNamespace}}$",
           "PlatformType": "^Generic$",
           "aws.span.kind": "^LOCAL_ROOT$"
-        }
       },
       "namespace": "^remote$"
     }

diff --git a/...main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-trace.mustache b/...main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-trace.mustache
@@ -18,12 +18,10 @@
     "aws.local.environment": "^generic:default$"
   },
   "metadata": {
-    "default": {
       "EC2.AutoScalingGroup": "^eks-.+",
       "EKS.Cluster": "^{{platformInfo}}$",
       "K8s.Namespace": "^{{appNamespace}}",
       "PlatformType": "^Generic$"
-    }
   },
   "subsegments": [
     {
@@ -44,12 +42,10 @@
             "aws.local.environment": "^generic:default$"
           },
           "metadata": {
-            "default": {
               "EC2.AutoScalingGroup": "^eks-.+",
               "EKS.Cluster": "^{{platformInfo}}$",
               "K8s.Namespace": "^{{appNamespace}}$",
               "PlatformType": "^Generic$",
-            }
           },
           "namespace": "^remote$"
         }

diff --git a/...src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-trace.mustache b/...src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-trace.mustache
@@ -18,12 +18,10 @@
     "aws.local.environment": "^generic:default$"
   },
   "metadata": {
-    "default": {
       "EC2.AutoScalingGroup": "^eks-.+",
       "EKS.Cluster": "^{{platformInfo}}$",
       "K8s.Namespace": "^{{appNamespace}}",
       "PlatformType": "^Generic$"
-    }
   },
   "subsegments": [
     {
@@ -45,12 +43,10 @@
             "aws.remote.environment": "^generic:default$"
           },
           "metadata": {
-            "default": {
               "EC2.AutoScalingGroup": "^eks-.+",
               "EKS.Cluster": "^{{platformInfo}}$",
               "K8s.Namespace": "^{{appNamespace}}$",
               "PlatformType": "^Generic$",
-            }
            },
           "namespace": "^remote$"
         }
@@ -72,8 +68,12 @@
     "aws.local.environment": "^generic:default$"
   },
   "metadata": {
-    "default": {
-    }
+      "EC2.AutoScalingGroup": "^eks-.+",
+      "EKS.Cluster": "^{{platformInfo}}$",
+      "K8s.Namespace": "^{{appNamespace}}",
+      "PlatformType": "^Generic$"
+      "K8s.Workload": "^{{remoteServiceDeploymentName}}$",
+      "K8s.Pod": "^{{remoteServiceDeploymentName}}(-[A-Za-z0-9]*)*$"
   },
   "subsegments": [
     {