From 7fc64fdf45bed96eba70f4b8075e2e2df7441336 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Mon, 21 Dec 2020 13:20:14 -0500
Subject: [PATCH] Also handle bytes when serializing production Eliot log
 messages on Python 3.

---
 src/allmydata/test/test_eliotutil.py | 5 ++++-
 src/allmydata/util/eliotutil.py      | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/allmydata/test/test_eliotutil.py b/src/allmydata/test/test_eliotutil.py
index 1a8c2f801..0073a7675 100644
--- a/src/allmydata/test/test_eliotutil.py
+++ b/src/allmydata/test/test_eliotutil.py
@@ -57,11 +57,14 @@ from ..util.eliotutil import (
     _parse_destination_description,
     _EliotLogging,
 )
+from ..util.jsonbytes import BytesJSONEncoder
+
 from .common import (
     SyncTestCase,
     AsyncTestCase,
 )
 
+
 class EliotLoggedTestTests(AsyncTestCase):
     def test_returns_none(self):
         Message.log(hello="world")
@@ -94,7 +97,7 @@ class ParseDestinationDescriptionTests(SyncTestCase):
         reactor = object()
         self.assertThat(
             _parse_destination_description("file:-")(reactor),
-            Equals(FileDestination(stdout)),
+            Equals(FileDestination(stdout, encoder=BytesJSONEncoder)),
         )
 
 
diff --git a/src/allmydata/util/eliotutil.py b/src/allmydata/util/eliotutil.py
index 096356dfa..9e3cdd3e1 100644
--- a/src/allmydata/util/eliotutil.py
+++ b/src/allmydata/util/eliotutil.py
@@ -86,6 +86,9 @@ from twisted.internet.defer import (
 )
 from twisted.application.service import Service
 
+from .jsonbytes import BytesJSONEncoder
+
+
 def validateInstanceOf(t):
     """
     Return an Eliot validator that requires values to be instances of ``t``.
@@ -302,7 +305,7 @@ class _DestinationParser(object):
                     rotateLength=rotate_length,
                     maxRotatedFiles=max_rotated_files,
                 )
-        return lambda reactor: FileDestination(get_file())
+        return lambda reactor: FileDestination(get_file(), BytesJSONEncoder)
 
 
 _parse_destination_description = _DestinationParser().parse