respect DD_TRACE_ENABLED

Author: TalUsvyatsky

datadog_lambda/tracing.py

@@ -1331,30 +1331,30 @@ def emit_telemetry_on_exception_outside_of_handler(
     Emit an enhanced error metric and create a span for exceptions occuring outside of the handler
     """
     submit_errors_metric(context)
+    if dd_tracing_enabled:
+        span = tracer.trace(
+            "aws.lambda",
+            service="aws.lambda",
+            resource=resource_name,
+            span_type="serverless",
+        )
+        span.start_ns = time_ns() - handler_load_duration
 
-    span = tracer.trace(
-        "aws.lambda",
-        service="aws.lambda",
-        resource=resource_name,
-        span_type="serverless",
-    )
-    span.start_ns = time_ns() - handler_load_duration
-
-    tags = {
-        "error.status": 500,
-        "error.type": type(exception).__name__,
-        "error.message": exception,
-        "error.stack": "".join(
-            traceback.format_exception(
-                type(exception), exception, exception.__traceback__
-            )
-        ),
-        "resource_names": resource_name,
-        "resource.name": resource_name,
-        "operation_name": "aws.lambda",
-        "status": "error",
-        "request_id": context.aws_request_id,
-    }
-    span.set_tags(tags)
-    span.error = 1
-    span.finish()
+        tags = {
+            "error.status": 500,
+            "error.type": type(exception).__name__,
+            "error.message": exception,
+            "error.stack": "".join(
+                traceback.format_exception(
+                    type(exception), exception, exception.__traceback__
+                )
+            ),
+            "resource_names": resource_name,
+            "resource.name": resource_name,
+            "operation_name": "aws.lambda",
+            "status": "error",
+            "request_id": context.aws_request_id,
+        }
+        span.set_tags(tags)
+        span.error = 1
+        span.finish()

tests/test_tracing.py

@@ -2004,9 +2004,12 @@ def test_deterministic_m5_hash__always_leading_with_zero(self):
 
 
 class TestExceptionOutsideHandler(unittest.TestCase):
+    @patch("datadog_lambda.tracing.dd_tracing_enabled", True)
     @patch("datadog_lambda.tracing.submit_errors_metric")
     @patch("datadog_lambda.tracing.time_ns", return_value=100)
-    def test_exception_outside_handler(self, mock_time, mock_submit_errors_metric):
+    def test_exception_outside_handler_tracing_enabled(
+        self, mock_time, mock_submit_errors_metric
+    ):
         fake_error = ValueError("Some error message")
         resource_name = "my_handler"
         span_type = "aws.lambda"
@@ -2047,3 +2050,20 @@ def test_exception_outside_handler(self, mock_time, mock_submit_errors_metric):
         mock_span.finish.assert_called_once()
         assert mock_span.error == 1
         assert mock_span.start_ns == 58
+
+    @patch("datadog_lambda.tracing.dd_tracing_enabled", False)
+    @patch("datadog_lambda.tracing.submit_errors_metric")
+    @patch("datadog_lambda.tracing.time_ns", return_value=100)
+    def test_exception_outside_handler_tracing_disabled(
+        self, mock_time, mock_submit_errors_metric
+    ):
+        fake_error = ValueError("Some error message")
+        resource_name = "my_handler"
+        context = get_mock_context()
+        with patch("datadog_lambda.tracing.tracer.trace") as mock_trace:
+            emit_telemetry_on_exception_outside_of_handler(
+                context, fake_error, resource_name, 42
+            )
+
+        mock_submit_errors_metric.assert_called_once_with(context)
+        mock_trace.assert_not_called()