Skip to content

refactor: add interceptor to verify clients are setting timeouts #98

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 2 commits into from
May 31, 2024
Merged

refactor: add interceptor to verify clients are setting timeouts #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66774a6
refactor: add interceptor to verify clients are setting timeouts
aaron-steinfeld May 31, 2024
c320687
chore: update suppression
aaron-steinfeld May 31, 2024
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 owasp-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<cpe>cpe:/a:grpc:grpc</cpe>
<cpe>cpe:/a:utils_project:utils</cpe>
</suppress>
<suppress until="2024-05-31Z">
<suppress until="2024-07-31Z">
<notes><![CDATA[
This CVE is declared fixed from 9.4.52, but the vuln db is not reflecting that. Suppress that specific version until
db is updated.
Expand Down
4 changes: 2 additions & 2 deletions platform-grpc-service-framework/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))

Expand All @@ -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")
}
2 changes: 2 additions & 0 deletions ...src/main/java/org/hypertrace/core/serviceframework/grpc/GrpcPlatformServiceContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -238,6 +239,7 @@ protected InProcessGrpcChannelRegistry buildChannelRegistry() {
timerBuilder ->
timerBuilder.serviceLevelObjectives(generateLatencyHistogramBuckets()),
Status.Code.OK))
.defaultInterceptor(new TimeoutVerifyingClientInterceptor())
.build());
}

Expand Down
2 changes: 1 addition & 1 deletion platform-http-service-framework/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down