[#10693] Add enable option for grpc client reties

grpc/src/main/java/com/navercorp/pinpoint/grpc/client/ChannelFactoryBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 NAVER Corp.
+ * Copyright 2024 NAVER Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package com.navercorp.pinpoint.grpc.client;
 
 import com.navercorp.pinpoint.grpc.client.config.ClientOption;
+import com.navercorp.pinpoint.grpc.client.config.ClientRetryOption;
 import io.grpc.ClientInterceptor;
 import io.grpc.NameResolverProvider;
 import io.netty.handler.ssl.SslContext;
@@ -40,6 +41,8 @@ public interface ChannelFactoryBuilder {
 
     void setSslContext(SslContext sslContext);
 
+    void setClientRetryOption(ClientRetryOption clientRetryOption);
+
     void setNameResolverProvider(NameResolverProvider nameResolverProvider);
 
     ChannelFactory build();

grpc/src/main/java/com/navercorp/pinpoint/grpc/client/DefaultChannelFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 NAVER Corp.
+ * Copyright 2024 NAVER Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 import com.navercorp.pinpoint.grpc.ChannelTypeEnum;
 import com.navercorp.pinpoint.grpc.ExecutorUtils;
 import com.navercorp.pinpoint.grpc.client.config.ClientOption;
+import com.navercorp.pinpoint.grpc.client.config.ClientRetryOption;
 import io.grpc.ClientInterceptor;
 import io.grpc.ManagedChannel;
 import io.grpc.Metadata;
@@ -63,6 +64,9 @@
     // nullable
     private final SslContext sslContext;
 
+    // nullable
+    private final ClientRetryOption clientRetryOption;
+
     private final List<ClientInterceptor> clientInterceptorList;
     private final NameResolverProvider nameResolverProvider;
 
@@ -78,7 +82,8 @@
                           NameResolverProvider nameResolverProvider,
                           ClientOption clientOption,
                           List<ClientInterceptor> clientInterceptorList,
-                          SslContext sslContext) {
+                          SslContext sslContext,
+                          ClientRetryOption clientRetryOption) {
         this.factoryName = Objects.requireNonNull(factoryName, "factoryName");
         this.executorQueueSize = executorQueueSize;
         this.headerFactory = Objects.requireNonNull(headerFactory, "headerFactory");
@@ -90,6 +95,8 @@
         this.clientInterceptorList = new ArrayList<>(clientInterceptorList);
         // nullable
         this.sslContext = sslContext;
+        // nullable
+        this.clientRetryOption = clientRetryOption;
 
 
         ChannelType channelType = getChannelType();
@@ -157,6 +164,12 @@
             channelBuilder.negotiationType(NegotiationType.TLS);
         }
 
+        // RetryOption
+        if (clientRetryOption != null) {
+            setupRetryOption(channelBuilder);
+        }
+
+
         channelBuilder.maxTraceEvents(clientOption.getMaxTraceEvent());
 
         return channelBuilder.build();
@@ -210,6 +223,18 @@
         }
     }
 
+    private void setupRetryOption(final NettyChannelBuilder channelBuilder) {
+        channelBuilder.enableRetry();
+        channelBuilder.retryBufferSize(clientRetryOption.getRetryBufferSize());
+        channelBuilder.perRpcBufferLimit(clientRetryOption.getPerRpcBufferLimit());
+
+        //channelBuilder.disableServiceConfigLookUp();
+        channelBuilder.defaultServiceConfig(clientRetryOption.getRetryServiceConfig());
+        if (logger.isDebugEnabled()) {
+            logger.debug("Set clientRetryOption {}. name={}", clientRetryOption, factoryName);
+        }
+    }
+
     @Override
     public void close() {
         final Future<?> future = eventLoopGroup.shutdownGracefully();

grpc/src/main/java/com/navercorp/pinpoint/grpc/client/DefaultChannelFactoryBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 NAVER Corp.
+ * Copyright 2024 NAVER Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 import com.navercorp.pinpoint.common.util.Assert;
 import com.navercorp.pinpoint.grpc.client.config.ClientOption;
+import com.navercorp.pinpoint.grpc.client.config.ClientRetryOption;
 import io.grpc.ClientInterceptor;
 import io.grpc.NameResolverProvider;
 import io.netty.handler.ssl.SslContext;
@@ -41,6 +42,7 @@
 
     private ClientOption clientOption;
     private SslContext sslContext;
+    private ClientRetryOption clientRetryOption;
 
     private final LinkedList<ClientInterceptor> clientInterceptorList = new LinkedList<>();
     private NameResolverProvider nameResolverProvider;
@@ -82,6 +84,11 @@
         this.sslContext = sslContext;
     }
 
+    @Override
+    public void setClientRetryOption(ClientRetryOption clientRetryOption) {
+        this.clientRetryOption = clientRetryOption;
+    }
+
     @Override
     public void setNameResolverProvider(NameResolverProvider nameResolverProvider) {
         this.nameResolverProvider = Objects.requireNonNull(nameResolverProvider, "nameResolverProvider");
@@ -95,6 +102,7 @@
 
         return new DefaultChannelFactory(factoryName, executorQueueSize,
                 headerFactory, nameResolverProvider,
-                clientOption, clientInterceptorList, sslContext);
+                clientOption, clientInterceptorList,
+                sslContext, clientRetryOption);
     }
 }

grpc/src/main/java/com/navercorp/pinpoint/grpc/client/config/ClientRetryOption.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2024 NAVER Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.navercorp.pinpoint.grpc.client.config;
+
+import java.util.Map;
+
+public class ClientRetryOption {
+
+    private final long retryBufferSize;
+    private final long perRpcBufferLimit;
+    private final Map<String, ?> retryServiceConfig;
+
+    public ClientRetryOption(long retryBufferSize, long perRpcBufferLimit, Map<String, ?> retryServiceConfig) {
+        this.retryBufferSize = retryBufferSize;
+        this.perRpcBufferLimit = perRpcBufferLimit;
+        this.retryServiceConfig = retryServiceConfig;
+    }
+
+    public long getRetryBufferSize() {
+        return retryBufferSize;
+    }
+
+    public long getPerRpcBufferLimit() {
+        return perRpcBufferLimit;
+    }
+
+    public Map<String, ?> getRetryServiceConfig() {
+        return retryServiceConfig;
+    }
+
+    @Override
+    public String toString() {
+        return "ClientRetryOption{" +
+                "retryBufferSize=" + retryBufferSize +
+                ", perRpcBufferLimit=" + perRpcBufferLimit +
+                ", retryServiceConfig=" + retryServiceConfig +
+                '}';
+    }
+}

grpc/src/main/java/com/navercorp/pinpoint/grpc/client/retry/HedgingServiceConfigBuilder.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2024 NAVER Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.navercorp.pinpoint.grpc.client.retry;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+public class HedgingServiceConfigBuilder implements ServiceConfigBuilder {
+
+    public static final int DEFAULT_MAX_ATTEMPTS = 3;
+    public static final long DEFAULT_HEDGING_DELAY_MILLIS = 1000L;
+
+    private double maxAttempts = DEFAULT_MAX_ATTEMPTS; //Required. Must be two or greater
+    private String hedgingDelay = millisToString(DEFAULT_HEDGING_DELAY_MILLIS);  //Required. Long decimal with "s" appended
+    private List<String> nonFatalStatusCodes; //Optional (eg. [14], ["UNAVAILABLE"] or ["unavailable"])
+
+    @Override
+    public Map<String, ?> buildMetadataConfig() {
+        Map<String, Object> methodConfig = new LinkedHashMap<>();
+        addMetadataService(methodConfig);
+        addHedgingPolicy(methodConfig);
+        return Collections.singletonMap("methodConfig", Collections.singletonList(methodConfig));
+    }
+
+    private void addMetadataService(Map<String, Object> methodConfig) {
+        Map<String, Object> service = Collections.singletonMap("service", METADATA_SERVICE);
+        methodConfig.put("name", Collections.singletonList(service));
+    }
+
+    private void addHedgingPolicy(Map<String, Object> methodConfig) {
+        Map<String, Object> retryPolicy = new LinkedHashMap<>();
+        retryPolicy.put("maxAttempts", maxAttempts);
+        retryPolicy.put("hedgingDelay", hedgingDelay);
+        if (nonFatalStatusCodes != null && !nonFatalStatusCodes.isEmpty()) {
+            retryPolicy.put("nonFatalStatusCodes", nonFatalStatusCodes);
+        }
+
+        methodConfig.put("hedgingPolicy", retryPolicy);
+    }
+
+
+    public void setMaxAttempts(int maxAttempts) {
+        if (maxAttempts >= 2) {
+            this.maxAttempts = maxAttempts;
+        }
+    }
+
+    public void setHedgingDelayMillis(long hedgingDelay) {
+        this.hedgingDelay = millisToString(hedgingDelay);
+    }
+
+    public void setNonFatalStatusCodes(List<String> nonFatalStatusCodes) {
+        this.nonFatalStatusCodes = nonFatalStatusCodes;
+    }
+
+    public String millisToString(long value) {
+        return value / 1000.0 + "s";
+    }
+}

grpc/src/main/java/com/navercorp/pinpoint/grpc/client/retry/RetryServiceConfigBuilder.java

@@ -0,0 +1,92 @@
+/*
+ * Copyright 2024 NAVER Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.navercorp.pinpoint.grpc.client.retry;
+
+import io.grpc.Status;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+public class RetryServiceConfigBuilder implements ServiceConfigBuilder {
+
+    public static final double DEFAULT_MAX_ATTEMPTS = 3.0;
+    public static final long DEFAULT_INITIAL_BACKOFF_MILLIS = 1000L;
+    public static final long DEFAULT_MAX_BACKOFF_MILLIS = 4000L;
+    public static final double DEFAULT_BACKOFF_MULTIPLIER = 2.0;
+    public static final List<String> DEFAULT_RETRYABLE_STATUS_CODES = Collections.singletonList(Status.Code.UNAVAILABLE.name());
+
+    private Double maxAttempts = DEFAULT_MAX_ATTEMPTS; //Required. Must be two or greater
+    private String initialBackoff = millisToString(DEFAULT_INITIAL_BACKOFF_MILLIS); //Required. Long decimal with "s" appended
+    private String maxBackoff = millisToString(DEFAULT_MAX_BACKOFF_MILLIS); //Required. Long decimal with "s" appended
+    private Double backoffMultiplier = DEFAULT_BACKOFF_MULTIPLIER; //Required. Must be greater than zero.
+    private List<String> retryableStatusCodes; //Required and must be non-empty (eg. [14], ["UNAVAILABLE"] or ["unavailable"])
+
+    @Override
+    public Map<String, ?> buildMetadataConfig() {
+        Map<String, Object> methodConfig = new LinkedHashMap<>();
+        addMetadataService(methodConfig);
+        addRetryPolicy(methodConfig);
+        return Collections.singletonMap("methodConfig", Collections.singletonList(methodConfig));
+    }
+
+    private void addMetadataService(Map<String, Object> methodConfig) {
+        Map<String, Object> service = Collections.singletonMap("service", METADATA_SERVICE);
+        methodConfig.put("name", Collections.singletonList(service));
+    }
+
+    private void addRetryPolicy(Map<String, Object> methodConfig) {
+        Map<String, Object> retryPolicy = new LinkedHashMap<>();
+        retryPolicy.put("maxAttempts", maxAttempts);
+        retryPolicy.put("initialBackoff", initialBackoff);
+        retryPolicy.put("maxBackoff", maxBackoff);
+        retryPolicy.put("backoffMultiplier", backoffMultiplier);
+        if (retryableStatusCodes == null || retryableStatusCodes.isEmpty()) {
+            retryableStatusCodes = DEFAULT_RETRYABLE_STATUS_CODES;
+        }
+        retryPolicy.put("retryableStatusCodes", retryableStatusCodes);
+
+        methodConfig.put("retryPolicy", retryPolicy);
+    }
+
+    public void setMaxAttempts(double maxAttempts) {
+        if (maxAttempts >= 2) {
+            this.maxAttempts = maxAttempts;
+        }
+    }
+
+    public void setInitialBackOff(long initialBackoff) {
+        this.initialBackoff = millisToString(initialBackoff);
+    }
+
+    public void setMaxBackoff(long maxBackoff) {
+        this.maxBackoff = millisToString(maxBackoff);
+    }
+
+    public void setBackoffMultiplier(double backoffMultiplier) {
+        this.backoffMultiplier = backoffMultiplier;
+    }
+
+    public void setRetryableStatusCodes(List<String> retryableStatusCodes) {
+        this.retryableStatusCodes = retryableStatusCodes;
+    }
+
+    public String millisToString(long value) {
+        return value / 1000.0 + "s";
+    }
+}

grpc/src/main/java/com/navercorp/pinpoint/grpc/client/retry/ServiceConfigBuilder.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 NAVER Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.navercorp.pinpoint.grpc.client.retry;
+
+import java.util.Map;
+
+public interface ServiceConfigBuilder {
+
+    String METADATA_SERVICE = "v1.metadata";
+
+    Map<String, ?> buildMetadataConfig();
+
+}