Move per event log sample_rate extraction to SentryHandler

Author: arnavk

raven/base.py

@@ -566,7 +566,8 @@ def tags_context(self, data, **kwargs):
         })
 
     def capture(self, event_type, data=None, date=None, time_spent=None,
-                extra=None, stack=None, tags=None, **kwargs):
+                extra=None, stack=None, tags=None, sample_rate=None,
+                **kwargs):
         """
         Captures and processes an event and pipes it off to SentryClient.send.
 
@@ -636,11 +637,8 @@ def capture(self, event_type, data=None, date=None, time_spent=None,
             **kwargs)
 
         # should this event be sampled?
-        sample_rate = self.sample_rate
-        try:
-            sample_rate = float(extra['sample_rate'])
-        except (TypeError, KeyError, ValueError):
-            pass
+        if sample_rate is None:
+            sample_rate = self.sample_rate
 
         if self._random.random() < sample_rate:
             self.send(**data)

raven/handlers/logging.py

@@ -174,7 +174,14 @@ def _emit(self, record, **kwargs):
         tags.update(getattr(record, 'tags', {}))
 
         kwargs.update(handler_kwargs)
+        sample_rate = extra.pop('sample_rate', None)
+        try:
+            if sample_rate is not None:
+                sample_rate = float(sample_rate)
+        except ValueError:
+            sample_rate = None
 
         return self.client.capture(
             event_type, stack=stack, data=data,
-            extra=extra, date=date, **kwargs)
+            extra=extra, date=date, sample_rate=sample_rate,
+            **kwargs)