Add logs_injection.

Author: purple4reina

datadog_lambda/config.py

@@ -32,6 +32,7 @@ class Config:
     enhanced_metrics_enabled = _get_env("DD_ENHANCED_METRICS", "true", as_bool)
     flush_in_thread = _get_env("DD_FLUSH_IN_THREAD", "false", as_bool)
     flush_to_log = _get_env("DD_FLUSH_TO_LOG", "false", as_bool)
+    logs_injection = _get_env("DD_LOGS_INJECTION", "true", as_bool)
     function_name = _get_env("AWS_LAMBDA_FUNCTION_NAME")
     is_gov_region = _get_env("AWS_REGION", "", lambda x: x.startswith("us-gov-"))
     is_in_tests = _get_env("DD_INTEGRATION_TEST", "false", as_bool)

datadog_lambda/wrapper.py

@@ -160,9 +160,6 @@ def __init__(self, func):
         """Executes when the wrapped function gets wrapped"""
         try:
             self.func = func
-            self.logs_injection = (
-                os.environ.get(DD_LOGS_INJECTION, "true").lower() == "true"
-            )
             self.merge_xray_traces = (
                 os.environ.get(DD_MERGE_XRAY_TRACES, "false").lower() == "true"
             )
@@ -219,7 +216,7 @@ def __init__(self, func):
                     self.trace_extractor = getattr(extractor_module, extractor_name)
 
             # Inject trace correlation ids to logs
-            if self.logs_injection:
+            if config.logs_injection:
                 inject_correlation_ids()
 
             # This prevents a breaking change in ddtrace v0.49 regarding the service name

tests/test_config.py

@@ -27,6 +27,15 @@ def set_env(key, value):
     ("DD_FLUSH_TO_LOG", "flush_to_log", "1", True),  # CHANGED
     ("DD_FLUSH_TO_LOG", "flush_to_log", "0", False),
     ("DD_FLUSH_TO_LOG", "flush_to_log", "purple", False),
+    ("DD_LOGS_INJECTION", "logs_injection", None, True),
+    ("DD_LOGS_INJECTION", "logs_injection", "", False),
+    ("DD_LOGS_INJECTION", "logs_injection", "true", True),
+    ("DD_LOGS_INJECTION", "logs_injection", "TRUE", True),
+    ("DD_LOGS_INJECTION", "logs_injection", "false", False),
+    ("DD_LOGS_INJECTION", "logs_injection", "FALSE", False),
+    ("DD_LOGS_INJECTION", "logs_injection", "1", True),  # CHANGED
+    ("DD_LOGS_INJECTION", "logs_injection", "0", False),
+    ("DD_LOGS_INJECTION", "logs_injection", "purple", False),
     ("DD_TRACE_ENABLED", "trace_enabled", None, True),
     ("DD_TRACE_ENABLED", "trace_enabled", "", False),
     ("DD_TRACE_ENABLED", "trace_enabled", "true", True),