Simplify Trace validation in Lambda case (#305)

*Description of changes:* Simplify Trace validation in Lambda case By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
aws-observability · Oct 30, 2024 · 1dda66b · 1dda66b
1 parent eaa6a45
commit 1dda66b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 48 deletions.
diff --git a/validator/src/main/resources/expected-data-template/node/lambda/lambda-invoke-trace.mustache b/validator/src/main/resources/expected-data-template/node/lambda/lambda-invoke-trace.mustache
@@ -1,32 +1,11 @@
 [{
-  "name": "^{{serviceName}}$",
-  "annotations": {
-    "aws.local.service": "^{{serviceName}}$",
-    "aws.local.operation": "^{{serviceName}}/FunctionHandler$"
-  },
-  "metadata": {
-    "default": {
-      "faas.id": "arn:aws:lambda:{{region}}:{{accountId}}:function:{{serviceName}}$"
-    }
+  "name": "^{{serviceName}}/default$",
   },
   "subsegments": [
     {
-      "name": "^S3$",
+      "name": "^Lambda$",
       "aws": {
-        "span.kind": "^CLIENT$"
-      },
-      "annotations": {
-        "aws.local.service": "^{{serviceName}}$",
-        "aws.local.operation": "^S3.ListBuckets$",
-        "aws.remote.service": "^AWS::S3$",
-        "aws.remote.operation": "^ListBuckets$"
-      },
-      "metadata": {
-        "default": {
-          "rpc.service": "^S3$",
-          "rpc.method": "^ListBuckets$",
-          "rpc.system": "^aws-api$"
-        }
+        "function_name": "^{{serviceName}}$",
       },
       "namespace": "^aws$"
     }

diff --git a/...ator/src/main/resources/expected-data-template/python/lambda/lambda-invoke-trace.mustache b/...ator/src/main/resources/expected-data-template/python/lambda/lambda-invoke-trace.mustache
@@ -1,32 +1,11 @@
 [{
-  "name": "^{{serviceName}}$",
-  "annotations": {
-    "aws.local.service": "^{{serviceName}}$",
-    "aws.local.operation": "^{{serviceName}}/FunctionHandler$"
-  },
-  "metadata": {
-    "default": {
-      "faas.id": "arn:aws:lambda:{{region}}:{{accountId}}:function:{{serviceName}}$"
-    }
+  "name": "^{{serviceName}}/default$",
   },
   "subsegments": [
     {
-      "name": "^S3$",
+      "name": "^Lambda$",
       "aws": {
-        "span.kind": "^CLIENT$"
-      },
-      "annotations": {
-        "aws.local.service": "^{{serviceName}}$",
-        "aws.local.operation": "^S3.ListBuckets$",
-        "aws.remote.service": "^AWS::S3$",
-        "aws.remote.operation": "^ListBuckets$"
-      },
-      "metadata": {
-        "default": {
-          "rpc.service": "^S3$",
-          "rpc.method": "^ListBuckets$",
-          "rpc.system": "^aws-api$"
-        }
+        "function_name": "^{{serviceName}}$",
       },
       "namespace": "^aws$"
     }