allow dict_merge to throw an error on rollbar.init + fix logging init

rollbar/__init__.py

@@ -691,7 +691,7 @@ def _report_exc_info(exc_info, request, extra_data, payload_data, level=None):
         if not isinstance(extra_data, dict):
             extra_data = {'value': extra_data}
         if extra_trace_data:
-            extra_data = dict_merge(extra_data, extra_trace_data)
+            extra_data = dict_merge(extra_data, extra_trace_data, silence_errors=True)
         data['custom'] = extra_data
     if extra_trace_data and not extra_data:
         data['custom'] = extra_trace_data
@@ -703,7 +703,7 @@ def _report_exc_info(exc_info, request, extra_data, payload_data, level=None):
     data['server'] = _build_server_data()
 
     if payload_data:
-        data = dict_merge(data, payload_data)
+        data = dict_merge(data, payload_data, silence_errors=True)
 
     payload = _build_payload(data)
     send_payload(payload, payload.get('access_token'))
@@ -783,7 +783,7 @@ def _report_message(message, level, request, extra_data, payload_data):
     data['server'] = _build_server_data()
 
     if payload_data:
-        data = dict_merge(data, payload_data)
+        data = dict_merge(data, payload_data, silence_errors=True)
 
     payload = _build_payload(data)
     send_payload(payload, payload.get('access_token'))
@@ -1014,7 +1014,7 @@ def _add_lambda_context_data(data):
             }
         }
         if 'custom' in data:
-            data['custom'] = dict_merge(data['custom'], lambda_data)
+            data['custom'] = dict_merge(data['custom'], lambda_data, silence_errors=True)
         else:
             data['custom'] = lambda_data
     except Exception as e:

rollbar/lib/__init__.py

@@ -166,7 +166,7 @@ def is_builtin_type(obj):
 
 
 # http://www.xormedia.com/recursively-merge-dictionaries-in-python.html
-def dict_merge(a, b):
+def dict_merge(a, b, silence_errors=False):
     """
     Recursively merges dict's. not just simple a['key'] = b['key'], if
     both a and bhave a key who's value is a dict then dict_merge is called
@@ -179,11 +179,14 @@ def dict_merge(a, b):
     result = a
     for k, v in b.items():
         if k in result and isinstance(result[k], dict):
-            result[k] = dict_merge(result[k], v)
+            result[k] = dict_merge(result[k], v, silence_errors=silence_errors)
         else:
             try:
                 result[k] = copy.deepcopy(v)
             except:
+                if not silence_errors:
+                    raise six.reraise(*sys.exc_info())
+
                 result[k] = '<Uncopyable obj:(%s)>' % (v,)
 
     return result

rollbar/logger.py

@@ -21,6 +21,8 @@
 import logging
 import threading
 
+from logging.config import ConvertingDict, ConvertingList, ConvertingTuple
+
 import rollbar
 
 # hack to fix backward compatibility in Python3
@@ -30,6 +32,17 @@
     _checkLevel = lambda lvl: lvl
 
 
+def resolve_logging_types(obj):
+    if isinstance(obj, (dict, ConvertingDict)):
+        return {k: resolve_logging_types(v) for k, v in obj.items()}
+    elif isinstance(obj, (list, ConvertingList)):
+        return [resolve_logging_types(i) for i in obj]
+    elif isinstance(obj, (tuple, ConvertingTuple)):
+        return tuple(resolve_logging_types(i) for i in obj)
+
+    return obj
+
+
 class RollbarHandler(logging.Handler):
     SUPPORTED_LEVELS = set(('debug', 'info', 'warning', 'error', 'critical'))
 
@@ -46,7 +59,8 @@ def __init__(self,
         logging.Handler.__init__(self)
 
         if access_token is not None:
-            rollbar.init(access_token, environment, **kw)
+            rollbar.init(
+                access_token, environment, **resolve_logging_types(kw))
 
         self.notify_level = _checkLevel(level)
 
@@ -131,7 +145,8 @@ def emit(self, record):
                             }
                         }
                     }
-                    payload_data = rollbar.dict_merge(payload_data, message_template)
+                    payload_data = rollbar.dict_merge(
+                        payload_data, message_template, silence_errors=True)
 
                 uuid = rollbar.report_exc_info(exc_info,
                                                level=level,

rollbar/test/test_lib.py

@@ -50,7 +50,7 @@ def test_dict_merge_dicts_select_poll(self):
         p = poll()
         a = {'a': {'b': 42}}
         b = {'a': {'y': p}}
-        result = dict_merge(a, b)
+        result = dict_merge(a, b, silence_errors=True)
 
         self.assertIn('a', result)
         self.assertIn('b', result['a'])