Dubbo cloud native (#4922)

* Polish #4542 : [Enhancement] Adapt the Java standard Event/Listener mechanism * Polish #4541 : [Feature] Add local File System DynamicConfigurationFactory‘s extension * Polish #4541 : Bugfix * Polish #4541 : Optimization * Polish #4541 : Add the compatibility for PollingWatchService on the some platforms * Polish #4541 : Add delay publish without ThreadPoolExecutor * Polish #4541 : Refactor the extension name * Polish #4541 : Add remove ops * Polish #4541 : Add testable constructor * Polish #4541 : Add getConfigGroups method * Polish #4610 : [Refactor] Refactor the bootstrap module * Polish #4541 : Fix the nulling URL issue * Polish #4622 : [Refactor] Refactor ConfigManager * Polish #4622 : [Refactor] Refactor ConfigManager * Polish #4622 : Support multiple configcenters * Polish #4671 : ServiceNameMapping will not map the group, version and protocol * update referenceCount log (#4683) Add comments to support multiple shared connections * Polish /#4687 : Remove the duplicated test code in dubbo-config-spring (#4688) * #4685 修改代码if判断false问题 if (hasException == false)修改成if (!hasException) (#4695) * Fixed Service annotation method parameters are not in effect (#4598) * keep demo simple, and switch to use zookeeper as registry center (#4705) * keep demo simple, and switch to use zookeeper as registry center * remove comment * @reference auto-wires the instance of generic interface #4594 (#4677) * try to shorten maven output to make travis build pass (#4710) * use CountDownLatch to check zk registry if establish connection (#4589) * Minor change * Rename the extension name of WritableMetadataService * Polish #4759 : [Refactor] Change the signature of methods of MetadataService #4759 * Merge remote-tracking branch 'upstream/master' into dubbo-cloud-native # Conflicts: # dubbo-all/pom.xml # dubbo-bom/pom.xml # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ApplicationConfig.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryConfig.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java # dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java # dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/DynamicConfiguration.java # dubbo-configcenter/dubbo-configcenter-api/src/test/java/org/apache/dubbo/configcenter/mock/MockDynamicConfiguration.java # dubbo-configcenter/dubbo-configcenter-consul/src/main/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfiguration.java # dubbo-configcenter/dubbo-configcenter-etcd/src/test/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfigurationTest.java # dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java # dubbo-configcenter/dubbo-configcenter-nacos/src/test/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfigurationTest.java # dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java # dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/model/MethodDefinition.java # dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/identifier/MetadataIdentifier.java # dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java # dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/report/identifier/MetadataIdentifierTest.java # dubbo-metadata/dubbo-metadata-definition-protobuf/src/main/java/org/apache/dubbo/metadata/definition/protobuf/ProtobufTypeBuilder.java # dubbo-metadata/dubbo-metadata-definition-protobuf/src/test/java/org/apache/dubbo/metadata/definition/protobuf/ProtobufTypeBuilderTest.java # dubbo-metadata/pom.xml # dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/AbstractConfiguratorListener.java # dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java # dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistryFactory.java # dubbo-rpc/dubbo-rpc-xml/src/main/java/org/apache/dubbo/xml/rpc/protocol/xmlrpc/XmlRpcProtocol.java * Polish #3984 : Add the implementation of Page<ServiceInstance> getInstances(String serviceName, int offset, int pageSize, boolean healthyOnly) * Code merge * Fix the cases * Merge remote-tracking branch 'upstream/cloud-native' into dubbo-cloud-native # Conflicts: # dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java # dubbo-metadata/dubbo-metadata-definition-protobuf/pom.xml # dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/ServiceOrientedRegistryTest.java # dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscoveryFactory.java # dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscovery.java * Refactor ConfigManager * Refactor ConfigManager * Resolve the issues on ConfigManager * Refactor and add test-cases for ConfigManager * Polish #4774 : [Feature] Dubbo Cloud Native - To Support in Spring * Polish #4808 : [Feature] Add the registered/unregistered event mechanism ShutdownHook * Polish #4807 : [Feature] Add the callback mechanism ShutdownHook #4807 * Polish #4813 : [Feature] add Prioritized implementation for ServiceInstanceCustomizer * Polish #4815 : [Feature] Add the ServiceLoader for Dubbo's services or components * Polish #4815 : [Feature] Add the ServiceLoader for Dubbo's services or components * Polish #4813 : [Feature] add Prioritized implementation for ServiceInstanceCustomizer * Polish #4807 : Add sort implementation * Refactor * Refactor * Polish #4845 : [Feature] Enhance the Event-Publishing feature to original ServiceDiscovery * Merge remote-tracking branch 'upstream/cloud-native' into dubbo-cloud-native # Conflicts: # dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceDiscoveryFactory.java # dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java * Merge remote-tracking branch 'upstream/cloud-native' into dubbo-cloud-native # Conflicts: # dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceDiscoveryFactory.java # dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java * Polish #4854 : [Feature] MetadataService supports the Dubbo protocol under auto-increased port * Polish #4857 : [Enhancement] Sync the Metadata storage type into ApplicationConfig * Polish #4868 : [Enhancement] Refactor ConfigChangeEvent * Polish #4868 : [Enhancement] Refactor ConfigChangeEvent * Polish #4873 : [Feature] Add a conditional EventListener into Event Module * Polish #4875 : [Feature] Refactor ServiceInstancesChangedListener * Remove the cycle dependencies * Remove the cycle dependencies * Polish #4903 : [Feature] Set source into the BeanDefinition of Dubbo Config * Polish #4902 : [Feature] Dubbo Cloud Native to Spring XML scenario * Polish #4713 : Initial the new module and dependencies * Polish #4690 : AnnotatedBeanDefinitionRegistryUtils#registerBeans can't remove the duplicated bean definitions * Polish #4690 : AnnotatedBeanDefinitionRegistryUtils#registerBeans can't remove the duplicated bean definitions * Polish #4690 : AnnotatedBeanDefinitionRegistryUtils#registerBeans can't remove the duplicated bean definitions * Polish #4910 : [Feature] To suppoort DubboLifecycleComponentApplicationListener in Spring XML scenario * Polish #4713 : Add Service discovery implementation for Eureka #4713 * Polish #4713 : Add Service registration and discovery implementation for Eureka * Polish #4713 : Add Service registration and discovery implementation for Eureka
apache · Aug 23, 2019 · a3aa6c1 · a3aa6c1
1 parent 403858b
commit a3aa6c1
Show file tree

Hide file tree

Showing 14 changed files with 802 additions and 16 deletions.
diff --git a/dubbo-bootstrap/pom.xml b/dubbo-bootstrap/pom.xml
@@ -45,6 +45,12 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-registry-eureka</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java
@@ -17,7 +17,6 @@
 package org.apache.dubbo.bootstrap;
 
 import org.apache.dubbo.bootstrap.rest.UserService;
-import org.apache.dubbo.config.MetadataReportConfig;
 import org.apache.dubbo.config.ReferenceConfig;
 import org.apache.dubbo.config.context.ConfigManager;
 
@@ -33,12 +32,18 @@ public static void main(String[] args) throws Exception {
         new DubboBootstrap()
                 .application("dubbo-consumer-demo")
                 .protocol(builder -> builder.port(20887).name("dubbo"))
+                // Eureka
+                .registry(builder -> builder.address("eureka://127.0.0.1:8761?registry-type=service&subscribed-services=dubbo-provider-demo"))
+
                 // Zookeeper
-                .registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry.type=service&subscribed.services=dubbo-provider-demo").preferred(true))
-                .metadataReport(new MetadataReportConfig("zookeeper://127.0.0.1:2181"))
+                // .registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry-type=service&subscribed-services=dubbo-provider-demo"))
+                // .metadataReport(new MetadataReportConfig("zookeeper://127.0.0.1:2181"))
+
                 // Nacos
-//                .registry("nacos", builder -> builder.address("nacos://127.0.0.1:8848?registry.type=service&subscribed.services=dubbo-provider-demo"))
-//                .registry("consul", builder -> builder.address("consul://127.0.0.1:8500?registry.type=service&subscribed.services=dubbo-provider-demo").group("namespace1"))
+                // .registry("nacos", builder -> builder.address("nacos://127.0.0.1:8848?registry.type=service&subscribed.services=dubbo-provider-demo"))
+
+                // Consul
+                // .registry("consul", builder -> builder.address("consul://127.0.0.1:8500?registry.type=service&subscribed.services=dubbo-provider-demo").group("namespace1"))
                 .reference("echo", builder -> builder.interfaceClass(EchoService.class).protocol("dubbo"))
                 .reference("user", builder -> builder.interfaceClass(UserService.class).protocol("rest"))
                 .start()

diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java
@@ -49,7 +49,7 @@ private static void multipleRegistries() {
 
         RegistryConfig serviceRegistry = new RegistryConfig();
         serviceRegistry.setId("serviceRegistry");
-        serviceRegistry.setAddress("zookeeper://127.0.0.1:2181?registry.type=service");
+        serviceRegistry.setAddress("zookeeper://127.0.0.1:2181?registry-type=service");
 
         ServiceConfig<EchoService> echoService = new ServiceConfig<>();
         echoService.setInterface(EchoService.class.getName());

diff --git a/...tstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderMinimumBootstrap.java b/...tstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderMinimumBootstrap.java
@@ -25,7 +25,7 @@ public static void main(String[] args) {
         new DubboBootstrap()
                 .application("dubbo-provider-demo")
 //                .registry(builder -> builder.address("zookeeper://127.0.0.1:2181?registry.type=service"))
-                .registry(builder -> builder.address("file://?registry.type=service"))
+                .registry(builder -> builder.address("eureka://127.0.0.1:8761?registry-type=service"))
                 .protocol(builder -> builder.port(-1).name("dubbo"))
                 .service(builder -> builder.interfaceClass(EchoService.class).ref(new EchoServiceImpl()))
                 .start()

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/RegistryConstants.java b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/RegistryConstants.java
@@ -58,7 +58,7 @@ public interface RegistryConstants {
      *
      * @since 2.7.4
      */
-    String REGISTRY_TYPE_KEY = "registry.type";
+    String REGISTRY_TYPE_KEY = "registry-type";
 
     /**
      * The parameter value of Service-Oriented Registry type
@@ -67,14 +67,19 @@ public interface RegistryConstants {
      */
     String SERVICE_REGISTRY_TYPE = "service";
 
+    /**
+     * The protocol for Service Discovery
+     *
+     * @since 2.7.4
+     */
     String SERVICE_REGISTRY_PROTOCOL = "service-discovery-registry";
 
     /**
      * The parameter key of the subscribed service names for Service-Oriented Registry
      *
      * @since 2.7.4
      */
-    String SUBSCRIBED_SERVICE_NAMES_KEY = "subscribed.services";
+    String SUBSCRIBED_SERVICE_NAMES_KEY = "subscribed-services";
 
 
     /**

diff --git a/...o-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java b/...o-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java
@@ -59,7 +59,7 @@ public DefaultServiceInstance(String id, String serviceName, String host, Intege
     }
 
     public DefaultServiceInstance(String serviceName, String host, Integer port) {
-        this(null, serviceName, host, port);
+        this(host + ":" + port, serviceName, host, port);
     }
 
     public void setId(String id) {

diff --git a/...registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java b/...registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java
@@ -29,6 +29,7 @@
 import org.apache.dubbo.registry.Registry;
 import org.apache.dubbo.registry.client.event.ServiceInstancesChangedEvent;
 import org.apache.dubbo.registry.client.event.listener.ServiceInstancesChangedListener;
+import org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils;
 import org.apache.dubbo.registry.client.metadata.proxy.MetadataServiceProxyFactory;
 import org.apache.dubbo.registry.client.selector.ServiceInstanceSelector;
 import org.apache.dubbo.registry.support.FailbackRegistry;
@@ -112,7 +113,13 @@ public ServiceDiscoveryRegistry(URL registryURL) {
         this.writableMetadataService = WritableMetadataService.getExtension(metadataStorageType);
     }
 
-    protected Set<String> getSubscribedServices(URL registryURL) {
+    /**
+     * Get the subscribed services from the specified registry {@link URL url}
+     *
+     * @param registryURL the specified registry {@link URL url}
+     * @return non-null
+     */
+    public static Set<String> getSubscribedServices(URL registryURL) {
         String subscribedServiceNames = registryURL.getParameter(SUBSCRIBED_SERVICE_NAMES_KEY);
         return isBlank(subscribedServiceNames) ? emptySet() :
                 unmodifiableSet(of(subscribedServiceNames.split(","))
@@ -307,6 +314,7 @@ private List<URL> getSubscribedURLs(URL subscribedURL, Collection<ServiceInstanc
         List<ServiceInstance> serviceInstances = instances.stream()
                 .filter(ServiceInstance::isEnabled)
                 .filter(ServiceInstance::isHealthy)
+                .filter(ServiceInstanceMetadataUtils::isDubboServiceInstance)
                 .collect(Collectors.toList());
 
         /**

diff --git a/...src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java b/...src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java
@@ -208,14 +208,26 @@ public static String getMetadataStorageType(ServiceInstance serviceInstance) {
     /**
      * Set the metadata storage type in specified {@link ServiceInstance service instance}
      *
-     * @param serviceInstance      {@link ServiceInstance service instance}
-     * @param metadataType remote or local
+     * @param serviceInstance {@link ServiceInstance service instance}
+     * @param metadataType    remote or local
      */
     public static void setMetadataStorageType(ServiceInstance serviceInstance, String metadataType) {
         Map<String, String> metadata = serviceInstance.getMetadata();
         metadata.put(METADATA_STORAGE_TYPE_KEY, metadataType);
     }
 
+    /**
+     * Is Dubbo Service instance or not
+     *
+     * @param serviceInstance {@link ServiceInstance service instance}
+     * @return if Dubbo Service instance, return <code>true</code>, or <code>false</code>
+     */
+    public static boolean isDubboServiceInstance(ServiceInstance serviceInstance) {
+        Map<String, String> metadata = serviceInstance.getMetadata();
+        return metadata.containsKey(METADATA_SERVICE_URL_PARAMS_KEY)
+                || metadata.containsKey(METADATA_SERVICE_URLS_PROPERTY_NAME);
+    }
+
     private static void setProviderHostParam(Map<String, String> params, URL providerURL) {
         params.put(HOST_PARAM_NAME, providerURL.getHost());
     }

diff --git a/dubbo-registry/dubbo-registry-eureka/pom.xml b/dubbo-registry/dubbo-registry-eureka/pom.xml
@@ -27,18 +27,32 @@
         <dependency>
             <groupId>com.netflix.eureka</groupId>
             <artifactId>eureka-client</artifactId>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
             <version>1</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>com.netflix.eureka</groupId>
             <artifactId>eureka-core</artifactId>
-            <optional>true</optional>
+        </dependency>
+
+        <!-- Eureka core deps that are now optional -->
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.10</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.jersey.contribs</groupId>
+            <artifactId>jersey-apache-client4</artifactId>
+            <version>1.19.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.netflix.archaius</groupId>
+            <artifactId>archaius-core</artifactId>
+            <version>0.7.6</version>
         </dependency>
 
     </dependencies>