Merge pull request #2 from bufferapp/add-datadog-tracing

Add Datadog tracing

Author: davidgasquez

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

.github/workflows/codeql-analysis.yml

@@ -18,9 +18,9 @@ pip install python-bufflog
 
 ```python
 
-from bufflog import get_logger
+import bufflog
 
-bufflog = get_logger()
+bufflog = bufflog.get_logger(__name__)
 
 bufflog.debug('Hello debug', context={"some":"stuff"})
 bufflog.info('Hello info')

README.md

@@ -1,3 +1 @@
 from .bufflog import get_logger
-
-__all__ = ["get_logger"]

bufflog/__init__.py

@@ -1,11 +1,14 @@
 import structlog
 import logging
 import sys
+import os
 
 from structlog.processors import JSONRenderer
 from structlog.stdlib import filter_by_level
 from structlog.stdlib import add_log_level_number
 
+from .datadog import tracer_injection
+
 
 def rename_message_key(_, __, event_dict):
     event_dict["message"] = event_dict["event"]
@@ -19,12 +22,15 @@ def increase_level_numbers(_, __, event_dict):
     return event_dict
 
 
-def get_logger(name=__name__):
+LOG_LEVEL = os.getenv("LOG_LEVEL", "INFO")
+
+
+def get_logger(name=None, datadog=False):
 
     logging.basicConfig(
         format="%(message)s",
         stream=sys.stdout,
-        level=logging.INFO,
+        level=LOG_LEVEL,
     )
 
     processors = [
@@ -38,11 +44,16 @@ def get_logger(name=__name__):
         structlog.processors.UnicodeDecoder(),
         JSONRenderer(),
     ]
+
+    if datadog:
+        processors.insert(0, tracer_injection)
+
     structlog.configure(
         context_class=dict,
         logger_factory=structlog.stdlib.LoggerFactory(),
         wrapper_class=structlog.stdlib.BoundLogger,
         cache_logger_on_first_use=True,
         processors=processors,
     )
-    return structlog.get_logger(name).new()
+
+    return structlog.get_logger(name)

bufflog/bufflog.py

@@ -24,4 +24,4 @@ def tracer_injection(logger, log_method, event_dict):
     event_dict["dd.service"] = ddtrace.config.service or ""
     event_dict["dd.version"] = ddtrace.config.version or ""
 
-    return event_dict
+    return event_dict

bufflog/datadog.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="python-bufflog",
-    version="0.1.2",
+    version="0.1.3",
     author="David Gasquez",
     author_email="[email protected]",
     description="Python logger for Buffer services",