feat: add support for configuring query timeout

Author: aaron-steinfeld

helm/templates/serviceconfig.yaml

@@ -16,6 +16,7 @@ data:
 
     graphql.urlPath = {{ .Values.serviceConfig.urlPath }}
     graphql.corsEnabled = {{ .Values.serviceConfig.corsEnabled }}
+    graphql.timeout = {{ .Values.serviceConfig.timeoutDuration }}
 
     attribute.service = {
       host = {{ .Values.serviceConfig.attributeService.host }}

helm/values.yaml

@@ -46,6 +46,7 @@ serviceConfig:
   urlPath: /graphql
   corsEnabled: true
   defaultTenantId: ""
+  timeoutDuration: 30s
   attributeService:
     host: attribute-service
     port: 9012

hypertrace-core-graphql

@@ -15,6 +15,7 @@ public static GraphQLConfiguration build(
 
     return GraphQLConfiguration.with(injector.getInstance(GraphQLSchema.class))
         .with(injector.getInstance(GraphQlRequestContextBuilder.class))
+        .asyncTimeout(config.getGraphQlTimeout().toMillis())
         .build();
   }
 }

hypertrace-graphql-impl/src/main/java/org/hypertrace/graphql/impl/GraphQlFactory.java

@@ -17,6 +17,7 @@ class DefaultGraphQlServiceConfig implements HypertraceGraphQlServiceConfig {
 
   private static final String GRAPHQL_URL_PATH = "graphql.urlPath";
   private static final String GRAPHQL_CORS_ENABLED = "graphql.corsEnabled";
+  private static final String GRAPHQL_TIMEOUT = "graphql.timeout";
 
   private static final String DEFAULT_TENANT_ID = "defaultTenantId";
 
@@ -40,8 +41,9 @@ class DefaultGraphQlServiceConfig implements HypertraceGraphQlServiceConfig {
 
   String serviceName;
   int servicePort;
-  String graphqlUrlPath;
+  String graphQlUrlPath;
   boolean corsEnabled;
+  Duration graphQlTimeout;
   Optional<String> defaultTenantId;
   int maxIoThreads;
   String attributeServiceHost;
@@ -60,8 +62,9 @@ class DefaultGraphQlServiceConfig implements HypertraceGraphQlServiceConfig {
   DefaultGraphQlServiceConfig(Config untypedConfig) {
     this.serviceName = untypedConfig.getString(SERVICE_NAME_CONFIG);
     this.servicePort = untypedConfig.getInt(SERVICE_PORT_CONFIG);
-    this.graphqlUrlPath = untypedConfig.getString(GRAPHQL_URL_PATH);
+    this.graphQlUrlPath = untypedConfig.getString(GRAPHQL_URL_PATH);
     this.corsEnabled = untypedConfig.getBoolean(GRAPHQL_CORS_ENABLED);
+    this.graphQlTimeout = untypedConfig.getDuration(GRAPHQL_TIMEOUT);
     this.defaultTenantId = optionallyGet(() -> untypedConfig.getString(DEFAULT_TENANT_ID));
     this.maxIoThreads = untypedConfig.getInt(MAX_IO_THREADS_PROPERTY);
 

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

@@ -23,15 +23,15 @@ public GraphQlServiceImpl(Config appConfig) {
     if (this.graphQlServiceConfig.isCorsEnabled()) {
       contextHandler.addFilter(
           CrossOriginFilter.class,
-          this.graphQlServiceConfig.getGraphqlUrlPath(),
+          this.graphQlServiceConfig.getGraphQlUrlPath(),
           EnumSet.of(DispatcherType.REQUEST));
     }
 
     contextHandler.addServlet(
         new ServletHolder(
             new GraphQlServiceHttpServlet(
                 GraphQlFactory.build(this.graphQlServiceConfig, this.serviceLifecycle))),
-        this.graphQlServiceConfig.getGraphqlUrlPath());
+        this.graphQlServiceConfig.getGraphQlUrlPath());
   }
 
   public GraphQlServiceConfig getGraphQlServiceConfig() {

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

@@ -5,6 +5,7 @@ service.admin.port = 23432
 
 graphql.urlPath = /graphql
 graphql.corsEnabled = true
+graphql.timeout = 30s
 
 defaultTenantId = ${?DEFAULT_TENANT_ID}