trace touch-ups

aws-observability · Nov 22, 2024 · 3e8efaa · 3e8efaa
1 parent c709743
commit 3e8efaa
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 28 deletions.
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
@@ -2,16 +2,12 @@
   "name": "^{{serviceName}}$",
   "http": {
     "request": {
-      "url": "^{{endpoint}}/aws-sdk-call\\?ip=(([0-9]{1,3}.){3}[0-9]{1,3})&testingId={{testingId}}$",
       "method": "^GET$"
     },
     "response": {
       "status": "^200$"
     }
   },
-  "aws": {
-    "account_id": "^{{accountId}}$"
-  },
   "annotations": {
     "aws.local.service": "^{{serviceName}}$",
     "aws.local.operation": "^GET /aws-sdk-call$",
@@ -36,7 +32,7 @@
           },
           "annotations": {
             "aws.local.service": "^{{serviceName}}$",
-            "aws.local.operation": "^GET /aws-sdk-call$",
+            "aws.local.operation": "^UnmappedOperation$",
             "aws.remote.service": "^AWS::S3$",
             "aws.remote.operation": "^GetBucketLocation$",
             "aws.remote.resource.type": "^AWS::S3::Bucket$",
@@ -57,7 +53,10 @@
 },
 {
   "name": "^S3$",
-  "aws": {
-    "operation": "^GetBucketLocation$"
+  "annotations": {
+    "aws.local.service": "^AWS::S3$",
+    "aws.local.operation": "^GetBucketLocation$",
+    "aws.local.resource.identifier": "^e2e-test-bucket-name-{{testingId}}$",
+    "aws.local.resource.type": "^AWS::S3::Bucket$",
   }
 }]
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
@@ -31,8 +31,7 @@
           "EC2.AutoScalingGroup": "^eks-.+",
           "EKS.Cluster": "^{{platformInfo}}$",
           "K8s.Namespace": "^{{appNamespace}}$",
-          "PlatformType": "^Generic$",
-          "aws.span.kind": "^LOCAL_ROOT$"
+          "PlatformType": "^Generic$"
       },
       "namespace": "^remote$"
     }
@@ -44,9 +43,6 @@
     "request": {
       "url": "^http://local-root-client-call$",
       "method": "^GET$"
-    },
-    "response": {
-        "content_length": 0
     }
   },
   "annotations": {

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
@@ -2,16 +2,12 @@
   "name": "^{{serviceName}}$",
   "http": {
     "request": {
-      "url": "^{{endpoint}}/outgoing-http-call$",
       "method": "^GET$"
     },
     "response": {
       "status": "^200$"
     }
   },
-  "aws": {
-    "account_id": "^{{accountId}}$"
-  },
   "annotations": {
     "aws.local.service": "^{{serviceName}}$",
     "aws.local.operation": "^GET /outgoing-http-call$",
@@ -36,7 +32,7 @@
           },
           "annotations": {
             "aws.local.service": "^{{serviceName}}$",
-            "aws.local.operation": "^GET /outgoing-http-call$",
+            "aws.local.operation": "^UnmappedOperation$",
             "aws.remote.service": "^www.amazon.com$",
             "aws.remote.operation": "^GET /$",
             "aws.local.environment": "^generic:default$"

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
@@ -2,16 +2,12 @@
   "name": "^{{serviceName}}$",
   "http": {
     "request": {
-      "url": "^{{endpoint}}/remote-service\\?ip=(([0-9]{1,3}.){3}[0-9]{1,3})&testingId={{testingId}}$",
       "method": "^GET$"
     },
     "response": {
       "status": "^200$"
     }
   },
-  "aws": {
-    "account_id": "^{{accountId}}$"
-  },
   "annotations": {
     "aws.local.service": "^{{serviceName}}$",
     "aws.local.operation": "^GET /remote-service$",
@@ -27,20 +23,19 @@
     {
       "subsegments": [
         {
-          "name": "^{{remoteServiceDeploymentName}}$",
+          "name": "^{{remoteServiceIp}}:8080$",
           "http": {
             "request": {
-              "url": "^http://(([0-9]{1,3}.){3}[0-9]{1,3}):8080/healthcheck$",
+              "url": "^http://{{remoteServiceIp}}:8080/healthcheck$",
               "method": "^GET$"
             }
           },
           "annotations": {
             "aws.local.service": "^{{serviceName}}$",
-            "aws.local.operation": "^GET /remote-service$",
+            "aws.local.operation": "^UnmappedOperation$",
             "aws.remote.service": "^{{remoteServiceIp}}:8080$",
             "aws.remote.operation": "^GET /healthcheck$",
-            "aws.local.environment": "^generic:default$",
-            "aws.remote.environment": "^generic:default$"
+            "aws.local.environment": "^generic:default$"
           },
           "metadata": {
               "EC2.AutoScalingGroup": "^eks-.+",
@@ -58,7 +53,6 @@
   "name": "^{{remoteServiceDeploymentName}}$",
   "http": {
     "request": {
-      "url": "^http://(([0-9]{1,3}.){3}[0-9]{1,3}):8080/healthcheck$",
       "method": "^GET$"
     }
   },
@@ -79,7 +73,6 @@
     {
       "name": "^RemoteServiceController.healthcheck$",
       "annotations": {
-        "aws.local.operation": "^GET /healthcheck$",
         "aws.local.environment": "^generic:default$"
       }
     }