Skip to content

Commit a066de2

Browse files
fredrikliuSkyeBeFreeman
authored andcommitted
fix:fix agent 2023/2022 could not start by double registry
1 parent f3c8196 commit a066de2

File tree

26 files changed

+221
-220
lines changed

26 files changed

+221
-220
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import cn.polarismesh.agent.core.bootstrap.starter.BootStrapStarter;
2121
import cn.polarismesh.agent.core.bootstrap.util.AgentDirUtils;
2222
import cn.polarismesh.agent.core.common.utils.JarFileUtils;
23+
import cn.polarismesh.agent.core.bootstrap.PolarisInitProperties;
2324

2425
import java.lang.instrument.Instrumentation;
2526
import java.util.List;
@@ -40,6 +41,9 @@ public static void premain(String agentArgs, Instrumentation instrumentation, St
4041
return;
4142
}
4243

44+
PolarisInitProperties polarisInitProperties = new PolarisInitProperties();
45+
polarisInitProperties.initialize();
46+
4347
logger.info("[Bootstrap] polaris-agent agentArgs:" + agentArgs);
4448
logger.info("[Bootstrap] polarisAgentBootStrap.ClassLoader:" + PolarisAgentBootStrap.class.getClassLoader());
4549
logger.info("[Bootstrap] contextClassLoader:" + Thread.currentThread().getContextClassLoader());
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package cn.polarismesh.agent.core.bootstrap;
2+
3+
public class PolarisInitProperties {
4+
5+
public void initialize() {
6+
7+
// ban nacos as sct currently does not support double registration
8+
System.setProperty("spring.cloud.nacos.config.enabled", "false");
9+
System.setProperty("spring.cloud.nacos.discovery.enabled", "false");
10+
11+
}
12+
}
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
server.port=65002
22
spring.application.name=service-consumer-2022
3+
management.endpoints.web.exposure.include=*
34
spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
4-
spring.cloud.nacos.discovery.enabled=false
5-
spring.cloud.nacos.config.enabled=false
6-
spring.main.allow-bean-definition-overriding=true
5+
spring.cloud.nacos.config.server-addr=127.0.0.1:8848
6+
spring.cloud.nacos.discovery.enabled=true
7+
spring.cloud.nacos.config.enabled=true
8+
spring.cloud.nacos.username=nacos
9+
spring.cloud.nacos.password=nacos
10+
spring.cloud.nacos.discovery.fail-fast=true
11+
12+
spring.cloud.loadbalancer.nacos.enabled=true
13+
# use feign client in GraalVM environment need to set below config
14+
spring.cloud.refresh.enabled=false
715
spring.main.allow-circular-references=true
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
server.port=65001
22
spring.application.name=service-provider-2022
3+
spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
34
spring.cloud.nacos.config.server-addr=127.0.0.1:8848
4-
spring.cloud.nacos.config.enabled=false
5-
spring.cloud.nacos.discovery.enabled=false
5+
spring.cloud.nacos.config.enabled=true
6+
spring.cloud.nacos.discovery.enabled=true
7+
#spring.cloud.nacos.discovery.instance-enabled=true
8+
#only register IPv4 instance
9+
#spring.cloud.nacos.discovery.ip-type=IPv4
10+
#only register IPv6 instance
11+
#spring.cloud.nacos.discovery.ip-type=IPv6
12+
613
spring.cloud.nacos.username=nacos
714
spring.cloud.nacos.password=nacos
15+
816
management.endpoints.web.exposure.include=*
917
management.endpoint.health.show-details=always
10-
spring.main.allow-bean-definition-overriding=true
18+
spring.main.allow-circular-references=true
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#server.port=65002
2+
#spring.application.name=service-consumer-2023
3+
#management.endpoints.web.exposure.include=*
4+
#spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
5+
#spring.cloud.nacos.config.server-addr=127.0.0.1:8848
6+
#spring.cloud.nacos.discovery.fail-fast=true
7+
#spring.cloud.nacos.discovery.enabled=true
8+
#spring.cloud.nacos.config.enabled=true
9+
#spring.cloud.nacos.username=nacos
10+
#spring.cloud.nacos.password=nacos
11+
#
12+
#feign.sentinel.enabled=true
13+
#
14+
#spring.cloud.sentinel.transport.dashboard=localhost:8080
15+
#spring.cloud.sentinel.eager=true
16+
#
17+
#spring.cloud.sentinel.datasource.ds1.file.file=classpath: flowrule.json
18+
#spring.cloud.sentinel.datasource.ds1.file.data-type=json
19+
#spring.cloud.sentinel.datasource.ds1.file.rule-type=flow
20+
#
21+
#spring.cloud.sentinel.datasource.ds2.file.file=classpath: degraderule.json
22+
#spring.cloud.sentinel.datasource.ds2.file.data-type=json
23+
#spring.cloud.sentinel.datasource.ds2.file.rule-type=degrade
24+
#spring.cloud.loadbalancer.nacos.enabled=true
25+
## use feign client in GraalVM environment need to set below config
26+
#spring.cloud.refresh.enabled=false
27+
#spring.main.allow-circular-references=true

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

Lines changed: 0 additions & 32 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
server.port=65002
2+
spring.application.name=service-consumer-2023
3+
management.endpoints.web.exposure.include=*
4+
spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
5+
spring.cloud.nacos.config.server-addr=127.0.0.1:8848
6+
spring.cloud.nacos.discovery.fail-fast=true
7+
spring.cloud.nacos.discovery.enabled=true
8+
spring.cloud.nacos.config.enabled=true
9+
spring.cloud.nacos.username=nacos
10+
spring.cloud.nacos.password=nacos
11+
12+
spring.cloud.loadbalancer.nacos.enabled=true
13+
# use feign client in GraalVM environment need to set below config
14+
spring.cloud.refresh.enabled=false
15+
spring.main.allow-circular-references=true

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

Lines changed: 0 additions & 32 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
server.port=65001
2+
spring.application.name=service-provider-2022
3+
spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
4+
spring.cloud.nacos.config.server-addr=127.0.0.1:8848
5+
spring.cloud.nacos.config.enabled=true
6+
spring.cloud.nacos.discovery.enabled=true
7+
#spring.cloud.nacos.discovery.instance-enabled=true
8+
#only register IPv4 instance
9+
#spring.cloud.nacos.discovery.ip-type=IPv4
10+
#only register IPv6 instance
11+
#spring.cloud.nacos.discovery.ip-type=IPv6
12+
13+
spring.cloud.nacos.username=nacos
14+
spring.cloud.nacos.password=nacos
15+
16+
management.endpoints.web.exposure.include=*
17+
management.endpoint.health.show-details=always
18+
spring.main.allow-circular-references=true

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

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)