fix: re-enable slog's envlogger

autoconnect/Cargo.toml

@@ -36,7 +36,6 @@ serde_derive.workspace = true
 serde_json.workspace = true
 slog.workspace = true
 slog-async.workspace = true
-slog-envlogger.workspace = true
 slog-mozlog-json.workspace = true
 slog-scope.workspace = true
 slog-stdlog.workspace = true
@@ -53,4 +52,4 @@ docopt = "1.1"
 
 [features]
 emulator = ["bigtable"]
-bigtable = ["autopush_common/bigtable", "autoconnect_settings/bigtable"]
+bigtable = ["autopush_common/bigtable", "autoconnect_settings/bigtable"]

autoendpoint/Cargo.toml

@@ -35,7 +35,6 @@ serde_dynamodb.workspace = true
 serde_json.workspace = true
 slog.workspace = true
 slog-async.workspace = true
-slog-envlogger.workspace = true
 slog-mozlog-json.workspace = true
 slog-scope.workspace = true
 slog-stdlog.workspace = true

autopush-common/src/logging.rs

@@ -24,11 +24,13 @@ pub fn init_logging(json: bool) -> Result<()> {
             .hostname(hostname)
             .build()
             .fuse();
+        let drain = slog_envlogger::new(drain);
         let drain = slog_async::Async::new(drain).build().fuse();
         slog::Logger::root(drain, slog_o!())
     } else {
         let decorator = slog_term::TermDecorator::new().build();
         let drain = slog_term::FullFormat::new(decorator).build().fuse();
+        let drain = slog_envlogger::new(drain);
         let drain = slog_async::Async::new(drain).build().fuse();
         slog::Logger::root(drain, slog_o!())
     };

autopush/Cargo.toml

@@ -29,7 +29,6 @@ serde_derive.workspace = true
 serde_json.workspace = true
 slog.workspace = true
 slog-async.workspace = true
-slog-envlogger.workspace = true
 slog-mozlog-json.workspace = true
 slog-scope.workspace = true
 slog-stdlog.workspace = true

tests/test_integration_all_rust.py

@@ -821,7 +821,7 @@ def tearDown(self):
 
     def host_endpoint(self, client):
         parsed = urlparse(list(client.channels.values())[0])
-        "{}://{}".format(parsed.scheme, parsed.netloc)
+        return "{}://{}".format(parsed.scheme, parsed.netloc)
 
     @inlineCallbacks
     def quick_register(self):
@@ -844,7 +844,7 @@ def _ws_url(self):
 
     @inlineCallbacks
     @max_logs(conn=4)
-    def test_sentry_output(self):
+    def test_sentry_output_autoconnect(self):
         if os.getenv("SKIP_SENTRY"):
             SkipTest("Skipping sentry test")
             return
@@ -859,15 +859,34 @@ def test_sentry_output(self):
         requests.get(
             "http://localhost:{}/v1/err/crit".format(CONNECTION_PORT)
         )
+        event1 = MOCK_SENTRY_QUEUE.get(timeout=5)
+        # new autoconnect emits 2 events
         try:
-            data = MOCK_SENTRY_QUEUE.get(timeout=5)
-        except ValueError as ex:
-            if not ex.contains("I/O operation on closed file"):
-                raise ex
-            # python2 on circleci will fail this test due to an IO error.
-            # Local testing shows that this test works.
-            # This may resolve by updating tests to python3 (see #334)
-        assert data["exception"]["values"][0]["value"] == "LogCheck"
+            maybe_event2 = MOCK_SENTRY_QUEUE.get(timeout=1)
+        except Empty:
+            pass
+        assert event1["exception"]["values"][0]["value"] == "LogCheck"
+
+    @inlineCallbacks
+    @max_logs(endpoint=1)
+    def test_sentry_output_autoendpoint(self):
+        if os.getenv("SKIP_SENTRY"):
+            SkipTest("Skipping sentry test")
+            return
+
+        client = yield self.quick_register()
+        endpoint = self.host_endpoint(client)
+        yield self.shut_down(client)
+
+        requests.get("{}/__error__".format(endpoint))
+        # 2 events excpted: 1 from a panic and 1 from a returned Error
+        event1 = MOCK_SENTRY_QUEUE.get(timeout=5)
+        event2 = MOCK_SENTRY_QUEUE.get(timeout=1)
+        values = (
+            event1["exception"]["values"][0]["value"],
+            event2["exception"]["values"][0]["value"],
+        )
+        assert sorted(values) == ["ERROR:Success", "LogCheck"]
 
     @max_logs(conn=4)
     def test_no_sentry_output(self):