set tags and mark span.error=1

Author: kimi-p

datadog_lambda/constants.py

@@ -42,3 +42,13 @@ class XrayDaemon(object):
     XRAY_TRACE_ID_HEADER_NAME = "_X_AMZN_TRACE_ID"
     XRAY_DAEMON_ADDRESS = "AWS_XRAY_DAEMON_ADDRESS"
     FUNCTION_NAME_HEADER_NAME = "AWS_LAMBDA_FUNCTION_NAME"
+
+
+SERVER_ERRORS_STATUS_CODES = {
+    "500": "500 Internal Server Error",
+    "501": "501 Not Implemented",
+    "502": "502 Bad Gateway",
+    "503": "503 Service Unavailable",
+    "504": "504 Gateway Timeout",
+    "505": "505 HTTP Version Not Supported",
+}

datadog_lambda/wrapper.py

@@ -8,11 +8,14 @@
 import traceback
 from importlib import import_module
 
+from ddtrace.constants import ERROR_MSG, ERROR_STACK, ERROR_TYPE
+
 from datadog_lambda.extension import should_use_extension, flush_extension
 from datadog_lambda.cold_start import set_cold_start, is_cold_start
 from datadog_lambda.constants import (
-    XraySubsegment,
+    SERVER_ERRORS_STATUS_CODES,
     TraceContextSource,
+    XraySubsegment,
 )
 from datadog_lambda.metric import (
     flush_stats,
@@ -194,6 +197,12 @@ def _after(self, event, context):
                     submit_errors_metric(context)
                     if self.span:
                         self.span.set_traceback()
+                        self.span.error = 1
+                        self.span.set_tags({
+                            ERROR_TYPE: "5xx Server Errors",
+                            ERROR_MSG: SERVER_ERRORS_STATUS_CODES.get(status_code,
+                                                                      "5xx Server Errors"),
+                        })
             # Create a new dummy Datadog subsegment for function trigger tags so we
             # can attach them to X-Ray spans when hybrid tracing is used
             if self.trigger_tags:

tests/test_wrapper.py

@@ -275,6 +275,64 @@ def lambda_handler(event, context):
             ]
         )
 
+    @patch('datadog_lambda.wrapper.extract_trigger_tags')
+    def test_5xx_sends_errors_metric_and_set_tags(self, mock_extract_trigger_tags):
+        mock_extract_trigger_tags.return_value = {
+            "function_trigger.event_source": "api-gateway",
+            "function_trigger.event_source_arn":
+                "arn:aws:apigateway:us-west-1::/restapis/1234567890/stages/prod",
+            "http.url": "70ixmpl4fl.execute-api.us-east-2.amazonaws.com",
+            "http.url_details.path": "/prod/path/to/resource",
+            "http.method": "GET",
+        }
+        @datadog_lambda_wrapper
+        def lambda_handler(event, context):
+            return {
+                "statusCode": 500,
+                "body": "fake response body"
+            }
+
+        lambda_event = {}
+
+        lambda_handler(lambda_event, get_mock_context())
+
+        self.mock_write_metric_point_to_stdout.assert_has_calls(
+            [
+                call(
+                    "aws.lambda.enhanced.invocations",
+                    1,
+                    tags=[
+                        "region:us-west-1",
+                        "account_id:123457598159",
+                        "functionname:python-layer-test",
+                        "resource:python-layer-test:1",
+                        "cold_start:true",
+                        "memorysize:256",
+                        "runtime:python3.9",
+                        "datadog_lambda:v6.6.6",
+                        "dd_lambda_layer:datadog-python39_X.X.X",
+                    ],
+                    timestamp=None,
+                ),
+                call(
+                    "aws.lambda.enhanced.errors",
+                    1,
+                    tags=[
+                        "region:us-west-1",
+                        "account_id:123457598159",
+                        "functionname:python-layer-test",
+                        "resource:python-layer-test:1",
+                        "cold_start:true",
+                        "memorysize:256",
+                        "runtime:python3.9",
+                        "datadog_lambda:v6.6.6",
+                        "dd_lambda_layer:datadog-python39_X.X.X",
+                    ],
+                    timestamp=None,
+                ),
+            ]
+        )
+
     def test_enhanced_metrics_cold_start_tag(self):
         @datadog_lambda_wrapper
         def lambda_handler(event, context):