fix:fix agent 2023/2022 could not statrt by double registry (#198)

polarismesh · Jun 20, 2024 · da1b614 · da1b614
1 parent bb79967
commit da1b614
Show file tree

Hide file tree

Showing 14 changed files with 80 additions and 34 deletions.
diff --git a/...-cloud-2022-examples/quickstart-examples/consumer/src/main/resources/bootstrap.properties b/...-cloud-2022-examples/quickstart-examples/consumer/src/main/resources/bootstrap.properties
@@ -1,7 +1,25 @@
 server.port=65002
 spring.application.name=service-consumer-2022
+management.endpoints.web.exposure.include=*
 spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
-spring.cloud.nacos.discovery.enabled=false
-spring.cloud.nacos.config.enabled=false
-spring.main.allow-bean-definition-overriding=true
+spring.cloud.nacos.discovery.fail-fast=true
+
+spring.cloud.nacos.username=nacos
+spring.cloud.nacos.password=nacos
+
+feign.sentinel.enabled=true
+
+spring.cloud.sentinel.transport.dashboard=localhost:8080
+spring.cloud.sentinel.eager=true
+
+spring.cloud.sentinel.datasource.ds1.file.file=classpath: flowrule.json
+spring.cloud.sentinel.datasource.ds1.file.data-type=json
+spring.cloud.sentinel.datasource.ds1.file.rule-type=flow
+
+spring.cloud.sentinel.datasource.ds2.file.file=classpath: degraderule.json
+spring.cloud.sentinel.datasource.ds2.file.data-type=json
+spring.cloud.sentinel.datasource.ds2.file.rule-type=degrade
+spring.cloud.loadbalancer.nacos.enabled=true
+# use feign client in GraalVM environment need to set below config
+spring.cloud.refresh.enabled=false
 spring.main.allow-circular-references=true
diff --git a/...loud-2022-examples/quickstart-examples/provider-a/src/main/resources/bootstrap.properties b/...loud-2022-examples/quickstart-examples/provider-a/src/main/resources/bootstrap.properties
@@ -1,10 +1,16 @@
 server.port=65001
 spring.application.name=service-provider-2022
-spring.cloud.nacos.config.server-addr=127.0.0.1:8848
-spring.cloud.nacos.config.enabled=false
-spring.cloud.nacos.discovery.enabled=false
+spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
+spring.cloud.nacos.discovery.enabled=true
+#spring.cloud.nacos.discovery.instance-enabled=true
+#only register IPv4 instance
+#spring.cloud.nacos.discovery.ip-type=IPv4
+#only register IPv6 instance
+#spring.cloud.nacos.discovery.ip-type=IPv6
+
 spring.cloud.nacos.username=nacos
 spring.cloud.nacos.password=nacos
+
 management.endpoints.web.exposure.include=*
 management.endpoint.health.show-details=always
-spring.main.allow-bean-definition-overriding=true
+spring.main.allow-circular-references=true
diff --git a/...spring-cloud-2023-examples/quickstart-examples/consumer/src/main/resources/bootstrap.yaml b/...spring-cloud-2023-examples/quickstart-examples/consumer/src/main/resources/bootstrap.yaml
@@ -7,10 +7,10 @@ spring:
   cloud:
     nacos:
       discovery:
-        enabled: false
+        enabled: true
         server-addr: 127.0.0.1:8848
       config:
-        enabled: false
+        enabled: true
         serverAddr: 127.0.0.1:8848
         username: 'nacos'
         password: 'nacos'

diff --git a/...ring-cloud-2023-examples/quickstart-examples/provider/src/main/resources/application.yaml b/...ring-cloud-2023-examples/quickstart-examples/provider/src/main/resources/application.yaml
@@ -9,10 +9,10 @@ spring:
       username: 'nacos'
       password: 'nacos'
       discovery:
-        enabled: false
+        enabled: true
         server-addr: 127.0.0.1:8848
       config:
-        enabled: false
+        enabled: true
         serverAddr: 127.0.0.1:8848
         username: 'nacos'
         password: 'nacos'

diff --git a/...ud-hoxton-examples/quickstart-examples/consumer/src/main/resources/application.properties b/...ud-hoxton-examples/quickstart-examples/consumer/src/main/resources/application.properties
@@ -1,5 +1,24 @@
-server.port=65002
 spring.application.name=service-consumer-hoxton
+server.port=18083
+management.endpoints.web.exposure.include=*
 spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
-spring.cloud.nacos.discovery.enabled=false
-spring.cloud.nacos.config.enabled=false
+spring.cloud.nacos.discovery.fail-fast=true
+
+spring.cloud.nacos.username=nacos
+spring.cloud.nacos.password=nacos
+
+feign.sentinel.enabled=true
+
+spring.cloud.sentinel.transport.dashboard=localhost:8080
+spring.cloud.sentinel.eager=true
+
+spring.cloud.sentinel.datasource.ds1.file.file=classpath: flowrule.json
+spring.cloud.sentinel.datasource.ds1.file.data-type=json
+spring.cloud.sentinel.datasource.ds1.file.rule-type=flow
+
+spring.cloud.sentinel.datasource.ds2.file.file=classpath: degraderule.json
+spring.cloud.sentinel.datasource.ds2.file.data-type=json
+spring.cloud.sentinel.datasource.ds2.file.rule-type=degrade
+spring.cloud.loadbalancer.nacos.enabled=true
+# use feign client in GraalVM environment need to set below config
+spring.cloud.refresh.enabled=false
diff --git a/...-hoxton-examples/quickstart-examples/provider-a/src/main/resources/application.properties b/...-hoxton-examples/quickstart-examples/provider-a/src/main/resources/application.properties
@@ -1,9 +1,15 @@
-server.port=65001
+server.port=0
 spring.application.name=service-provider-hoxton
-spring.cloud.nacos.config.server-addr=127.0.0.1:8848
-spring.cloud.nacos.config.enabled=false
-spring.cloud.nacos.discovery.enabled=false
+spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
+spring.cloud.nacos.discovery.enabled=true
+#spring.cloud.nacos.discovery.instance-enabled=true
+#only register IPv4 instance
+#spring.cloud.nacos.discovery.ip-type=IPv4
+#only register IPv6 instance
+#spring.cloud.nacos.discovery.ip-type=IPv6
+
 spring.cloud.nacos.username=nacos
 spring.cloud.nacos.password=nacos
+
 management.endpoints.web.exposure.include=*
 management.endpoint.health.show-details=always
diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2020-plugin/pom.xml b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2020-plugin/pom.xml
@@ -90,12 +90,10 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-loadbalancer</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2021-plugin/pom.xml b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2021-plugin/pom.xml
@@ -90,12 +90,10 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-loadbalancer</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/pom.xml b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2022-plugin/pom.xml
@@ -86,12 +86,10 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-loadbalancer</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

diff --git a/...in/java/cn/polarismesh/agent/plugin/spring/cloud/inject/MetadataTransferBeanInjector.java b/...in/java/cn/polarismesh/agent/plugin/spring/cloud/inject/MetadataTransferBeanInjector.java
@@ -50,14 +50,15 @@ public String getModule() {
 	@Override
 	public void onApplicationStartup(Object configurationParser, Constructor<?> configClassCreator, Method processConfigurationClass, BeanDefinitionRegistry registry, Environment environment) {
 		LOGGER.info("[PolarisJavaAgent] success to inject application bean definitions for module {}", getModule());
-	}
-
-	@Override
-	public void onBootstrapStartup(Object configurationParser, Constructor<?> configClassCreator, Method processConfigurationClass, BeanDefinitionRegistry registry, Environment environment) {
 		Object metadataTransferAutoConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, MetadataTransferAutoConfiguration.class, "metadataTransferAutoConfiguration");
 		ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, metadataTransferAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER);
 		registry.registerBeanDefinition("metadataTransferAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition(
 				MetadataTransferAutoConfiguration.class).getBeanDefinition());
 	}
 
+	@Override
+	public void onBootstrapStartup(Object configurationParser, Constructor<?> configClassCreator, Method processConfigurationClass, BeanDefinitionRegistry registry, Environment environment) {
+
+	}
+
 }
diff --git a/...in/java/cn/polarismesh/agent/plugin/spring/cloud/interceptor/RegisterBeanInterceptor.java b/...in/java/cn/polarismesh/agent/plugin/spring/cloud/interceptor/RegisterBeanInterceptor.java
@@ -33,7 +33,9 @@ public class RegisterBeanInterceptor implements Interceptor {
 	private final Set<String> primaryBeanNames = new HashSet<>();
 
 	public RegisterBeanInterceptor() {
-//		primaryBeanNames.add("metadataTransferAutoConfiguratio");
+		primaryBeanNames.add("polarisAutoServiceRegistration");
+		primaryBeanNames.add("polarisRegistration");
+		primaryBeanNames.add("polarisServiceRegistry");
 	}
 
 	@Override

diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/pom.xml b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/pom.xml
@@ -86,12 +86,10 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-loadbalancer</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/pom.xml b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/pom.xml
@@ -91,12 +91,10 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-loadbalancer</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

diff --git a/...ugins/spring-cloud-plugin-common/src/main/conf/plugin/spring-cloud/application.properties b/...ugins/spring-cloud-plugin-common/src/main/conf/plugin/spring-cloud/application.properties
@@ -41,4 +41,8 @@ spring.cloud.polaris.stat.enabled=false
 spring.cloud.polaris.stat.port=0
 # path for polaris stat
 spring.cloud.polaris.stat.path=/metrics
-logging.level.root=INFO
+logging.level.root=INFO
+# switch for nacos discovery enable
+spring.cloud.nacos.discovery.enabled=false
+# switch for nacos config enable
+spring.cloud.nacos.config.enabled=false