Skip to content

chore(gateway-service): configurable max channel inbound message size #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 3, 2023
Merged

chore(gateway-service): configurable max channel inbound message size #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cd3f8a
chore(gateway-service): configurable max channel inbound message size
skjindal93 Aug 1, 2023
e0dbc3d
upgrade submodule
skjindal93 Aug 2, 2023
59a3ef8
Merge branch 'main' into gateway+service+max+inbound+message+size
skjindal93 Aug 2, 2023
8e9a949
club configs
skjindal93 Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hypertrace-core-graphql
Open in desktop
Submodule hypertrace-core-graphql updated 3 files
+10 −0 ...ace-core-graphql-service/src/main/java/org/hypertrace/core/graphql/service/DefaultGraphQlServiceConfig.java
+3 −0 hypertrace-core-graphql-service/src/main/resources/configs/common/application.conf
+2 −0 hypertrace-core-graphql-spi/src/main/java/org/hypertrace/core/graphql/spi/config/GraphQlServiceConfig.java
2 changes: 2 additions & 0 deletions hypertrace-graphql-entity-schema/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ dependencies {
implementation("org.hypertrace.core.graphql:hypertrace-core-graphql-deserialization")
implementation("org.hypertrace.core.graphql:hypertrace-core-graphql-rx-utils")

implementation("org.hypertrace.core.grpcutils:grpc-client-utils")

implementation(project(":hypertrace-graphql-labels-schema-api"))

testImplementation("org.junit.jupiter:junit-jupiter")
Expand Down
10 changes: 9 additions & 1 deletion ...ntity-schema/src/main/java/org/hypertrace/graphql/entity/dao/GatewayServiceEntityDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.hypertrace.core.graphql.spi.config.GraphQlServiceConfig;
import org.hypertrace.core.graphql.utils.grpc.GrpcChannelRegistry;
import org.hypertrace.core.graphql.utils.grpc.GrpcContextBuilder;
import org.hypertrace.core.grpcutils.client.GrpcChannelConfig;
import org.hypertrace.gateway.service.GatewayServiceGrpc;
import org.hypertrace.gateway.service.GatewayServiceGrpc.GatewayServiceFutureStub;
import org.hypertrace.gateway.service.v1.common.Value;
Expand Down Expand Up @@ -63,10 +64,17 @@ class GatewayServiceEntityDao implements EntityDao {
this.serviceConfig = serviceConfig;
this.boundedIoScheduler = boundedIoScheduler;

final GrpcChannelConfig grpcChannelConfig =
GrpcChannelConfig.builder()
.maxInboundMessageSize(serviceConfig.getGatewayServiceMaxInboundMessageSize())
.build();

this.gatewayServiceStub =
GatewayServiceGrpc.newFutureStub(
grpcChannelRegistry.forAddress(
serviceConfig.getGatewayServiceHost(), serviceConfig.getGatewayServicePort()))
serviceConfig.getGatewayServiceHost(),
serviceConfig.getGatewayServicePort(),
grpcChannelConfig))
.withCallCredentials(credentials);
}

Expand Down
27 changes: 17 additions & 10 deletions ...hql-service/src/main/java/org/hypertrace/graphql/service/DefaultGraphQlServiceConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ class DefaultGraphQlServiceConfig implements HypertraceGraphQlServiceConfig {
private static final String GATEWAY_SERVICE_HOST_PROPERTY = "gateway.service.host";
private static final String GATEWAY_SERVICE_PORT_PROPERTY = "gateway.service.port";
private static final String GATEWAY_SERVICE_CLIENT_TIMEOUT = "gateway.service.timeout";
private static final String GATEWAY_SERVICE_CLIENT_MAX_INBOUND_MESSAGE_SIZE =
"gateway.service.maxMessageSize.inbound";

private static final String ENTITY_SERVICE_HOST_PROPERTY = "entity.service.host";
private static final String ENTITY_SERVICE_PORT_PROPERTY = "entity.service.port";
Expand All @@ -54,6 +56,7 @@ class DefaultGraphQlServiceConfig implements HypertraceGraphQlServiceConfig {
String gatewayServiceHost;
int gatewayServicePort;
Duration gatewayServiceTimeout;
int gatewayServiceMaxInboundMessageSize;
String entityServiceHost;
int entityServicePort;
Duration entityServiceTimeout;
Expand All @@ -73,25 +76,29 @@ class DefaultGraphQlServiceConfig implements HypertraceGraphQlServiceConfig {

this.attributeServiceHost = untypedConfig.getString(ATTRIBUTE_SERVICE_HOST_PROPERTY);
this.attributeServicePort = untypedConfig.getInt(ATTRIBUTE_SERVICE_PORT_PROPERTY);
this.attributeServiceTimeout =
getSuppliedDurationOrFallback(
() -> untypedConfig.getDuration(ATTRIBUTE_SERVICE_CLIENT_TIMEOUT));

this.gatewayServiceHost = untypedConfig.getString(GATEWAY_SERVICE_HOST_PROPERTY);
this.gatewayServicePort = untypedConfig.getInt(GATEWAY_SERVICE_PORT_PROPERTY);
this.entityServiceHost = untypedConfig.getString(ENTITY_SERVICE_HOST_PROPERTY);
this.entityServicePort = untypedConfig.getInt(ENTITY_SERVICE_PORT_PROPERTY);
this.configServiceHost = untypedConfig.getString(CONFIG_SERVICE_HOST_PROPERTY);
this.configServicePort = untypedConfig.getInt(CONFIG_SERVICE_PORT_PROPERTY);

this.gatewayServiceTimeout =
getSuppliedDurationOrFallback(
() -> untypedConfig.getDuration(GATEWAY_SERVICE_CLIENT_TIMEOUT));
this.attributeServiceTimeout =
this.gatewayServiceMaxInboundMessageSize =
untypedConfig.getBytes(GATEWAY_SERVICE_CLIENT_MAX_INBOUND_MESSAGE_SIZE).intValue();

this.entityServiceHost = untypedConfig.getString(ENTITY_SERVICE_HOST_PROPERTY);
this.entityServicePort = untypedConfig.getInt(ENTITY_SERVICE_PORT_PROPERTY);
this.entityServiceTimeout =
getSuppliedDurationOrFallback(
() -> untypedConfig.getDuration(ATTRIBUTE_SERVICE_CLIENT_TIMEOUT));
() -> untypedConfig.getDuration(ENTITY_SERVICE_CLIENT_TIMEOUT));

this.configServiceHost = untypedConfig.getString(CONFIG_SERVICE_HOST_PROPERTY);
this.configServicePort = untypedConfig.getInt(CONFIG_SERVICE_PORT_PROPERTY);
this.configServiceTimeout =
getSuppliedDurationOrFallback(
() -> untypedConfig.getDuration(CONFIG_SERVICE_CLIENT_TIMEOUT));
this.entityServiceTimeout =
getSuppliedDurationOrFallback(
() -> untypedConfig.getDuration(ENTITY_SERVICE_CLIENT_TIMEOUT));
}

private Duration getSuppliedDurationOrFallback(Supplier<Duration> durationSupplier) {
Expand Down
4 changes: 4 additions & 0 deletions hypertrace-graphql-service/src/main/resources/configs/common/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ gateway.service = {
host = ${?GATEWAY_SERVICE_HOST_CONFIG}
port = 50071
port = ${?GATEWAY_SERVICE_PORT_CONFIG}
maxMessageSize = {
inbound = 4MiB
inbound = ${?GATEWAY_SERVICE_MAX_INBOUND_MESSAGE_SIZE_CONFIG}
}
}

entity.service = {
Expand Down