propagate ddtrace logs to our logs

Author: sumerc-psh

blackfire_conprof/log.py

@@ -3,8 +3,7 @@
 
 _DEFAULT_LOG_LEVEL = 2
 
-
-def _get_log_level(logger, level):
+def _get_log_level(level):
     _LOG_LEVELS = {
         5: logging.DEBUG,
         4: logging.DEBUG,
@@ -17,26 +16,18 @@ def _get_log_level(logger, level):
         level = int(level)
         return _LOG_LEVELS[level]
     except:
-        logger.error(
+        logging.getLogger().error(
             "BLACKFIRE_LOG_LEVEL is set to %s however it should be a number between 1 and 4 (1: error, 2: warning, 3: info, 4: debug). Default is '%d'." % \
                 (level, _DEFAULT_LOG_LEVEL)
         )
         return _LOG_LEVELS[_DEFAULT_LOG_LEVEL]
 
-
-def get_logger(name, include_line_info=True):
+def _get_log_handler():
     log_file = os.environ.get('BLACKFIRE_LOG_FILE')
-    log_level = os.environ.get('BLACKFIRE_LOG_LEVEL', _DEFAULT_LOG_LEVEL)
-    logger = logging.getLogger(name)
-    log_level = _get_log_level(logger, log_level)
-    logger.setLevel(log_level)
 
     formatter_info = "%(asctime)s %(levelname)s [pid:%(process)d, tid:%(thread)d] [%(name)s] "
 
-    # line info becomes irrelevant when logging is made from the C extension, thus
-    # this is configurable.
-    if include_line_info:
-        formatter_info += "[%(filename)s:%(lineno)d] - "
+    formatter_info += "[%(filename)s:%(lineno)d] - "
     formatter_info += "%(message).8192s"
     formatter = logging.Formatter(formatter_info)
 
@@ -48,6 +39,25 @@ def get_logger(name, include_line_info=True):
         log_handler = logging.FileHandler(log_file, 'a')
         log_handler.setFormatter(formatter)
 
-    logger.addHandler(log_handler)
+    return log_handler
+
+_log_handler = _get_log_handler()
+_log_level= _get_log_level(os.environ.get('BLACKFIRE_LOG_LEVEL', _DEFAULT_LOG_LEVEL))
+
+def get_logger(name):
+    logger = logging.getLogger(name)
+
+    logger.setLevel(_log_level)
+    logger.addHandler(_log_handler)
 
     return logger
+
+# This function is used to bridge ddtrace logging to blackfire_conprof logging.
+def bridge_ddtrace_logging():
+    logger_dict = logging.root.manager.loggerDict
+
+    for logger_name, logger_obj in logger_dict.items():
+        if logger_name.startswith('ddtrace.profiling'):
+            if isinstance(logger_obj, logging.Logger):
+                logger_obj.addHandler(_log_handler)
+                logger_obj.setLevel(_log_level)

blackfire_conprof/profiler.py

@@ -2,10 +2,12 @@
 import os
 import platform
 import collections
-from ddtrace.profiling import Profiler as DDProfiler
 from blackfire_conprof import log
 from .version import __version__
 
+from ddtrace.profiling import Profiler as DDProfiler
+log.bridge_ddtrace_logging()
+
 _DEFAULT_PERIOD = 45 # secs
 _DEFAULT_UPLOAD_TIMEOUT = 10 # secs
 

setup.py

@@ -1,4 +1,3 @@
-import io
 from setuptools import setup
 
 HOMEPAGE = "https://blackfire.io"