bababuah

Osmar Coronel · Osmar Coronel · commit 4331b2ebbe0b · 2019-08-02T10:44:29.000-07:00
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
@@ -163,7 +163,6 @@ def _prepare_event(
                     ]
                 }
 
-        self._update_options()
         for key in "release", "environment", "server_name", "dist":
             if event.get(key) is None and self.options[key] is not None:  # type: ignore
                 event[key] = text_type(self.options[key]).strip()  # type: ignore
diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
@@ -309,6 +309,7 @@ def bind_client(
     ):
         # type: (...) -> None
         """Binds a new client to the hub."""
+        new._update_options()
         top = self._stack[-1]
         self._stack[-1] = (new, top[1])
 
diff --git a/tests/integrations/beam/test_beam.py b/tests/integrations/beam/test_beam.py
@@ -4,6 +4,7 @@
 pytest.importorskip("apache_beam")
 
 import dill
+
 from sentry_sdk.integrations.beam import (
     BeamIntegration,
     _wrap_task_call,
diff --git a/tox.ini b/tox.ini
@@ -32,8 +32,8 @@ envlist =
     {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-celery-{4.1,4.2,4.3}
     {pypy,py2.7}-celery-3
 
-    py2.7-beam-{12,13,master}
-    {py3.6,py3.7}-beam-{12,13,master}
+    {py2.7,py3.6}-beam-{12,13,master}
+    py3.7-beam-{12,13}
 
     # The aws_lambda tests deploy to the real AWS and have their own matrix of Python versions.
     py3.7-aws_lambda

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,6 @@ def _prepare_event(`
`163`	`163`	`]`
`164`	`164`	`}`
`165`	`165`
`166`		`- self._update_options()`
`167`	`166`	`for key in "release", "environment", "server_name", "dist":`
`168`	`167`	`if event.get(key) is None and self.options[key] is not None: # type: ignore`
`169`	`168`	`event[key] = text_type(self.options[key]).strip() # type: ignore`