serializer: transform: improve exception msg and fallback

raven/utils/serializer/manager.py

@@ -75,12 +75,12 @@ def transform(self, value, **kwargs):
             try:
                 return repr(value)
             except Exception as e:
-                logger.exception(e)
+                logger.exception('Failed to serialize obj (%s): %s', objid, e)
                 # It's common case that a model's __unicode__ definition
                 # may try to query the database which if it was not
                 # cleaned up correctly, would hit a transaction aborted
-                # exception
-                return text_type(type(value))
+                # exception.
+                return '%s (%s)' % (text_type(type(value)), objid)
         finally:
             self.context.remove(objid)
 

tests/utils/encoding/tests.py

@@ -152,16 +152,19 @@ def __sentry__(self):
             expected = "u'example'"
         self.assertEqual(result, expected)
 
-    def test_broken_repr(self):
+    def test_broken_repr(self, caplog):
         class Foo(object):
             def __repr__(self):
                 raise ValueError
 
-        result = transform(Foo())
-        expected = "<class 'tests.utils.encoding.tests.Foo'>"
+        obj = Foo()
+        result = transform(obj)
         import sys
         if sys.version_info[0] == 3 and sys.version_info[1] >= 3:
             expected = "<class 'tests.utils.encoding.tests.TransformTest.test_broken_repr.<locals>.Foo'>"
+        else:
+            expected = "<class 'tests.utils.encoding.tests.Foo'>"
+        expected += ' (%s)' % (id(obj),)
         assert result == expected
 
     def test_recursion_max_depth(self):