refactor: use http framework (#152)

* refactor: use http framework

* chore: update to comitted submodule

* chore: update framework versions

Author: aaron-steinfeld

hypertrace-core-graphql

@@ -36,7 +36,6 @@ dependencies {
 
   implementation("org.slf4j:slf4j-api")
   implementation("com.google.inject:guice")
-  runtimeOnly("io.grpc:grpc-netty")
 
   testImplementation("org.junit.jupiter:junit-jupiter")
   testImplementation("org.mockito:mockito-core")

hypertrace-graphql-impl/build.gradle.kts

@@ -7,12 +7,10 @@ plugins {
 
 dependencies {
   implementation("com.typesafe:config")
-  implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.21")
+  implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.42")
   implementation("org.slf4j:slf4j-api")
 
-  implementation("org.eclipse.jetty:jetty-server:9.4.42.v20210604")
-  implementation("org.eclipse.jetty:jetty-servlet:9.4.42.v20210604")
-  implementation("org.eclipse.jetty:jetty-servlets:9.4.42.v20210604")
+  implementation("org.hypertrace.core.serviceframework:platform-http-service-framework:0.1.42")
 
   implementation("com.graphql-java-kickstart:graphql-java-servlet")
   implementation(project(":hypertrace-graphql-impl"))
@@ -21,6 +19,7 @@ dependencies {
   annotationProcessor("org.projectlombok:lombok")
   compileOnly("org.projectlombok:lombok")
 
+  runtimeOnly("io.grpc:grpc-netty")
   runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl")
 
   annotationProcessor(platform(project(":hypertrace-graphql-platform")))

hypertrace-graphql-service/build.gradle.kts

@@ -1,69 +1,18 @@
 package org.hypertrace.graphql.service;
 
-import org.eclipse.jetty.server.Server;
-import org.hypertrace.core.serviceframework.PlatformService;
+import java.util.List;
 import org.hypertrace.core.serviceframework.config.ConfigClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hypertrace.core.serviceframework.http.HttpHandlerFactory;
+import org.hypertrace.core.serviceframework.http.StandAloneHttpPlatformServiceContainer;
 
-public class GraphQlService extends PlatformService {
-  private static final Logger LOG = LoggerFactory.getLogger(GraphQlService.class);
-
-  private Server server;
-  private GraphQlServiceImpl graphQlServiceImpl;
+public class GraphQlService extends StandAloneHttpPlatformServiceContainer {
 
   public GraphQlService(ConfigClient configClient) {
     super(configClient);
   }
 
   @Override
-  protected void doInit() {
-    graphQlServiceImpl = new GraphQlServiceImpl(this.getAppConfig());
-    server = new Server(graphQlServiceImpl.getGraphQlServiceConfig().getServicePort());
-    server.setHandler(graphQlServiceImpl.getContextHandler());
-    server.setStopAtShutdown(true);
-  }
-
-  @Override
-  protected void doStart() {
-    LOG.info("Starting service: {}", this.getServiceName());
-    try {
-      server.start();
-    } catch (Exception e) {
-      LOG.error("Failed to start service: {}", this.getServiceName());
-      throw new RuntimeException(e);
-    }
-
-    try {
-      server.join();
-    } catch (InterruptedException ie) {
-      Thread.currentThread().interrupt();
-      throw new RuntimeException(ie);
-    }
-  }
-
-  @Override
-  protected void doStop() {
-    LOG.info("Shutting down service: {}", this.getServiceName());
-
-    graphQlServiceImpl.shutdown();
-
-    while (!server.isStopped()) {
-      try {
-        server.stop();
-      } catch (Exception e) {
-        LOG.error("Failed to shutdown service: {}", this.getServiceName());
-        throw new RuntimeException(e);
-      }
-    }
-    try {
-      Thread.sleep(100);
-    } catch (InterruptedException ignore) {
-    }
-  }
-
-  @Override
-  public boolean healthCheck() {
-    return true;
+  protected List<HttpHandlerFactory> getHandlerFactories() {
+    return List.of(new GraphQlServiceFactory());
   }
 }

hypertrace-graphql-service/src/main/java/org/hypertrace/graphql/service/GraphQlService.java

@@ -0,0 +1,38 @@
+package org.hypertrace.graphql.service;
+
+import java.util.List;
+import org.hypertrace.core.graphql.spi.config.GraphQlServiceConfig;
+import org.hypertrace.core.serviceframework.http.HttpContainerEnvironment;
+import org.hypertrace.core.serviceframework.http.HttpHandlerDefinition;
+import org.hypertrace.core.serviceframework.http.HttpHandlerDefinition.CorsConfig;
+import org.hypertrace.core.serviceframework.http.HttpHandlerFactory;
+import org.hypertrace.graphql.config.HypertraceGraphQlServiceConfig;
+import org.hypertrace.graphql.impl.GraphQlFactory;
+
+public class GraphQlServiceFactory implements HttpHandlerFactory {
+  private static final String SERVICE_NAME = "hypertrace-graphql";
+
+  @Override
+  public List<HttpHandlerDefinition> buildHandlers(HttpContainerEnvironment environment) {
+    HypertraceGraphQlServiceConfig config =
+        new DefaultGraphQlServiceConfig(environment.getConfig(SERVICE_NAME));
+    DefaultGraphQlServiceLifecycle serviceLifecycle = new DefaultGraphQlServiceLifecycle();
+    environment.getLifecycle().shutdownComplete().thenRun(serviceLifecycle::shutdown);
+
+    return List.of(
+        HttpHandlerDefinition.builder()
+            .name("graphql")
+            .port(config.getServicePort())
+            .contextPath(config.getGraphQlUrlPath())
+            .corsConfig(buildCorsConfig(config))
+            .servlet(new GraphQlServiceHttpServlet(GraphQlFactory.build(config, serviceLifecycle)))
+            .build());
+  }
+
+  private CorsConfig buildCorsConfig(GraphQlServiceConfig config) {
+    if (!config.isCorsEnabled()) {
+      return null;
+    }
+    return CorsConfig.builder().allowedHeaders(List.of("*")).build();
+  }
+}