[SLS-1713] Add tag for whether span should inherit service from lambda

datadog_lambda/constants.py

@@ -43,4 +43,6 @@ class XrayDaemon(object):
     FUNCTION_NAME_HEADER_NAME = "AWS_LAMBDA_FUNCTION_NAME"
 
 
-IS_ASYNC_TAG = "is_async"
+class InferredSpanTags(object):
+    IS_ASYNC_TAG = "inferred_span.is_async"
+    INHERIT_LAMBDA_TAG = "inferred_span.inherit_lambda"

datadog_lambda/tracing.py

@@ -13,7 +13,7 @@
     TraceHeader,
     TraceContextSource,
     XrayDaemon,
-    IS_ASYNC_TAG,
+    InferredSpanTags,
 )
 from datadog_lambda.xray import (
     send_segment,
@@ -32,10 +32,6 @@
 
 logger = logging.getLogger(__name__)
 
-
-SPAN_TYPE_TAG = "span_type"
-SPAN_TYPE_INFERRED = "inferred"
-
 dd_trace_context = {}
 dd_tracing_enabled = os.environ.get("DD_TRACE_ENABLED", "false").lower() == "true"
 
@@ -450,17 +446,17 @@ def create_inferred_span_from_api_gateway_websocket_event(event, context):
     endpoint = event["requestContext"]["routeKey"]
     tags = {
         "operation_name": "aws.apigateway.websocket",
-        "service.name": domain,
         "http.url": domain + endpoint,
         "endpoint": endpoint,
         "resource_names": domain + endpoint,
         "request_id": context.aws_request_id,
         "connection_id": event["requestContext"]["connectionId"],
-        SPAN_TYPE_TAG: SPAN_TYPE_INFERRED,
-        IS_ASYNC_TAG: is_api_gateway_invocation_async(event),
+        InferredSpanTags.INHERIT_LAMBDA_TAG: False,
+        InferredSpanTags.IS_ASYNC_TAG: is_api_gateway_invocation_async(event),
     }
     request_time_epoch = event["requestContext"]["requestTimeEpoch"]
     args = {
+        "service": domain,
         "resource": domain + endpoint,
         "span_type": "web",
     }
@@ -477,17 +473,17 @@ def create_inferred_span_from_api_gateway_event(event, context):
     path = event["path"]
     tags = {
         "operation_name": "aws.apigateway.rest",
-        "service.name": domain,
         "http.url": domain + path,
         "endpoint": path,
         "http.method": event["httpMethod"],
         "resource_names": domain + path,
         "request_id": context.aws_request_id,
-        SPAN_TYPE_TAG: SPAN_TYPE_INFERRED,
-        IS_ASYNC_TAG: is_api_gateway_invocation_async(event),
+        InferredSpanTags.INHERIT_LAMBDA_TAG: False,
+        InferredSpanTags.IS_ASYNC_TAG: is_api_gateway_invocation_async(event),
     }
     request_time_epoch = event["requestContext"]["requestTimeEpoch"]
     args = {
+        "service": domain,
         "resource": domain + path,
         "span_type": "http",
     }
@@ -504,17 +500,17 @@ def create_inferred_span_from_http_api_event(event, context):
     path = event["rawPath"]
     tags = {
         "operation_name": "aws.httpapi",
-        "service.name": domain,
         "http.url": domain + path,
         "endpoint": path,
         "http.method": event["requestContext"]["http"]["method"],
         "resource_names": domain + path,
         "request_id": context.aws_request_id,
-        SPAN_TYPE_TAG: SPAN_TYPE_INFERRED,
-        IS_ASYNC_TAG: is_api_gateway_invocation_async(event),
+        InferredSpanTags.INHERIT_LAMBDA_TAG: False,
+        InferredSpanTags.IS_ASYNC_TAG: is_api_gateway_invocation_async(event),
     }
     request_time_epoch = event["requestContext"]["timeEpoch"]
     args = {
+        "service": domain,
         "resource": domain + path,
         "span_type": "http",
     }
@@ -531,13 +527,13 @@ def create_inferred_span_from_sqs_event(event, context):
     queue_name = event_record["eventSourceARN"].split(":")[-1]
     tags = {
         "operation_name": "aws.sqs",
-        "service.name": "sqs",
         "resource_names": queue_name,
-        SPAN_TYPE_TAG: SPAN_TYPE_INFERRED,
-        IS_ASYNC_TAG: True,
+        InferredSpanTags.INHERIT_LAMBDA_TAG: False,
+        InferredSpanTags.IS_ASYNC_TAG: True,
     }
     request_time_epoch = event_record["attributes"]["SentTimestamp"]
     args = {
+        "service": "sqs",
         "resource": queue_name,
         "span_type": "web",
     }
@@ -554,16 +550,16 @@ def create_inferred_span_from_sns_event(event, context):
     topic_name = event_record["Sns"]["TopicArn"].split(":")[-1]
     tags = {
         "operation_name": "aws.sns",
-        "service.name": "sns",
         "resource_names": topic_name,
-        SPAN_TYPE_TAG: SPAN_TYPE_INFERRED,
-        IS_ASYNC_TAG: True,
+        InferredSpanTags.INHERIT_LAMBDA_TAG: False,
+        InferredSpanTags.IS_ASYNC_TAG: True,
     }
     sns_dt_format = "%Y-%m-%dT%H:%M:%S.%fZ"
     timestamp = event_record["Sns"]["Timestamp"]
     dt = datetime.strptime(timestamp, sns_dt_format)
 
     args = {
+        "service": "sns",
         "resource": topic_name,
         "span_type": "web",
     }
@@ -580,14 +576,14 @@ def create_inferred_span_from_kinesis_event(event, context):
     stream_name = event_record["eventSourceARN"].split(":")[-1]
     tags = {
         "operation_name": "aws.kinesis",
-        "service.name": "kinesis",
         "resource_names": stream_name,
-        SPAN_TYPE_TAG: SPAN_TYPE_INFERRED,
-        IS_ASYNC_TAG: True,
+        InferredSpanTags.INHERIT_LAMBDA_TAG: False,
+        InferredSpanTags.IS_ASYNC_TAG: True,
     }
     request_time_epoch = event_record["kinesis"]["approximateArrivalTimestamp"]
 
     args = {
+        "service": "kinesis",
         "resource": stream_name,
         "span_type": "web",
     }
@@ -604,14 +600,14 @@ def create_inferred_span_from_dynamodb_event(event, context):
     table_name = event_record["eventSourceARN"].split("/")[1]
     tags = {
         "operation_name": "aws.dynamodb",
-        "service.name": "dynamodb",
         "resource_names": table_name,
-        SPAN_TYPE_TAG: SPAN_TYPE_INFERRED,
-        IS_ASYNC_TAG: True,
+        InferredSpanTags.INHERIT_LAMBDA_TAG: False,
+        InferredSpanTags.IS_ASYNC_TAG: True,
     }
     request_time_epoch = event_record["dynamodb"]["ApproximateCreationDateTime"]
 
     args = {
+        "service": "dynamodb",
         "resource": table_name,
         "span_type": "web",
     }
@@ -628,16 +624,16 @@ def create_inferred_span_from_s3_event(event, context):
     bucket_name = event_record["s3"]["bucket"]["name"]
     tags = {
         "operation_name": "aws.s3",
-        "service.name": "s3",
         "resource_names": bucket_name,
-        SPAN_TYPE_TAG: SPAN_TYPE_INFERRED,
-        IS_ASYNC_TAG: True,
+        InferredSpanTags.INHERIT_LAMBDA_TAG: False,
+        InferredSpanTags.IS_ASYNC_TAG: True,
     }
     dt_format = "%Y-%m-%dT%H:%M:%S.%fZ"
     timestamp = event_record["eventTime"]
     dt = datetime.strptime(timestamp, dt_format)
 
     args = {
+        "service": "s3",
         "resource": bucket_name,
         "span_type": "web",
     }
@@ -653,16 +649,16 @@ def create_inferred_span_from_eventbridge_event(event, context):
     source = event["source"]
     tags = {
         "operation_name": "aws.eventbridge",
-        "service.name": "eventbridge",
         "resource_names": source,
-        SPAN_TYPE_TAG: SPAN_TYPE_INFERRED,
-        IS_ASYNC_TAG: True,
+        InferredSpanTags.INHERIT_LAMBDA_TAG: False,
+        InferredSpanTags.IS_ASYNC_TAG: True,
     }
     dt_format = "%Y-%m-%dT%H:%M:%SZ"
     timestamp = event["time"]
     dt = datetime.strptime(timestamp, dt_format)
 
     args = {
+        "service": "eventbridge",
         "resource": source,
         "span_type": "web",
     }

datadog_lambda/wrapper.py

@@ -13,7 +13,7 @@
 from datadog_lambda.constants import (
     XraySubsegment,
     TraceContextSource,
-    IS_ASYNC_TAG,
+    InferredSpanTags,
 )
 from datadog_lambda.metric import (
     flush_stats,
@@ -210,7 +210,10 @@ def _after(self, event, context):
                 if status_code:
                     self.inferred_span.set_tag("http.status_code", status_code)
 
-                if self.inferred_span.get_tag(IS_ASYNC_TAG) == "True" and self.span:
+                if (
+                    self.inferred_span.get_tag(InferredSpanTags.IS_ASYNC_TAG) == "True"
+                    and self.span
+                ):
                     self.inferred_span.finish(finish_time=self.span.start)
                 else:
                     self.inferred_span.finish()