From 3ae24539f834b97a50da7a07b5e78d6a4ce6e658 Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Fri, 25 Aug 2023 20:04:42 -0400 Subject: [PATCH] refactor: update http framework to provide inprocess grpc reg --- .../serviceframework/http/HttpContainerEnvironment.java | 4 ++-- .../http/StandAloneHttpContainerEnvironment.java | 4 ++-- .../http/StandAloneHttpPlatformServiceContainer.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/HttpContainerEnvironment.java b/platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/HttpContainerEnvironment.java index f4ec985..ef1901a 100644 --- a/platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/HttpContainerEnvironment.java +++ b/platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/HttpContainerEnvironment.java @@ -1,11 +1,11 @@ package org.hypertrace.core.serviceframework.http; import com.typesafe.config.Config; -import org.hypertrace.core.grpcutils.client.GrpcChannelRegistry; +import org.hypertrace.core.grpcutils.client.InProcessGrpcChannelRegistry; import org.hypertrace.core.serviceframework.spi.PlatformServiceLifecycle; public interface HttpContainerEnvironment { - GrpcChannelRegistry getChannelRegistry(); + InProcessGrpcChannelRegistry getChannelRegistry(); Config getConfig(String serviceName); diff --git a/platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/StandAloneHttpContainerEnvironment.java b/platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/StandAloneHttpContainerEnvironment.java index b0cb9da..bd577fa 100644 --- a/platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/StandAloneHttpContainerEnvironment.java +++ b/platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/StandAloneHttpContainerEnvironment.java @@ -3,13 +3,13 @@ import com.typesafe.config.Config; import lombok.AllArgsConstructor; import lombok.Getter; -import org.hypertrace.core.grpcutils.client.GrpcChannelRegistry; +import org.hypertrace.core.grpcutils.client.InProcessGrpcChannelRegistry; import org.hypertrace.core.serviceframework.config.ConfigClient; import org.hypertrace.core.serviceframework.spi.PlatformServiceLifecycle; @AllArgsConstructor public class StandAloneHttpContainerEnvironment implements HttpContainerEnvironment { - @Getter private final GrpcChannelRegistry channelRegistry; + @Getter private final InProcessGrpcChannelRegistry channelRegistry; @Getter private final PlatformServiceLifecycle lifecycle; private final ConfigClient configClient; diff --git a/platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/StandAloneHttpPlatformServiceContainer.java b/platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/StandAloneHttpPlatformServiceContainer.java index 261a2f6..989ccf6 100644 --- a/platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/StandAloneHttpPlatformServiceContainer.java +++ b/platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/StandAloneHttpPlatformServiceContainer.java @@ -7,8 +7,8 @@ import java.util.List; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; -import org.hypertrace.core.grpcutils.client.GrpcChannelRegistry; import org.hypertrace.core.grpcutils.client.GrpcRegistryConfig; +import org.hypertrace.core.grpcutils.client.InProcessGrpcChannelRegistry; import org.hypertrace.core.serviceframework.PlatformService; import org.hypertrace.core.serviceframework.config.ConfigClient; import org.hypertrace.core.serviceframework.http.jetty.JettyHttpServerBuilder; @@ -17,12 +17,12 @@ @Slf4j public abstract class StandAloneHttpPlatformServiceContainer extends PlatformService { private HttpContainer container; - private final GrpcChannelRegistry grpcChannelRegistry; + private final InProcessGrpcChannelRegistry grpcChannelRegistry; public StandAloneHttpPlatformServiceContainer(ConfigClient config) { super(config); grpcChannelRegistry = - new GrpcChannelRegistry( + new InProcessGrpcChannelRegistry( GrpcRegistryConfig.builder() .defaultInterceptor( new MetricCollectingClientInterceptor(