use to_unicode instead of to_string when writing to sys.stderr

fixes #186
closes #187

Author: beniwohli

elasticapm/handlers/logbook.py

@@ -16,7 +16,7 @@
 import logbook
 
 from elasticapm.base import Client
-from elasticapm.utils.encoding import to_string
+from elasticapm.utils.encoding import to_unicode
 
 LOOKBOOK_LEVELS = {
     logbook.DEBUG: 'debug',
@@ -57,15 +57,15 @@ def emit(self, record):
 
         # Avoid typical config issues by overriding loggers behavior
         if record.channel.startswith('elasticapm.errors'):
-            sys.stderr.write(to_string(record.message + '\n'))
+            sys.stderr.write(to_unicode(record.message + '\n'))
             return
 
         try:
             return self._emit(record)
         except Exception:
             sys.stderr.write("Top level ElasticAPM exception caught - failed creating log record.\n")
-            sys.stderr.write(to_string(record.msg + '\n'))
-            sys.stderr.write(to_string(traceback.format_exc() + '\n'))
+            sys.stderr.write(to_unicode(record.msg + '\n'))
+            sys.stderr.write(to_unicode(traceback.format_exc() + '\n'))
 
             try:
                 self.client.capture('Exception')

elasticapm/handlers/logging.py

@@ -18,7 +18,7 @@
 
 from elasticapm.base import Client
 from elasticapm.utils import compat
-from elasticapm.utils.encoding import to_string
+from elasticapm.utils.encoding import to_unicode
 from elasticapm.utils.stacks import iter_stack_frames
 
 
@@ -49,15 +49,15 @@ def emit(self, record):
 
         # Avoid typical config issues by overriding loggers behavior
         if record.name.startswith('elasticapm.errors'):
-            sys.stderr.write(to_string(record.message) + '\n')
+            sys.stderr.write(to_unicode(record.message) + '\n')
             return
 
         try:
             return self._emit(record)
         except Exception:
             sys.stderr.write("Top level ElasticAPM exception caught - failed creating log record.\n")
-            sys.stderr.write(to_string(record.msg + '\n'))
-            sys.stderr.write(to_string(traceback.format_exc() + '\n'))
+            sys.stderr.write(to_unicode(record.msg + '\n'))
+            sys.stderr.write(to_unicode(traceback.format_exc() + '\n'))
 
             try:
                 self.client.capture('Exception')

tests/handlers/logbook/logbook_tests.py

@@ -1,5 +1,6 @@
 import logbook
 import pytest
+from logbook import LogRecord
 
 from elasticapm.handlers.logbook import LogbookHandler
 
@@ -118,3 +119,19 @@ def test_invalid_first_arg_type():
 def test_missing_client_arg():
     with pytest.raises(TypeError):
         LogbookHandler()
+
+
+def test_logbook_handler_emit_error(capsys, elasticapm_client):
+    handler = LogbookHandler(elasticapm_client)
+    handler._emit = lambda: 1/0
+    handler.emit(LogRecord('x', 1, 'Oops'))
+    out, err = capsys.readouterr()
+    assert 'Top level ElasticAPM exception caught' in err
+    assert 'Oops' in err
+
+
+def test_logbook_handler_dont_emit_elasticapm(capsys, elasticapm_client):
+    handler = LogbookHandler(elasticapm_client)
+    handler.emit(LogRecord('elasticapm.errors', 1, 'Oops'))
+    out, err = capsys.readouterr()
+    assert 'Oops' in err

tests/handlers/logging/logging_tests.py

@@ -1,4 +1,5 @@
 import logging
+from logging import LogRecord
 
 import pytest
 
@@ -189,3 +190,19 @@ def test_logger_setup():
     assert client.config.service_name == 'bar'
     assert client.config.secret_token == 'baz'
     assert handler.level == logging.NOTSET
+
+
+def test_logging_handler_emit_error(capsys, elasticapm_client):
+    handler = LoggingHandler(elasticapm_client)
+    handler._emit = lambda: 1/0
+    handler.emit(LogRecord('x', 1, '/ab/c/', 10, 'Oops', [], None))
+    out, err = capsys.readouterr()
+    assert 'Top level ElasticAPM exception caught' in err
+    assert 'Oops' in err
+
+
+def test_logging_handler_dont_emit_elasticapm(capsys, elasticapm_client):
+    handler = LoggingHandler(elasticapm_client)
+    handler.emit(LogRecord('elasticapm.errors', 1, '/ab/c/', 10, 'Oops', [], None))
+    out, err = capsys.readouterr()
+    assert 'Oops' in err