Cleanup app and tests

A lot of the extra stuff we had for logging exceptions and
such aren't required any longer as the WASI bits are working
as they ought to, so we can gut all of that.

Also, fixed vcpu_time which does return an integer number
of milliseconds in the viceroy impl, so assert on that.

Author: posborne

app.py

@@ -2,12 +2,11 @@
 
 from bottle import Bottle
 from wit_world.exports import HttpIncoming as BaseHttpIncoming
-from wit_world.imports import http_body, http_resp, log
+from wit_world.imports import compute_runtime, http_body, http_resp, log
 from wit_world.imports.http_resp import send_downstream
 
 # Enable a bit more debug logging from the framework.
 app = Bottle()
-app.catchall = False  # bottle backtrace causes issues; use our own.
 
 
 @app.route("/hello/<name>")
@@ -21,13 +20,7 @@ def info():
     from bottle import request
 
     # Get some runtime info we can test
-    vcpu_time = None
-    try:
-        from wit_world.imports import compute_runtime
-
-        vcpu_time = compute_runtime.get_vcpu_ms()
-    except Exception:
-        pass
+    vcpu_time = compute_runtime.get_vcpu_ms()
 
     return {
         "service": "fastly-compute-python",
@@ -39,18 +32,6 @@ def info():
     }
 
 
-def print(*args):
-    # hack to allow print locally; so far, monkeypatching
-    # sys.stdout/sys.stderr hasn't panned out, so more
-    # research required.
-    log_ep.write(" ".join(args).encode())
-
-
-def init():
-    global log_ep
-    log_ep = log.Endpoint.get("")
-
-
 class StdErr:
     """File-like object to receive errors and direct them to our logging endpoint"""
 
@@ -98,33 +79,4 @@ def start_response(status: str, headers: list[tuple], exc_info=None):
 
 class HttpIncoming(BaseHttpIncoming):
     def handle(self, request, body):
-        init()
-        try:
-            serve_wsgi_request(request, body, app)
-        except Exception as e:
-            log_exception(e)
-
-
-def log_exception(e):
-    """Pretty-print an exception to our logging endpoint.
-
-    Do it without callling format_exc(), which calls stat() to determine whether
-    we're in a tty and what its width is. stat() and other fd routines currently
-    crash when they try to access stdout or stderr, probably because they are
-    not in the preopens.
-    """
-    try:
-        print(f"Exception {type(e).__name__} - {e}")
-        print("--- Traceback Follows ---")
-
-        current_tb = e.__traceback__
-        while current_tb:
-            frame = current_tb.tb_frame
-            print(
-                f"  File: {frame.f_code.co_filename}, "
-                f"Function: {frame.f_code.co_name}, "
-                f"Line: {frame.f_lineno}"
-            )
-            current_tb = current_tb.tb_next
-    except Exception as e2:
-        print(f"print_exc failed {e2}")
+        serve_wsgi_request(request, body, app)

tests/test_integration.py

@@ -161,7 +161,7 @@ def test_info_endpoint(self, viceroy_server):
 
         # Check WIT API data
         assert "vcpu_time_ms" in data
-        assert isinstance(data["vcpu_time_ms"], int | type(None))
+        assert isinstance(data["vcpu_time_ms"], int)
 
         # Check request data
         assert data["request_method"] == "GET"
@@ -172,13 +172,3 @@ def test_nonexistent_endpoint(self, viceroy_server):
         response = self._get("/nonexistent", viceroy_server)
 
         assert response.status_code == 404
-
-    def test_service_health(self, viceroy_server):
-        """Test that the service is healthy and responsive."""
-        # Make multiple requests to ensure stability
-        for _ in range(3):
-            response = self._get("/info", viceroy_server)
-            assert response.status_code == 200
-
-            data = response.json()
-            assert data["status"] == "ok"