ASP-2043: Type serviceConfig in GrpcChannelConfig using GrpcServiceConfig and GrpcRetryPolicy

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

AI-Session-Id: 75f3864c-dc2c-4e44-b4f3-b23c980f2ea6
AI-Tool: claude-code
AI-Model: unknown

Author: kunalvaswani123

grpc-client-utils/src/main/java/org/hypertrace/core/grpcutils/client/GrpcChannelConfig.java

@@ -2,7 +2,6 @@
 
 import io.grpc.ClientInterceptor;
 import java.util.List;
-import java.util.Map;
 import lombok.Builder;
 import lombok.Singular;
 import lombok.Value;
@@ -14,5 +13,5 @@ public class GrpcChannelConfig {
 
   @Singular List<ClientInterceptor> clientInterceptors;
 
-  Map<String, Object> serviceConfig;
+  GrpcServiceConfig serviceConfig;
 }

grpc-client-utils/src/main/java/org/hypertrace/core/grpcutils/client/GrpcChannelRegistry.java

@@ -91,7 +91,7 @@ protected ManagedChannel configureAndBuildChannel(
       builder.maxInboundMessageSize(config.getMaxInboundMessageSize());
     }
     if (config.getServiceConfig() != null) {
-      builder.defaultServiceConfig(config.getServiceConfig()).enableRetry();
+      builder.defaultServiceConfig(config.getServiceConfig().toMap()).enableRetry();
     }
     this.registryConfig.getDefaultInterceptors().forEach(builder::intercept);
     return builder.intercept(config.getClientInterceptors()).build();

grpc-client-utils/src/main/java/org/hypertrace/core/grpcutils/client/GrpcRetryPolicy.java

@@ -0,0 +1,41 @@
+package org.hypertrace.core.grpcutils.client;
+
+import static java.util.stream.Collectors.toUnmodifiableList;
+
+import io.grpc.Status;
+import java.time.Duration;
+import java.util.List;
+import java.util.Map;
+import lombok.Builder;
+import lombok.Singular;
+import lombok.Value;
+
+@Value
+@Builder
+public class GrpcRetryPolicy {
+  private static final String MAX_ATTEMPTS = "maxAttempts";
+  private static final String INITIAL_BACKOFF = "initialBackoff";
+  private static final String MAX_BACKOFF = "maxBackoff";
+  private static final String BACKOFF_MULTIPLIER = "backoffMultiplier";
+  private static final String RETRYABLE_STATUS_CODES = "retryableStatusCodes";
+
+  int maxAttempts;
+  Duration initialBackoff;
+  Duration maxBackoff;
+  double backoffMultiplier;
+  @Singular List<Status.Code> retryableStatusCodes;
+
+  Map<String, Object> toMap() {
+    return Map.of(
+        MAX_ATTEMPTS,
+        (double) maxAttempts,
+        INITIAL_BACKOFF,
+        initialBackoff.toMillis() / 1000.0 + "s",
+        MAX_BACKOFF,
+        maxBackoff.toMillis() / 1000.0 + "s",
+        BACKOFF_MULTIPLIER,
+        backoffMultiplier,
+        RETRYABLE_STATUS_CODES,
+        retryableStatusCodes.stream().map(Enum::name).collect(toUnmodifiableList()));
+  }
+}

grpc-client-utils/src/main/java/org/hypertrace/core/grpcutils/client/GrpcServiceConfig.java

@@ -0,0 +1,21 @@
+package org.hypertrace.core.grpcutils.client;
+
+import java.util.List;
+import java.util.Map;
+import lombok.Builder;
+import lombok.Value;
+
+@Value
+@Builder
+public class GrpcServiceConfig {
+  private static final String METHOD_CONFIG = "methodConfig";
+  private static final String NAME = "name";
+  private static final String RETRY_POLICY = "retryPolicy";
+
+  GrpcRetryPolicy retryPolicy;
+
+  Map<String, Object> toMap() {
+    return Map.of(
+        METHOD_CONFIG, List.of(Map.of(NAME, List.of(Map.of()), RETRY_POLICY, retryPolicy.toMap())));
+  }
+}

grpc-client-utils/src/test/java/org/hypertrace/core/grpcutils/client/GrpcChannelRegistryTest.java

@@ -22,8 +22,9 @@
 import io.grpc.Deadline.Ticker;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
+import io.grpc.Status;
+import java.time.Duration;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -148,7 +149,17 @@ void copyConstructorReusesExistingChannels() {
 
   @Test
   void createsDistinctChannelsForDifferentServiceConfigs() {
-    Map<String, Object> serviceConfig = Map.of("methodConfig", List.of());
+    GrpcServiceConfig serviceConfig =
+        GrpcServiceConfig.builder()
+            .retryPolicy(
+                GrpcRetryPolicy.builder()
+                    .maxAttempts(3)
+                    .initialBackoff(Duration.ofMillis(100))
+                    .maxBackoff(Duration.ofSeconds(1))
+                    .backoffMultiplier(2.0)
+                    .retryableStatusCode(Status.Code.UNAVAILABLE)
+                    .build())
+            .build();
     Channel channelWithServiceConfig =
         this.channelRegistry.forSecureAddress(
             "foo", 1000, GrpcChannelConfig.builder().serviceConfig(serviceConfig).build());