diff --git a/helm/templates/serviceconfig.yaml b/helm/templates/serviceconfig.yaml index ce8e86dd..6df85802 100644 --- a/helm/templates/serviceconfig.yaml +++ b/helm/templates/serviceconfig.yaml @@ -18,6 +18,9 @@ data: graphql.corsEnabled = {{ .Values.serviceConfig.corsEnabled }} graphql.timeout = {{ .Values.serviceConfig.timeoutDuration }} + threads.io.max = {{ .Values.serviceConfig.threads.io }} + threads.request.max = {{ .Values.serviceConfig.threads.request }} + attribute.service = { host = {{ .Values.serviceConfig.attributeService.host }} port = {{ .Values.serviceConfig.attributeService.port }} diff --git a/helm/values.yaml b/helm/values.yaml index 6147b7d3..d3d4029f 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -47,6 +47,9 @@ serviceConfig: corsEnabled: true defaultTenantId: "" timeoutDuration: 30s + threads: + io: 10 + request: 10 attributeService: host: attribute-service port: 9012 diff --git a/hypertrace-core-graphql b/hypertrace-core-graphql index 74f3d81d..5b612df8 160000 --- a/hypertrace-core-graphql +++ b/hypertrace-core-graphql @@ -1 +1 @@ -Subproject commit 74f3d81d7329bc58e143f2b7d7d99b29250aa2ce +Subproject commit 5b612df8236f1c049ee2c55f9504eac85262a230 diff --git a/hypertrace-graphql-service/src/main/java/org/hypertrace/graphql/service/DefaultGraphQlServiceConfig.java b/hypertrace-graphql-service/src/main/java/org/hypertrace/graphql/service/DefaultGraphQlServiceConfig.java index d0f048fc..c9c70286 100644 --- a/hypertrace-graphql-service/src/main/java/org/hypertrace/graphql/service/DefaultGraphQlServiceConfig.java +++ b/hypertrace-graphql-service/src/main/java/org/hypertrace/graphql/service/DefaultGraphQlServiceConfig.java @@ -22,6 +22,7 @@ class DefaultGraphQlServiceConfig implements HypertraceGraphQlServiceConfig { private static final String DEFAULT_TENANT_ID = "defaultTenantId"; private static final String MAX_IO_THREADS_PROPERTY = "threads.io.max"; + private static final String MAX_REQUEST_THREADS_PROPERTY = "threads.request.max"; private static final String ATTRIBUTE_SERVICE_HOST_PROPERTY = "attribute.service.host"; private static final String ATTRIBUTE_SERVICE_PORT_PROPERTY = "attribute.service.port"; @@ -46,6 +47,7 @@ class DefaultGraphQlServiceConfig implements HypertraceGraphQlServiceConfig { Duration graphQlTimeout; Optional defaultTenantId; int maxIoThreads; + int maxRequestThreads; String attributeServiceHost; int attributeServicePort; Duration attributeServiceTimeout; @@ -67,6 +69,7 @@ class DefaultGraphQlServiceConfig implements HypertraceGraphQlServiceConfig { this.graphQlTimeout = untypedConfig.getDuration(GRAPHQL_TIMEOUT); this.defaultTenantId = optionallyGet(() -> untypedConfig.getString(DEFAULT_TENANT_ID)); this.maxIoThreads = untypedConfig.getInt(MAX_IO_THREADS_PROPERTY); + this.maxRequestThreads = untypedConfig.getInt(MAX_REQUEST_THREADS_PROPERTY); this.attributeServiceHost = untypedConfig.getString(ATTRIBUTE_SERVICE_HOST_PROPERTY); this.attributeServicePort = untypedConfig.getInt(ATTRIBUTE_SERVICE_PORT_PROPERTY); diff --git a/hypertrace-graphql-service/src/main/resources/configs/common/application.conf b/hypertrace-graphql-service/src/main/resources/configs/common/application.conf index 0171eed1..3248d288 100644 --- a/hypertrace-graphql-service/src/main/resources/configs/common/application.conf +++ b/hypertrace-graphql-service/src/main/resources/configs/common/application.conf @@ -10,6 +10,7 @@ graphql.timeout = 30s defaultTenantId = ${?DEFAULT_TENANT_ID} threads.io.max = 10 +threads.request.max = 10 attribute.service = { host = localhost