Fix some bug of flowcontrol plugin

Signed-off-by: hanbingleixue <[email protected]>

Author: hanbingleixue

sermant-plugins/sermant-flowcontrol/flowcontrol-plugin/src/main/java/io/sermant/flowcontrol/AbstractXdsHttpClientInterceptor.java

@@ -245,10 +245,10 @@ protected Optional<ServiceInstance> chooseServiceInstanceForXds() {
         if (CollectionUtils.isEmpty(serviceInstanceSet)) {
             return Optional.empty();
         }
+        removeCircuitBreakerInstance(scenarioInfo, serviceInstanceSet);
         if (RetryContext.INSTANCE.isPolicyNeedRetry()) {
             removeRetriedServiceInstance(serviceInstanceSet);
         }
-        removeCircuitBreakerInstance(scenarioInfo, serviceInstanceSet);
         return Optional.ofNullable(chooseServiceInstanceByLoadBalancer(serviceInstanceSet, scenarioInfo));
     }
 
@@ -271,7 +271,9 @@ private ServiceInstance chooseServiceInstanceByLoadBalancer(Set<ServiceInstance>
             FlowControlScenario scenarioInfo) {
         XdsLoadBalancer loadBalancer = XdsLoadBalancerFactory.getLoadBalancer(scenarioInfo.getServiceName(),
                 scenarioInfo.getClusterName());
-        return loadBalancer.selectInstance(new ArrayList<>(instanceSet));
+        ServiceInstance serviceInstance = loadBalancer.selectInstance(new ArrayList<>(instanceSet));
+        RetryContext.INSTANCE.updateRetriedServiceInstance(serviceInstance);
+        return serviceInstance;
     }
 
     private void removeCircuitBreakerInstance(FlowControlScenario scenarioInfo, Set<ServiceInstance> instanceSet) {

sermant-plugins/sermant-flowcontrol/flowcontrol-plugin/src/main/java/io/sermant/flowcontrol/retry/client/OkHttp3ClientDeclarer.java

@@ -16,18 +16,18 @@
 
 package io.sermant.flowcontrol.retry.client;
 
-import io.sermant.core.plugin.agent.declarer.AbstractPluginDeclarer;
 import io.sermant.core.plugin.agent.declarer.InterceptDeclarer;
 import io.sermant.core.plugin.agent.matcher.ClassMatcher;
 import io.sermant.core.plugin.agent.matcher.MethodMatcher;
+import io.sermant.flowcontrol.AbstractXdsDeclarer;
 
 /**
  * For OKHTTP requests, obtain the instance list from the registry to block them
  *
  * @author zhp
  * @since 2024-12-20
  */
-public class OkHttp3ClientDeclarer extends AbstractPluginDeclarer {
+public class OkHttp3ClientDeclarer extends AbstractXdsDeclarer {
     /**
      * The fully qualified name of the enhanced okhttp request
      */

sermant-plugins/sermant-flowcontrol/flowcontrol-plugin/src/main/java/io/sermant/flowcontrol/retry/client/OkHttpClientInterceptorChainDeclarer.java

@@ -16,18 +16,18 @@
 
 package io.sermant.flowcontrol.retry.client;
 
-import io.sermant.core.plugin.agent.declarer.AbstractPluginDeclarer;
 import io.sermant.core.plugin.agent.declarer.InterceptDeclarer;
 import io.sermant.core.plugin.agent.matcher.ClassMatcher;
 import io.sermant.core.plugin.agent.matcher.MethodMatcher;
+import io.sermant.flowcontrol.AbstractXdsDeclarer;
 
 /**
  * For OKHTTP requests, modify the URL of request
  *
  * @author zhp
  * @since 2024-12-20
  */
-public class OkHttpClientInterceptorChainDeclarer extends AbstractPluginDeclarer {
+public class OkHttpClientInterceptorChainDeclarer extends AbstractXdsDeclarer {
     private static final String ENHANCE_CLASSES =
             "com.squareup.okhttp.Call$ApplicationInterceptorChain";