From e212f778bdb7cfce1e61593da9831580c77a1491 Mon Sep 17 00:00:00 2001 From: DarcyRaynerDD Date: Thu, 21 May 2020 15:23:47 -0400 Subject: [PATCH 1/3] Add default lambda handler, for zero-code change instrumentation --- datadog_lambda/handler.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 datadog_lambda/handler.py diff --git a/datadog_lambda/handler.py b/datadog_lambda/handler.py new file mode 100644 index 00000000..1b563a85 --- /dev/null +++ b/datadog_lambda/handler.py @@ -0,0 +1,22 @@ +from __future__ import absolute_import +from importlib import import_module +import os +from datadog_lambda.wrapper import datadog_lambda_wrapper + + +class HandlerError(Exception): + pass + + +path = os.environ.get("DATADOG_USER_HANDLER", None) +if path is None: + raise HandlerError( + "DATADOG_USER_HANDLER is not defined. Can't use prebuilt datadog handler" + ) +parts = path.rsplit(".", 1) +if len(parts) != 2: + raise HandlerError("Value %s for DATADOG_USER_HANDLER has invalid format." % path) + +(mod_name, handler_name) = parts +handler_module = import_module(mod_name) +handler = datadog_lambda_wrapper(getattr(handler_module, handler_name)) From 411eb12fc968a15f1e0bad5897a1edd961d10f9a Mon Sep 17 00:00:00 2001 From: DarcyRaynerDD Date: Thu, 21 May 2020 15:26:52 -0400 Subject: [PATCH 2/3] Add copyright claim --- datadog_lambda/handler.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/datadog_lambda/handler.py b/datadog_lambda/handler.py index 1b563a85..9ba1dcef 100644 --- a/datadog_lambda/handler.py +++ b/datadog_lambda/handler.py @@ -1,5 +1,11 @@ +# Unless explicitly stated otherwise all files in this repository are licensed +# under the Apache License Version 2.0. +# This product includes software developed at Datadog (https://www.datadoghq.com/). +# Copyright 2020 Datadog, Inc. + from __future__ import absolute_import from importlib import import_module + import os from datadog_lambda.wrapper import datadog_lambda_wrapper From 8c5a4583513c81fad0e97eaa8e3969f89826ef30 Mon Sep 17 00:00:00 2001 From: DarcyRaynerDD Date: Fri, 22 May 2020 10:16:35 -0400 Subject: [PATCH 3/3] Change DATADOG_USER_HANDLER to DD_LAMBDA_HANDLER --- datadog_lambda/handler.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/datadog_lambda/handler.py b/datadog_lambda/handler.py index 9ba1dcef..2c531515 100644 --- a/datadog_lambda/handler.py +++ b/datadog_lambda/handler.py @@ -14,14 +14,14 @@ class HandlerError(Exception): pass -path = os.environ.get("DATADOG_USER_HANDLER", None) +path = os.environ.get("DD_LAMBDA_HANDLER", None) if path is None: raise HandlerError( - "DATADOG_USER_HANDLER is not defined. Can't use prebuilt datadog handler" + "DD_LAMBDA_HANDLER is not defined. Can't use prebuilt datadog handler" ) parts = path.rsplit(".", 1) if len(parts) != 2: - raise HandlerError("Value %s for DATADOG_USER_HANDLER has invalid format." % path) + raise HandlerError("Value %s for DD_LAMBDA_HANDLER has invalid format." % path) (mod_name, handler_name) = parts handler_module = import_module(mod_name)