Change how the forwarder detects inferred spans (#522)

* Change it to tag_source:self

* Fix test json input

* Update test snapshots

Author: agocs

aws/logs_monitoring/trace_forwarder/internal/apm/model.go

@@ -186,7 +186,7 @@ func AddTagsToTracePayloads(tracePayloads []*pb.TracePayload, tags string) {
 			for _, span := range trace.Spans {
 				// do not add tags from Lambda function if it's an inferred span and
 				// it does not belong to the AWS Lambda service
-				if value, ok := span.Meta["inferred_span.inherit_lambda"]; ok && value == "False" {
+				if value, ok := span.Meta["_inferred_span.tag_source"]; ok && value == "self" {
 					continue
 				}
 				if serviceLookup[span.Service] != "" {

aws/logs_monitoring/trace_forwarder/internal/apm/testdata/inferred_span.json

@@ -23,8 +23,8 @@
             "http.method": "GET",
             "resource_names": "ialbefmodl.execute-api.sa-east-1.amazonaws.com/",
             "request_id": "9f09f496-83c7-441b-bc59-9741107b0683",
-            "inferred_span.inherit_lambda": "False",
-            "inferred_span.is_async": "False",
+            "_inferred_span.tag_source": "self",
+            "_inferred_span.synchronisity": "sync",
             "http.status_code": "200"
           },
           "metrics": {

aws/logs_monitoring/trace_forwarder/internal/apm/testdata/inferred_span.json~snapshot

@@ -19,12 +19,12 @@
       Meta: (map[string]string) (len=12) {
        (string) (len=17) "_dd.compute_stats": (string) (len=1) "1",
        (string) (len=10) "_dd.origin": (string) (len=6) "lambda",
+       (string) (len=28) "_inferred_span.synchronisity": (string) (len=4) "sync",
+       (string) (len=25) "_inferred_span.tag_source": (string) (len=4) "self",
        (string) (len=8) "endpoint": (string) (len=1) "/",
        (string) (len=11) "http.method": (string) (len=3) "GET",
        (string) (len=16) "http.status_code": (string) (len=3) "200",
        (string) (len=8) "http.url": (string) (len=2) "?/",
-       (string) (len=28) "inferred_span.inherit_lambda": (string) (len=5) "False",
-       (string) (len=22) "inferred_span.is_async": (string) (len=5) "False",
        (string) (len=14) "operation_name": (string) (len=19) "aws.apigateway.rest",
        (string) (len=10) "request_id": (string) (len=36) "9f09f496-83c7-441b-bc59-9741107b0683",
        (string) (len=14) "resource_names": (string) (len=47) "ialbefmodl.execute-api.sa-east-1.amazonaws.com/",
@@ -310,12 +310,12 @@
     Meta: (map[string]string) (len=12) {
      (string) (len=17) "_dd.compute_stats": (string) (len=1) "1",
      (string) (len=10) "_dd.origin": (string) (len=6) "lambda",
+     (string) (len=28) "_inferred_span.synchronisity": (string) (len=4) "sync",
+     (string) (len=25) "_inferred_span.tag_source": (string) (len=4) "self",
      (string) (len=8) "endpoint": (string) (len=1) "/",
      (string) (len=11) "http.method": (string) (len=3) "GET",
      (string) (len=16) "http.status_code": (string) (len=3) "200",
      (string) (len=8) "http.url": (string) (len=2) "?/",
-     (string) (len=28) "inferred_span.inherit_lambda": (string) (len=5) "False",
-     (string) (len=22) "inferred_span.is_async": (string) (len=5) "False",
      (string) (len=14) "operation_name": (string) (len=19) "aws.apigateway.rest",
      (string) (len=10) "request_id": (string) (len=36) "9f09f496-83c7-441b-bc59-9741107b0683",
      (string) (len=14) "resource_names": (string) (len=47) "ialbefmodl.execute-api.sa-east-1.amazonaws.com/",

aws/logs_monitoring/trace_forwarder/internal/apm/testdata/inferred_span_service_tag.json

@@ -23,8 +23,8 @@
             "http.method": "GET",
             "resource_names": "ialbefmodl.execute-api.sa-east-1.amazonaws.com/",
             "request_id": "9f09f496-83c7-441b-bc59-9741107b0683",
-            "inferred_span.inherit_lambda": "False",
-            "inferred_span.is_async": "False",
+            "_inferred_span.tag_source": "self",
+            "_inferred_span.syncronicity": "sync",
             "http.status_code": "200"
           },
           "metrics": {

aws/logs_monitoring/trace_forwarder/internal/apm/testdata/inferred_span_service_tag.json~snapshot

@@ -19,12 +19,12 @@
       Meta: (map[string]string) (len=12) {
        (string) (len=17) "_dd.compute_stats": (string) (len=1) "1",
        (string) (len=10) "_dd.origin": (string) (len=6) "lambda",
+       (string) (len=27) "_inferred_span.syncronicity": (string) (len=4) "sync",
+       (string) (len=25) "_inferred_span.tag_source": (string) (len=4) "self",
        (string) (len=8) "endpoint": (string) (len=1) "/",
        (string) (len=11) "http.method": (string) (len=3) "GET",
        (string) (len=16) "http.status_code": (string) (len=3) "200",
        (string) (len=8) "http.url": (string) (len=2) "?/",
-       (string) (len=28) "inferred_span.inherit_lambda": (string) (len=5) "False",
-       (string) (len=22) "inferred_span.is_async": (string) (len=5) "False",
        (string) (len=14) "operation_name": (string) (len=19) "aws.apigateway.rest",
        (string) (len=10) "request_id": (string) (len=36) "9f09f496-83c7-441b-bc59-9741107b0683",
        (string) (len=14) "resource_names": (string) (len=47) "ialbefmodl.execute-api.sa-east-1.amazonaws.com/",
@@ -318,12 +318,12 @@
     Meta: (map[string]string) (len=12) {
      (string) (len=17) "_dd.compute_stats": (string) (len=1) "1",
      (string) (len=10) "_dd.origin": (string) (len=6) "lambda",
+     (string) (len=27) "_inferred_span.syncronicity": (string) (len=4) "sync",
+     (string) (len=25) "_inferred_span.tag_source": (string) (len=4) "self",
      (string) (len=8) "endpoint": (string) (len=1) "/",
      (string) (len=11) "http.method": (string) (len=3) "GET",
      (string) (len=16) "http.status_code": (string) (len=3) "200",
      (string) (len=8) "http.url": (string) (len=2) "?/",
-     (string) (len=28) "inferred_span.inherit_lambda": (string) (len=5) "False",
-     (string) (len=22) "inferred_span.is_async": (string) (len=5) "False",
      (string) (len=14) "operation_name": (string) (len=19) "aws.apigateway.rest",
      (string) (len=10) "request_id": (string) (len=36) "9f09f496-83c7-441b-bc59-9741107b0683",
      (string) (len=14) "resource_names": (string) (len=47) "ialbefmodl.execute-api.sa-east-1.amazonaws.com/",