fix:fix agent 2023/2022 could not start by double registry

polaris-agent-core/polaris-agent-core-bootstrap-common/src/main/java/cn/polarismesh/agent/core/bootstrap/PolarisAgentBootStrap.java

@@ -20,6 +20,7 @@
 import cn.polarismesh.agent.core.bootstrap.starter.BootStrapStarter;
 import cn.polarismesh.agent.core.bootstrap.util.AgentDirUtils;
 import cn.polarismesh.agent.core.common.utils.JarFileUtils;
+import cn.polarismesh.agent.core.bootstrap.PolarisInitProperties;
 
 import java.lang.instrument.Instrumentation;
 import java.util.List;
@@ -40,6 +41,9 @@ public static void premain(String agentArgs, Instrumentation instrumentation, St
             return;
         }
 
+        PolarisInitProperties polarisInitProperties = new PolarisInitProperties();
+        polarisInitProperties.initialize();
+
         logger.info("[Bootstrap] polaris-agent agentArgs:" + agentArgs);
         logger.info("[Bootstrap] polarisAgentBootStrap.ClassLoader:" + PolarisAgentBootStrap.class.getClassLoader());
         logger.info("[Bootstrap] contextClassLoader:" + Thread.currentThread().getContextClassLoader());

polaris-agent-core/polaris-agent-core-bootstrap-common/src/main/java/cn/polarismesh/agent/core/bootstrap/PolarisInitProperties.java

@@ -0,0 +1,12 @@
+package cn.polarismesh.agent.core.bootstrap;
+
+public class PolarisInitProperties {
+
+    public void initialize() {
+
+        // ban nacos as sct currently does not support double registration
+        System.setProperty("spring.cloud.nacos.config.enabled", "false");
+        System.setProperty("spring.cloud.nacos.discovery.enabled", "false");
+
+    }
+}

polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2022-examples/quickstart-examples/consumer/src/main/resources/bootstrap.properties

@@ -1,7 +1,15 @@
 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.config.server-addr=127.0.0.1:8848
+spring.cloud.nacos.discovery.enabled=true
+spring.cloud.nacos.config.enabled=true
+spring.cloud.nacos.username=nacos
+spring.cloud.nacos.password=nacos
+spring.cloud.nacos.discovery.fail-fast=true
+
+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

polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2022-examples/quickstart-examples/provider-a/src/main/resources/bootstrap.properties

@@ -1,10 +1,18 @@
 server.port=65001
 spring.application.name=service-provider-2022
+spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
 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.config.enabled=true
+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

polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/quickstart-examples/consumer/src/main/resources/application.properties

@@ -0,0 +1,27 @@
+#server.port=65002
+#spring.application.name=service-consumer-2023
+#management.endpoints.web.exposure.include=*
+#spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
+#spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+#spring.cloud.nacos.discovery.fail-fast=true
+#spring.cloud.nacos.discovery.enabled=true
+#spring.cloud.nacos.config.enabled=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

polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/quickstart-examples/consumer/src/main/resources/bootstrap.properties

@@ -0,0 +1,15 @@
+server.port=65002
+spring.application.name=service-consumer-2023
+management.endpoints.web.exposure.include=*
+spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+spring.cloud.nacos.discovery.fail-fast=true
+spring.cloud.nacos.discovery.enabled=true
+spring.cloud.nacos.config.enabled=true
+spring.cloud.nacos.username=nacos
+spring.cloud.nacos.password=nacos
+
+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

polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/quickstart-examples/provider/src/main/resources/application.properties

@@ -0,0 +1,18 @@
+server.port=65001
+spring.application.name=service-provider-2022
+spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+spring.cloud.nacos.config.enabled=true
+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-circular-references=true

polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/quickstart-examples/provider/src/main/resources/bootstrap.properties

@@ -0,0 +1,18 @@
+#server.port=65001
+#spring.application.name=service-provider-2022
+#spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
+#spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+#spring.cloud.nacos.config.enabled=true
+#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-circular-references=true

polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/consumer/src/main/resources/application.properties

@@ -1,5 +1,14 @@
-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.config.server-addr=127.0.0.1:8848
+spring.cloud.nacos.discovery.fail-fast=true
+spring.cloud.nacos.config.enabled=true
+spring.cloud.nacos.discovery.enabled=true
+spring.cloud.nacos.username=nacos
+spring.cloud.nacos.password=nacos
+
+
+# use feign client in GraalVM environment need to set below config
+spring.cloud.refresh.enabled=false

polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/provider-a/src/main/resources/application.properties

@@ -1,9 +1,17 @@
-server.port=65001
+server.port=0
 spring.application.name=service-provider-hoxton
+spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
 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.config.enabled=true
+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

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>

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>

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>