From 66774a63e755ee93dbf27e6e4e59fa22297421f1 Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Fri, 31 May 2024 10:03:25 -0400 Subject: [PATCH 1/2] refactor: add interceptor to verify clients are setting timeouts --- platform-grpc-service-framework/build.gradle.kts | 4 ++-- .../serviceframework/grpc/GrpcPlatformServiceContainer.java | 2 ++ platform-http-service-framework/build.gradle.kts | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/platform-grpc-service-framework/build.gradle.kts b/platform-grpc-service-framework/build.gradle.kts index 91d85ae..c5554ab 100644 --- a/platform-grpc-service-framework/build.gradle.kts +++ b/platform-grpc-service-framework/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { api(platform("io.grpc:grpc-bom:1.60.0")) api("io.grpc:grpc-api") api("io.grpc:grpc-services") - api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.2") + api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.4") api("com.typesafe:config:1.4.2") api(project(":service-framework-spi")) @@ -21,5 +21,5 @@ dependencies { implementation("io.grpc:grpc-inprocess") implementation("io.grpc:grpc-netty") implementation("org.slf4j:slf4j-api:1.7.36") - implementation("org.hypertrace.core.grpcutils:grpc-server-utils:0.13.2") + implementation("org.hypertrace.core.grpcutils:grpc-server-utils:0.13.4") } diff --git a/platform-grpc-service-framework/src/main/java/org/hypertrace/core/serviceframework/grpc/GrpcPlatformServiceContainer.java b/platform-grpc-service-framework/src/main/java/org/hypertrace/core/serviceframework/grpc/GrpcPlatformServiceContainer.java index b51277d..6d493c8 100644 --- a/platform-grpc-service-framework/src/main/java/org/hypertrace/core/serviceframework/grpc/GrpcPlatformServiceContainer.java +++ b/platform-grpc-service-framework/src/main/java/org/hypertrace/core/serviceframework/grpc/GrpcPlatformServiceContainer.java @@ -37,6 +37,7 @@ import lombok.extern.slf4j.Slf4j; import org.hypertrace.core.grpcutils.client.GrpcRegistryConfig; import org.hypertrace.core.grpcutils.client.InProcessGrpcChannelRegistry; +import org.hypertrace.core.grpcutils.client.TimeoutVerifyingClientInterceptor; import org.hypertrace.core.grpcutils.server.InterceptorUtil; import org.hypertrace.core.grpcutils.server.ServerManagementUtil; import org.hypertrace.core.serviceframework.PlatformService; @@ -238,6 +239,7 @@ protected InProcessGrpcChannelRegistry buildChannelRegistry() { timerBuilder -> timerBuilder.serviceLevelObjectives(generateLatencyHistogramBuckets()), Status.Code.OK)) + .defaultInterceptor(new TimeoutVerifyingClientInterceptor()) .build()); } diff --git a/platform-http-service-framework/build.gradle.kts b/platform-http-service-framework/build.gradle.kts index e12bcc9..6de765c 100644 --- a/platform-http-service-framework/build.gradle.kts +++ b/platform-http-service-framework/build.gradle.kts @@ -5,7 +5,7 @@ plugins { dependencies { api(project(":platform-service-framework")) - api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.2") + api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.4") api("com.typesafe:config:1.4.2") api("javax.servlet:javax.servlet-api:4.0.1") api("com.google.inject:guice:5.1.0") From c3206870a06b577b5b0726fafa94ec6a913d556a Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Fri, 31 May 2024 10:17:40 -0400 Subject: [PATCH 2/2] chore: update suppression --- owasp-suppressions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/owasp-suppressions.xml b/owasp-suppressions.xml index a41c8d4..9c3da7e 100644 --- a/owasp-suppressions.xml +++ b/owasp-suppressions.xml @@ -8,7 +8,7 @@ cpe:/a:grpc:grpc cpe:/a:utils_project:utils - +