Use functionname.

Author: purple4reina

datadog_lambda/config.py

@@ -33,7 +33,7 @@ class Config:
     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")
+    function_name = _get_env("AWS_LAMBDA_FUNCTION_NAME", "function")
     is_gov_region = _get_env("AWS_REGION", "", lambda x: x.startswith("us-gov-"))
     is_in_tests = _get_env("DD_INTEGRATION_TEST", "false", as_bool)
     is_lambda_context = _get_env("AWS_LAMBDA_FUNCTION_NAME", None, bool)

datadog_lambda/wrapper.py

@@ -64,7 +64,6 @@
 logger = logging.getLogger(__name__)
 
 DD_LOGS_INJECTION = "DD_LOGS_INJECTION"
-AWS_LAMBDA_FUNCTION_NAME = "AWS_LAMBDA_FUNCTION_NAME"
 DD_LOCAL_TEST = "DD_LOCAL_TEST"
 DD_TRACE_EXTRACTOR = "DD_TRACE_EXTRACTOR"
 DD_TRACE_MANAGED_SERVICES = "DD_TRACE_MANAGED_SERVICES"
@@ -159,7 +158,6 @@ def __init__(self, func):
         """Executes when the wrapped function gets wrapped"""
         try:
             self.func = func
-            self.function_name = os.environ.get(AWS_LAMBDA_FUNCTION_NAME, "function")
             self.service = os.environ.get(DD_SERVICE, None)
             self.extractor_env = os.environ.get(DD_TRACE_EXTRACTOR, None)
             self.trace_extractor = None
@@ -322,7 +320,7 @@ def _before(self, event, context):
                     set_dsm_context(event, event_source)
                 self.span = create_function_execution_span(
                     context=context,
-                    function_name=self.function_name,
+                    function_name=config.function_name,
                     is_cold_start=is_cold_start(),
                     is_proactive_init=is_proactive_init(),
                     trace_context_source=trace_context_source,
@@ -382,7 +380,7 @@ def _after(self, event, context):
                     following_span = self.span or self.inferred_span
                     ColdStartTracer(
                         tracer,
-                        self.function_name,
+                        config.function_name,
                         following_span.start_ns,
                         trace_ctx,
                         self.min_cold_start_trace_duration,

tests/test_config.py

@@ -15,7 +15,7 @@ def set_env(key, value):
 
 
 _test_config_from_environ = (
-    ("AWS_LAMBDA_FUNCTION_NAME", "function_name", None, None),
+    ("AWS_LAMBDA_FUNCTION_NAME", "function_name", None, "function"),
     ("AWS_LAMBDA_FUNCTION_NAME", "function_name", "", ""),
     ("AWS_LAMBDA_FUNCTION_NAME", "function_name", "my_function", "my_function"),
     ("DD_FLUSH_TO_LOG", "flush_to_log", None, False),