feat:support instance detect. (#84)

Author: SkyeBeFreeman

dubbo-examples/dubbo-discovery-example/dubbo-quick-consumer/src/main/resources/spring/dubbo-consumer.properties

@@ -6,6 +6,7 @@ dubbo.application.service-discovery.migration=FORCE_APPLICATION
 dubbo.application.metadata-type=remote
 # registry
 dubbo.registry.address=polaris://119.91.66.223:8091
+dubbo.registry.parameters.detect_when=after_call
 # config center
 dubbo.config-center.address=polaris://119.91.66.223:8093
 # metadata report

dubbo-examples/pom.xml

@@ -54,6 +54,11 @@
             <artifactId>log4j-slf4j-impl</artifactId>
             <version>${log4j2.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
     </dependencies>
 
     <profiles>

dubbo-plugins/dubbo-router-polaris/src/main/java/com/tencent/polaris/dubbo/router/InstanceInvoker.java

@@ -17,10 +17,7 @@
 
 package com.tencent.polaris.dubbo.router;
 
-import com.tencent.polaris.api.pojo.CircuitBreakerStatus;
-import com.tencent.polaris.api.pojo.DefaultInstance;
-import com.tencent.polaris.api.pojo.Instance;
-import com.tencent.polaris.api.pojo.StatusDimension;
+import com.tencent.polaris.api.pojo.*;
 import com.tencent.polaris.common.registry.DubboServiceInfo;
 import com.tencent.polaris.common.utils.Consts;
 import org.apache.dubbo.common.URL;
@@ -117,6 +114,11 @@ public CircuitBreakerStatus getCircuitBreakerStatus(StatusDimension statusDimens
         return defaultInstance.getCircuitBreakerStatus(statusDimension);
     }
 
+    @Override
+    public RetStatus getDetectStatus() {
+        return defaultInstance.getDetectStatus();
+    }
+
     @Override
     public boolean isHealthy() {
         return defaultInstance.isHealthy();

polaris-adapter-dubbo/src/main/java/com/tencent/polaris/common/registry/PolarisOperator.java

@@ -17,6 +17,7 @@
 
 package com.tencent.polaris.common.registry;
 
+import com.tencent.polaris.api.config.consumer.OutlierDetectionConfig;
 import com.tencent.polaris.api.core.ConsumerAPI;
 import com.tencent.polaris.api.core.ProviderAPI;
 import com.tencent.polaris.api.exception.PolarisException;
@@ -144,6 +145,16 @@ private void init(PolarisOperators.OperatorType operatorType, Map<String, String
         }
         configuration.getGlobal().getStatReporter().setPluginConfig("prometheus", prometheusHandlerConfig);
 
+        // 设置主动探测
+        if (parameters.containsKey(Consts.KEY_DETECT_WHEN)) {
+            String detectWhen = parameters.get(Consts.KEY_DETECT_WHEN);
+            try {
+                configuration.getConsumer().getOutlierDetection().setWhen(OutlierDetectionConfig.When.valueOf(detectWhen));
+            } catch (IllegalArgumentException e) {
+                LOGGER.warn("Invalid detectWhen value: {}, valid values are: {}",
+                        detectWhen, Arrays.toString(OutlierDetectionConfig.When.values()));
+            }
+        }
 
         // 设置服务治理连接地址
         configuration.getGlobal().getServerConnector()

polaris-adapter-dubbo/src/main/java/com/tencent/polaris/common/registry/PolarisOperators.java

@@ -44,7 +44,9 @@ private PolarisOperators() {
     public static PolarisOperator loadOrStoreForGovernance(String host, int port, Map<String, String> parameters) {
         Map<String, PolarisOperator> operatorMap = INSTANCE.polarisOperatorMap.get(OperatorType.GOVERNANCE);
         Map<String, String> params = Optional.ofNullable(parameters).orElse(Collections.emptyMap());
-        String key = host + ":" + port + "|hash_code:" + params.hashCode();
+        // 目前只支持一个operator，所以key暂时用host+port
+        // String key = host + ":" + port + "|hash_code:" + params.hashCode();
+        String key = host + ":" + port;
         return operatorMap.computeIfAbsent(key, s -> new PolarisOperator(OperatorType.GOVERNANCE, host, port, parameters, new BaseBootConfigHandler()));
     }
 

polaris-adapter-dubbo/src/main/java/com/tencent/polaris/common/utils/Consts.java

@@ -33,6 +33,8 @@ public interface Consts {
 
     String KEY_TTL = "ttl";
 
+    String KEY_DETECT_WHEN = "detect_when";
+
     String KEY_METRIC_TYPE = "stat_type";
 
     String KEY_METRIC_PULL_PORT = "stat_pull_port";

pom.xml

@@ -41,7 +41,7 @@
         <revision>2.0.2.0-3.2.7-SNAPSHOT</revision>
 
         <!-- Polaris SDK version -->
-        <polaris.version>2.0.1.0</polaris.version>
+        <polaris.version>2.0.2.0-SNAPSHOT</polaris.version>
 
         <apache.dubbo.version>3.2.7</apache.dubbo.version>
         <slf4j.version>1.7.25</slf4j.version>