bugfix: actually implement documented behavior

untitaker · untitaker · commit 044db988a527 · 2018-07-27T13:06:33.000+02:00
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
@@ -30,14 +30,11 @@ def __init__(self, dsn=None, *args, **kwargs):
             self._transport = Transport(dsn)
             self._transport.start()
 
-        try:
-            integrations = options["integrations"]
-        except KeyError:
-            from .integrations.logging import LoggingIntegration
-
-            integrations = [LoggingIntegration()]
+        if not any(isinstance(x, LoggingIntegration) for x in options['integrations']) and \
+           options['default_integrations']:
+            options['integrations'] = [LoggingIntegration()]
 
-        for integration in integrations or ():
+        for integration in options['integrations'] or ():
             integration(self)
 
     @property
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
@@ -10,6 +10,7 @@
     "server_name": DEFAULT_SERVER_NAME,
     "drain_timeout": 2.0,
     "integrations": [],
+    "default_integrations": True
 }
 
 SDK_INFO = {"name": "sentry-python", "version": VERSION}

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`"server_name": DEFAULT_SERVER_NAME,`
`11`	`11`	`"drain_timeout": 2.0,`
`12`	`12`	`"integrations": [],`
	`13`	`+ "default_integrations": True`
`13`	`14`	`}`
`14`	`15`
`15`	`16`	`SDK_INFO = {"name": "sentry-python", "version": VERSION}`