chore(implementation)!: use Jetty-12 core without servlets

Port the invoker to upgrade to Eclipse Jetty-12 version 12.  Specifically using the new core APIs of Eclipse Jetty-12 that allow the overhead of a Servlet container to be avoided.

BREAKING CHANGE: use Java 17 or above, as required by Eclipse Jetty-12.

Signed-off-by: Lachlan Roberts <[email protected]>

Author: lachlan-roberts

invoker/core/pom.xml

@@ -23,7 +23,7 @@
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
     <cloudevents.sdk.version>4.0.1</cloudevents.sdk.version>
-    <jetty.version>12.1.1</jetty.version>
+    <jetty.version>12.1.3</jetty.version>
   </properties>
 
   <licenses>

invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java

@@ -345,8 +345,7 @@ public boolean handle(Request req, Response res, Callback callback) throws Excep
       callback.succeeded();
     } catch (Throwable t) {
       logger.log(Level.SEVERE, "Failed to execute " + functionExecutor.functionName(), t);
-      res.setStatus(HttpStatus.INTERNAL_SERVER_ERROR_500);
-      callback.succeeded();
+      Response.writeError(req, res, callback, HttpStatus.INTERNAL_SERVER_ERROR_500, null);
     } finally {
       executionIdUtil.removeExecutionId();
     }

invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpRequestImpl.java

@@ -21,16 +21,16 @@
 import java.io.InputStreamReader;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.TreeMap;
-import org.eclipse.jetty.http.*;
+import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.http.MimeTypes;
 import org.eclipse.jetty.http.MultiPart.Part;
+import org.eclipse.jetty.http.MultiPartFormData;
 import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.util.Fields;
@@ -144,15 +144,7 @@ public BufferedReader getReader() throws IOException {
 
   @Override
   public Map<String, List<String>> getHeaders() {
-    return toStringListMap(request.getHeaders());
-  }
-
-  static Map<String, List<String>> toStringListMap(HttpFields headers) {
-    Map<String, List<String>> map = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-    for (HttpField field : headers) {
-      map.computeIfAbsent(field.getName(), key -> new ArrayList<>()).add(field.getValue());
-    }
-    return map;
+    return HttpUtil.toStringListMap(request.getHeaders());
   }
 
   private static class HttpPartImpl implements HttpPart {
@@ -186,8 +178,7 @@ public Optional<String> getCharacterEncoding() {
 
     @Override
     public InputStream getInputStream() throws IOException {
-        // TODO: update with createContentSource when https://github.com/jetty/jetty.project/pull/13610 is released.
-        Content.Source contentSource = part.newContentSource(null, 0, -1);
+        Content.Source contentSource = part.createContentSource();
         return Content.Source.asInputStream(contentSource);
     }
 
@@ -202,7 +193,7 @@ public BufferedReader getReader() throws IOException {
 
     @Override
     public Map<String, List<String>> getHeaders() {
-      return HttpRequestImpl.toStringListMap(part.getHeaders());
+      return HttpUtil.toStringListMap(part.getHeaders());
     }
 
     @Override

invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java

@@ -77,14 +77,15 @@ public void appendHeader(String key, String value) {
 
   @Override
   public Map<String, List<String>> getHeaders() {
-    return HttpRequestImpl.toStringListMap(response.getHeaders());
+    return HttpUtil.toStringListMap(response.getHeaders());
   }
 
   @Override
   public OutputStream getOutputStream() {
     if (writer != null) {
       throw new IllegalStateException("getWriter called");
-    } else if (outputStream == null) {
+    }
+    if (outputStream == null) {
       Request request = response.getRequest();
       int outputBufferSize = request.getConnectionMetaData().getHttpConfiguration()
           .getOutputBufferSize();

invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpUtil.java

@@ -0,0 +1,32 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.cloud.functions.invoker.http;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import org.eclipse.jetty.http.HttpField;
+import org.eclipse.jetty.http.HttpFields;
+
+class HttpUtil {
+  public static Map<String, List<String>> toStringListMap(HttpFields headers) {
+    Map<String, List<String>> map = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+    for (HttpField field : headers) {
+      map.computeIfAbsent(field.getName(), key -> new ArrayList<>()).add(field.getValue());
+    }
+    return map;
+  }
+}

invoker/core/src/main/java/com/google/cloud/functions/invoker/http/TimeoutHandler.java

@@ -1,4 +1,4 @@
-// Copyright 2024 Google LLC
+// Copyright 2025 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java

@@ -173,6 +173,13 @@ abstract static class TestCase {
 
     abstract int expectedResponseCode();
 
+    /**
+     * Expected response headers map, header name -> value.
+     * Value "*" asserts the header is present with any value.
+     * Value "-" asserts the header is not present.
+     *
+     * @return the expected response headers for this test case.
+     */
     abstract Optional<Map<String, String>> expectedResponseHeaders();
 
     abstract Optional<String> expectedResponseText();
@@ -269,10 +276,39 @@ public void helloWorld() throws Exception {
             ROBOTS_TXT_TEST_CASE));
   }
 
+  @Test
+  public void timeoutHttpSuccess() throws Exception {
+    testFunction(
+        SignatureType.HTTP,
+        fullTarget("TimeoutHttp"),
+        ImmutableList.of(),
+        ImmutableList.of(
+            TestCase.builder()
+                .setExpectedResponseText("finished\n")
+                .setExpectedResponseText(Optional.empty())
+                .build()),
+        ImmutableMap.of("CLOUD_RUN_TIMEOUT_SECONDS", "3"));
+  }
+
+  @Test
+  public void timeoutHttpTimesOut() throws Exception {
+    testFunction(
+        SignatureType.HTTP,
+        fullTarget("TimeoutHttp"),
+        ImmutableList.of(),
+        ImmutableList.of(
+            TestCase.builder()
+                .setExpectedResponseCode(408)
+                .setExpectedResponseText(Optional.empty())
+                .build()),
+        ImmutableMap.of("CLOUD_RUN_TIMEOUT_SECONDS", "1"));
+  }
+
   @Test
   public void bufferedWrites() throws Exception {
-    // This test checks that writes are buffered and are written
-    // in an efficient way with known content-length if possible.
+    // This test checks that writes are buffered, and are written
+    // in an efficient way with known content-length if possible
+    // instead of doing a chunked response.
     testHttpFunction(
         fullTarget("BufferedWrites"),
         ImmutableList.of(
@@ -798,26 +834,26 @@ private void testFunction(
       throws Exception {
     ServerProcess serverProcess =
         startServer(signatureType, target, extraArgs, environmentVariables);
+    HttpClient httpClient = new HttpClient();
     try {
-      HttpClient httpClient = new HttpClient();
       httpClient.start();
       for (TestCase testCase : testCases) {
         testCase.snoopFile().ifPresent(File::delete);
         String uri = "http://localhost:" + serverPort + testCase.url();
         Request request = httpClient.POST(uri);
 
-        request.headers(m -> {
-          testCase.httpContentType().ifPresent(contentType -> m.put(HttpHeader.CONTENT_TYPE, contentType));
-          testCase.httpHeaders().forEach(m::put);
+        request.headers(headers -> {
+          testCase.httpContentType().ifPresent(contentType -> headers.put(HttpHeader.CONTENT_TYPE, contentType));
+          testCase.httpHeaders().forEach(headers::put);
         });
         request.body(testCase.requestContent());
         ContentResponse response = request.send();
         expect
             .withMessage("Response to %s is %s %s", uri, response.getStatus(), response.getReason())
             .that(response.getStatus())
             .isEqualTo(testCase.expectedResponseCode());
-        testCase.expectedResponseHeaders().ifPresent(map -> {
-          for (Map.Entry<String, String> entry : map.entrySet()) {
+        testCase.expectedResponseHeaders().ifPresent(expectedResponseHeaders -> {
+          for (Map.Entry<String, String> entry : expectedResponseHeaders.entrySet()) {
             if ("*".equals(entry.getValue())) {
               expect.that(response.getHeaders().getFieldNamesCollection()).contains(entry.getKey());
             } else if ("-".equals(entry.getValue())) {
@@ -839,6 +875,7 @@ private void testFunction(
       }
     } finally {
       serverProcess.close();
+      httpClient.stop();
     }
     for (TestCase testCase : testCases) {
       testCase

invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java

@@ -40,8 +40,12 @@
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.MultiPartRequestContent;
 import org.eclipse.jetty.client.StringRequestContent;
-import org.eclipse.jetty.http.*;
+import org.eclipse.jetty.http.HttpFields;
+import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.http.HttpStatus.Code;
+import org.eclipse.jetty.http.MultiPart;
+import org.eclipse.jetty.http.MultiPartConfig;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Response;
@@ -309,16 +313,10 @@ private HttpRequestHandler(
     @Override
     public boolean handle(Request request, Response response, Callback callback) {
       try {
-        if (!HttpMethod.POST.is(request.getMethod())) {
-          response.setStatus(HttpStatus.METHOD_NOT_ALLOWED_405);
-          callback.succeeded();
-          return true;
-        }
-
         testReference.get().test(new HttpRequestImpl(request));
       } catch (Throwable t) {
-        t.printStackTrace();
         exceptionReference.set(t);
+        Response.writeError(request, response, callback, t);
       }
       callback.succeeded();
       return true;
@@ -397,9 +395,6 @@ private HttpResponseHandler(
 
     @Override
     public boolean handle(Request request, Response response, Callback callback) {
-      if (!HttpMethod.POST.is(request.getMethod())) {
-        return false;
-      }
       try {
         testReference.get().test(new HttpResponseImpl(response));
         callback.succeeded();
@@ -462,10 +457,10 @@ private void httpResponseEffects(
           response -> response.setStatusCode(HttpStatus.IM_A_TEAPOT_418),
           response -> assertThat(response.getStatus()).isEqualTo(HttpStatus.IM_A_TEAPOT_418)),
       responseTest(
-          // reason string cannot be set by application
           response -> response.setStatusCode(HttpStatus.IM_A_TEAPOT_418, "Je suis une théière"),
           response -> {
             assertThat(response.getStatus()).isEqualTo(HttpStatus.IM_A_TEAPOT_418);
+            // Reason string cannot be set by the application.
             assertThat(response.getReason()).isEqualTo(Code.IM_A_TEAPOT.getMessage());
           }),
       responseTest(