Split

Author: davidgasquez

README.md

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

bufflog/__init__.py

@@ -1,73 +1,3 @@
-import structlog
-import logging
-import os
-import sys
+from .bufflog import get_logger
 
-# try:
-#     import ddtrace
-#     from ddtrace.helpers import get_correlation_ids
-
-#     ddtrace_available = True
-# except ImportError:
-#     ddtrace_available = False
-
-from structlog.processors import JSONRenderer
-from structlog.stdlib import filter_by_level
-from structlog.stdlib import add_log_level_number
-
-LOG_LEVEL = os.getenv("LOG_LEVEL", "INFO")
-
-
-# def tracer_injection(logger, log_method, event_dict):
-#     # get correlation ids from current tracer context
-#     trace_id, span_id = get_correlation_ids()
-
-#     # add ids to structlog event dictionary
-#     event_dict["dd.trace_id"] = trace_id or 0
-#     event_dict["dd.span_id"] = span_id or 0
-
-#     # add the env, service, and version configured for the tracer
-#     event_dict["dd.env"] = ddtrace.config.env or ""
-#     event_dict["dd.service"] = ddtrace.config.service or ""
-#     event_dict["dd.version"] = ddtrace.config.version or ""
-
-#     return event_dict
-
-
-def rename_message_key(_, __, event_dict):
-    event_dict["message"] = event_dict["event"]
-    event_dict.pop("event", None)
-    return event_dict
-
-
-def increase_level_numbers(_, __, event_dict):
-    event_dict["level"] = event_dict["level_number"] * 10
-    event_dict.pop("level_number", None)
-    return event_dict
-
-
-processors = [
-    filter_by_level,
-    rename_message_key,
-    add_log_level_number,
-    increase_level_numbers,
-    structlog.stdlib.PositionalArgumentsFormatter(),
-    structlog.processors.StackInfoRenderer(),
-    structlog.processors.format_exc_info,
-    structlog.processors.UnicodeDecoder(),
-    JSONRenderer(),
-]
-
-# if ddtrace_available:
-#     processors.insert(0, tracer_injection)
-
-
-def get_logger():
-    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()
+__all__ = ["get_logger"]

bufflog/bufflog.py

@@ -0,0 +1,48 @@
+import structlog
+import logging
+import sys
+
+from structlog.processors import JSONRenderer
+from structlog.stdlib import filter_by_level
+from structlog.stdlib import add_log_level_number
+
+
+def rename_message_key(_, __, event_dict):
+    event_dict["message"] = event_dict["event"]
+    event_dict.pop("event", None)
+    return event_dict
+
+
+def increase_level_numbers(_, __, event_dict):
+    event_dict["level"] = event_dict["level_number"] * 10
+    event_dict.pop("level_number", None)
+    return event_dict
+
+
+def get_logger(name=__name__):
+
+    logging.basicConfig(
+        format="%(message)s",
+        stream=sys.stdout,
+        level=logging.INFO,
+    )
+
+    processors = [
+        filter_by_level,
+        rename_message_key,
+        add_log_level_number,
+        increase_level_numbers,
+        structlog.stdlib.PositionalArgumentsFormatter(),
+        structlog.processors.StackInfoRenderer(),
+        structlog.processors.format_exc_info,
+        structlog.processors.UnicodeDecoder(),
+        JSONRenderer(),
+    ]
+    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()

bufflog/datadog.py

@@ -0,0 +1,27 @@
+try:
+    import ddtrace
+    from ddtrace.helpers import get_correlation_ids
+
+    ddtrace_available = True
+except ImportError:
+    ddtrace_available = False
+
+
+def is_ddtrace_available():
+    return ddtrace_available
+
+
+def tracer_injection(logger, log_method, event_dict):
+    # get correlation ids from current tracer context
+    trace_id, span_id = get_correlation_ids()
+
+    # Add ids to Structlog event dictionary
+    event_dict["dd.trace_id"] = trace_id or 0
+    event_dict["dd.span_id"] = span_id or 0
+
+    # add the env, service, and version configured for the tracer
+    event_dict["dd.env"] = ddtrace.config.env or ""
+    event_dict["dd.service"] = ddtrace.config.service or ""
+    event_dict["dd.version"] = ddtrace.config.version or ""
+
+    return event_dict

setup.py

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