Merge pull request #11 from DataDog/debugging-mode

Support DD_LOG_LEVEL

Author: tianchu

datadog_lambda/__init__.py

@@ -1,3 +1,9 @@
 # The minor version corresponds to the Lambda layer version.
 # E.g.,, version 0.5.0 gets packaged into layer version 5.
 __version__ = '0.5.0'
+
+
+import os
+import logging
+logger = logging.getLogger(__name__)
+logger.setLevel(logging.getLevelName(os.environ.get('DD_LOG_LEVEL', 'INFO').upper()))

datadog_lambda/metric.py

@@ -8,12 +8,15 @@
 import json
 import time
 import base64
+import logging
 
 import boto3
 from datadog import api
 from datadog.threadstats import ThreadStats
 from datadog_lambda import __version__
 
+logger = logging.getLogger(__name__)
+
 lambda_stats = ThreadStats()
 lambda_stats.start()
 
@@ -52,32 +55,38 @@ def lambda_metric(metric_name, value, timestamp=None, tags=None):
     """
     tags = _tag_dd_lambda_layer(tags)
     if os.environ.get('DD_FLUSH_TO_LOG', '').lower() == 'true':
+        logger.debug('Sending metric %s to Datadog via log forwarder', metric_name)
         print(json.dumps({
             'm': metric_name,
             'v': value,
             'e': timestamp or int(time.time()),
             't': tags
         }))
     else:
+        logger.debug('Sending metric %s to Datadog via lambda layer', metric_name)
         lambda_stats.distribution(
             metric_name, value, timestamp=timestamp, tags=tags
         )
 
 
 # Decrypt code should run once and variables stored outside of the function
 # handler so that these are decrypted once per container
-DD_KMS_API_KEY = os.environ.get("DD_KMS_API_KEY")
+DD_KMS_API_KEY = os.environ.get('DD_KMS_API_KEY', '')
 if DD_KMS_API_KEY:
-    DD_KMS_API_KEY = boto3.client("kms").decrypt(
+    DD_KMS_API_KEY = boto3.client('kms').decrypt(
         CiphertextBlob=base64.b64decode(DD_KMS_API_KEY)
-    )["Plaintext"]
+    )['Plaintext']
 
 # Set API Key and Host in the module, so they only set once per container
 api._api_key = os.environ.get(
     'DATADOG_API_KEY',
     os.environ.get('DD_API_KEY', DD_KMS_API_KEY),
 )
+logger.debug('Setting DATADOG_API_KEY of length %d', len(api._api_key))
+
+# Set DATADOG_HOST, to send data to a non-default Datadog datacenter
 api._api_host = os.environ.get(
     'DATADOG_HOST',
     'https://api.' + os.environ.get('DD_SITE', 'datadoghq.com')
 )
+logger.debug('Setting DATADOG_HOST to %s', api._api_host)

datadog_lambda/tracing.py

@@ -3,6 +3,8 @@
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2019 Datadog, Inc.
 
+import logging
+
 from aws_xray_sdk.core import xray_recorder
 
 from datadog_lambda.constants import (
@@ -11,6 +13,8 @@
     XraySubsegment,
 )
 
+logger = logging.getLogger(__name__)
+
 dd_trace_context = {}
 
 
@@ -33,6 +37,7 @@ def extract_dd_trace_context(event):
     parent_id = lowercase_headers.get(TraceHeader.PARENT_ID)
     sampling_priority = lowercase_headers.get(TraceHeader.SAMPLING_PRIORITY)
     if trace_id and parent_id and sampling_priority:
+        logger.debug('Extracted Datadog trace context from headers')
         dd_trace_context = {
             'trace-id': trace_id,
             'parent-id': parent_id,

datadog_lambda/wrapper.py

@@ -4,12 +4,15 @@
 # Copyright 2019 Datadog, Inc.
 
 import os
+import logging
 import traceback
 
 from datadog_lambda.metric import lambda_stats
 from datadog_lambda.tracing import extract_dd_trace_context
 from datadog_lambda.patch import patch_all
 
+logger = logging.getLogger(__name__)
+
 
 """
 Usage:
@@ -34,6 +37,7 @@ class _LambdaDecorator(object):
     def __init__(self, func):
         self.func = func
         self.flush_to_log = os.environ.get('DD_FLUSH_TO_LOG', '').lower() == 'true'
+        logger.debug('datadog_lambda_wrapper initialized')
 
     def _before(self, event, context):
         try: