Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/sentry/utils/raven.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ def send(self, **kwargs):
if not is_current_event_safe():
return

# Force raven-python encoding of this event, so that edge cases like
# non JSON-serializable objects are handled.
kwargs = self.decode(self.encode(kwargs))

from sentry import tsdb
from sentry.coreapi import ClientApiHelper
from sentry.event_manager import EventManager
Expand Down
21 changes: 21 additions & 0 deletions tests/sentry/utils/test_raven.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,24 @@ def test_upstream(self, send):
_, kwargs = send.call_args
# and got tagged properly
assert kwargs['tags']['install-id'] == 'abc123'

@patch.object(SentryInternalClient, 'is_enabled', Mock(return_value=True))
def test_encoding(self):

class NotJSONSerializable():
pass

sic = SentryInternalClient()
with self.tasks():
sic.send(**{
'sentry.interfaces.Message': {
'message': 'check the req',
},
'extra': {
'request': NotJSONSerializable()
},
})

event = Event.objects.get()
assert event.data['sentry.interfaces.Message']['message'] == 'check the req'
assert 'NotJSONSerializable' in event.data['extra']['request']