Import of Cloud Functions JVM from Git-on-Borg.

  - 101c6e2f72af2496f6fb6fc6e67d32cfab3ffced Update the Converter for better ClassLoader separation. by Éamonn McManus <[email protected]>

PiperOrigin-RevId: 289176564

Author: eamonnmcmanus

invoker-core/core/pom.xml

@@ -130,36 +130,18 @@
 
   <build>
     <plugins>
-      <!-- Rename dependencies used by invoker-core so that they don't interfere with user dependencies -->
       <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.1</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <relocations>
-                <relocation>
-                  <pattern>com</pattern>
-                  <shadedPattern>shaded.com.google.cloud.functions</shadedPattern>
-                  <excludes>
-                    <exclude>com.google.cloud.functions.**</exclude>
-                    <exclude>com.google.gson.**</exclude>
-                  </excludes>
-                </relocation>
-              </relocations>
-              <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                  <mainClass>com.google.cloud.functions.invoker.runner.Invoker</mainClass>
-                </transformer>
-              </transformers>
-            </configuration>
-          </execution>
-        </executions>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.1.2</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <mainClass>com.google.cloud.functions.invoker.runner.Invoker</mainClass>
+              <addClasspath>true</addClasspath>
+              <classpathPrefix>lib</classpathPrefix>
+            </manifest>
+          </archive>
+        </configuration>
       </plugin>
     </plugins>
   </build>

invoker-core/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java

@@ -14,6 +14,9 @@
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.Optional;
@@ -85,8 +88,13 @@ public static void main(String[] args) throws Exception {
             .filter(Objects::nonNull)
             .findFirst()
             .orElse("TestFunction.function");
+    Path standardFunctionJarPath = Paths.get("function/function.jar");
     Optional<String> functionJarPath =
-        Arrays.asList(line.getOptionValue("jar"), System.getenv("FUNCTION_JAR")).stream()
+        Arrays.asList(
+                line.getOptionValue("jar"),
+                System.getenv("FUNCTION_JAR"),
+                Files.exists(standardFunctionJarPath) ? standardFunctionJarPath.toString() : null)
+            .stream()
             .filter(Objects::nonNull)
             .findFirst();
     Invoker invoker =
@@ -221,7 +229,8 @@ private static class OnlyApiClassLoader extends ClassLoader {
     @Override
     protected Class<?> findClass(String name) throws ClassNotFoundException {
       String prefix = "com.google.cloud.functions.";
-      if (name.startsWith(prefix) && Character.isUpperCase(name.charAt(prefix.length()))) {
+      if ((name.startsWith(prefix) && Character.isUpperCase(name.charAt(prefix.length())))
+              || name.startsWith("javax.servlet.")) {
         return runtimeClassLoader.loadClass(name);
       }
       return super.findClass(name); // should throw ClassNotFoundException

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

@@ -350,7 +350,10 @@ private ServerProcess startServer(
     Future<?> outputMonitorResult = EXECUTOR.submit(
         () -> monitorOutput(serverProcess.getInputStream(), ready));
     boolean serverReady = ready.await(5, TimeUnit.SECONDS);
-    assertWithMessage("Waiting for server to be ready").that(serverReady).isTrue();
+    if (!serverReady) {
+      serverProcess.destroy();
+      throw new AssertionError("Server never became ready");
+    }
     return ServerProcess.of(serverProcess, outputMonitorResult);
   }
 

invoker-core/functionjar/pom.xml

@@ -48,7 +48,7 @@
           <archive>
             <manifest>
               <addClasspath>true</addClasspath>
-              <classpathPrefix>dependency</classpathPrefix>
+              <classpathPrefix>lib</classpathPrefix>
             </manifest>
           </archive>
         </configuration>
@@ -76,6 +76,9 @@
             <goals>
               <goal>copy-dependencies</goal>
             </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/lib</outputDirectory>
+            </configuration>
           </execution>
         </executions>
       </plugin>