feat: Record extra for logging errors and breadcrumbs

Fix #113

Author: untitaker

sentry_sdk/integrations/logging.py

@@ -77,13 +77,52 @@ def _breadcrumb_from_record(record):
         "category": record.name,
         "message": record.message,
         "timestamp": datetime.datetime.fromtimestamp(record.created),
+        "data": _extra_from_record(record),
     }
 
 
 def _logging_to_event_level(levelname):
     return {"critical": "fatal"}.get(levelname.lower(), levelname.lower())
 
 
+COMMON_RECORD_ATTRS = frozenset(
+    (
+        "args",
+        "created",
+        "data",
+        "exc_info",
+        "exc_text",
+        "filename",
+        "funcName",
+        "levelname",
+        "levelno",
+        "linenno",
+        "lineno",
+        "message",
+        "module",
+        "msecs",
+        "msg",
+        "name",
+        "pathname",
+        "process",
+        "processName",
+        "relativeCreated",
+        "stack",
+        "tags",
+        "thread",
+        "threadName",
+    )
+)
+
+
+def _extra_from_record(record):
+    return {
+        k: v
+        for k, v in vars(record).items()
+        if k not in COMMON_RECORD_ATTRS and not k.startswith("_")
+    }
+
+
 class EventHandler(logging.Handler, object):
     def emit(self, record):
         with capture_internal_exceptions():
@@ -113,6 +152,7 @@ def _emit(self, record):
         event["level"] = _logging_to_event_level(record.levelname)
         event["logger"] = record.name
         event["logentry"] = {"message": to_string(record.msg), "params": record.args}
+        event["extra"] = _extra_from_record(record)
 
         hub.capture_event(event, hint=hint)
 

tests/integrations/logging/test_logging.py

@@ -36,3 +36,20 @@ def test_logging_defaults(integrations, sentry_init, capture_events):
     assert event["level"] == "fatal"
     assert any(crumb["message"] == "bread" for crumb in event["breadcrumbs"])
     assert not any(crumb["message"] == "LOL" for crumb in event["breadcrumbs"])
+
+
+def test_logging_extra_data(sentry_init, capture_events):
+    sentry_init(integrations=[LoggingIntegration()], default_integrations=False)
+    events = capture_events()
+
+    logger.info("bread", extra=dict(foo=42))
+    logger.critical("lol", extra=dict(bar=69))
+
+    event, = events
+
+    assert event["level"] == "fatal"
+    assert event["extra"] == {"bar": 69}
+    assert any(
+        crumb["message"] == "bread" and crumb["data"] == {"foo": 42}
+        for crumb in event["breadcrumbs"]
+    )