feat: Add sys.argv to extra

untitaker · untitaker · commit 038e8ed91488 · 2018-10-23T10:32:51.000+02:00
Fix getsentry#129
diff --git a/sentry_sdk/integrations/__init__.py b/sentry_sdk/integrations/__init__.py
@@ -21,20 +21,23 @@ def iter_default_integrations():
     - `DedupeIntegration`
     - `AtexitIntegration`
     - `ModulesIntegration`
+    - `ArgvIntegration`
     """
     from sentry_sdk.integrations.logging import LoggingIntegration
     from sentry_sdk.integrations.stdlib import StdlibIntegration
     from sentry_sdk.integrations.excepthook import ExcepthookIntegration
     from sentry_sdk.integrations.dedupe import DedupeIntegration
     from sentry_sdk.integrations.atexit import AtexitIntegration
     from sentry_sdk.integrations.modules import ModulesIntegration
+    from sentry_sdk.integrations.argv import ArgvIntegration
 
     yield LoggingIntegration
     yield StdlibIntegration
     yield ExcepthookIntegration
     yield DedupeIntegration
     yield AtexitIntegration
     yield ModulesIntegration
+    yield ArgvIntegration
 
 
 def setup_integrations(integrations, with_defaults=True):
diff --git a/sentry_sdk/integrations/argv.py b/sentry_sdk/integrations/argv.py
@@ -0,0 +1,24 @@
+from __future__ import absolute_import
+
+import sys
+
+from sentry_sdk.hub import Hub
+from sentry_sdk.integrations import Integration
+from sentry_sdk.scope import add_global_event_processor
+
+
+class ArgvIntegration(Integration):
+    identifier = "argv"
+
+    @staticmethod
+    def setup_once():
+        @add_global_event_processor
+        def processor(event, hint):
+            if Hub.current.get_integration(ArgvIntegration) is not None:
+                extra = event.setdefault("extra", {})
+                # If some event processor decided to set extra to e.g. an
+                # `int`, don't crash. Not here.
+                if isinstance(extra, dict):
+                    extra["sys.argv"] = sys.argv
+
+            return event
diff --git a/tests/integrations/argv/test_argv.py b/tests/integrations/argv/test_argv.py
@@ -0,0 +1,16 @@
+import sys
+
+from sentry_sdk import capture_message
+from sentry_sdk.integrations.argv import ArgvIntegration
+
+
+def test_basic(sentry_init, capture_events, monkeypatch):
+    sentry_init(integrations=[ArgvIntegration()])
+
+    argv = ["foo", "bar", "baz"]
+    monkeypatch.setattr(sys, "argv", argv)
+
+    events = capture_events()
+    capture_message("hi")
+    event, = events
+    assert event["extra"]["sys.argv"] == argv
