Skip to content

Commit 3bb7d57

Browse files
fuyuwei01fuyuwei01
authored
feat: support SCT 2.1.1.0-2023.0.6. (#215)
1 parent 4634c96 commit 3bb7d57

File tree

10 files changed

+21
-172
lines changed

10 files changed

+21
-172
lines changed

‎polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<properties>
1616
<spring.cloud.version>2023.0.6</spring.cloud.version>
17-
<spring.cloud.tencent.version>2.1.0.1-2023.0.6-SNAPSHOT</spring.cloud.tencent.version>
17+
<spring.cloud.tencent.version>2.1.1.0-2023.0.6-SNAPSHOT</spring.cloud.tencent.version>
1818
<spring.boot.version>3.2.3</spring.boot.version>
1919
<slf4j.vesion>1.7.30</slf4j.vesion>
2020
<jdk.home>${env.JAVA_17_HOME}</jdk.home>

‎polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/inject/AuthBeanInjector.java‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@
2222
import cn.polarismesh.agent.plugin.spring.cloud.common.Utils;
2323
import com.tencent.cloud.polaris.auth.config.PolarisAuthAutoConfiguration;
2424
import com.tencent.cloud.polaris.auth.config.PolarisAuthPropertiesAutoConfiguration;
25-
import com.tencent.cloud.polaris.auth.config.PolarisAuthPropertiesBootstrapConfiguration;
2625
import java.lang.reflect.Constructor;
2726
import java.lang.reflect.Method;
28-
import java.util.concurrent.atomic.AtomicBoolean;
2927
import org.slf4j.Logger;
3028
import org.slf4j.LoggerFactory;
3129
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -36,34 +34,11 @@ public class AuthBeanInjector implements BeanInjector {
3634

3735
private static final Logger LOGGER = LoggerFactory.getLogger(AuthBeanInjector.class);
3836

39-
private final AtomicBoolean bootstrapLoaded = new AtomicBoolean(false);
40-
4137
@Override
4238
public String getModule() {
4339
return "spring-cloud-starter-tencent-polaris-auth";
4440
}
4541

46-
@Override
47-
public void onBootstrapStartup(Object configurationParser, Constructor<?> configClassCreator,
48-
Method processConfigurationClass, BeanDefinitionRegistry registry, Environment environment) {
49-
if (!(Utils.checkPolarisEnabled(environment) && Utils.checkKeyEnabled(environment,
50-
"spring.cloud.polaris.auth.enabled"))) {
51-
LOGGER.warn(
52-
"[PolarisJavaAgent] polaris auth not enabled, skip inject bootstrap bean definitions for module {}",
53-
getModule());
54-
return;
55-
}
56-
bootstrapLoaded.set(true);
57-
Object polarisAuthPropertiesBootstrapConfiguration = ReflectionUtils.invokeConstructor(configClassCreator,
58-
PolarisAuthPropertiesBootstrapConfiguration.class, "polarisAuthPropertiesBootstrapConfiguration");
59-
ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser,
60-
polarisAuthPropertiesBootstrapConfiguration, Constant.DEFAULT_EXCLUSION_FILTER);
61-
registry.registerBeanDefinition("polarisAuthPropertiesBootstrapConfiguration",
62-
BeanDefinitionBuilder.genericBeanDefinition(PolarisAuthPropertiesBootstrapConfiguration.class)
63-
.getBeanDefinition());
64-
LOGGER.info("[PolarisJavaAgent] success to inject bootstrap bean definitions for module {}", getModule());
65-
}
66-
6742
@Override
6843
public void onApplicationStartup(Object configurationParser, Constructor<?> configClassCreator,
6944
Method processConfigurationClass, BeanDefinitionRegistry registry, Environment environment) {
@@ -74,10 +49,6 @@ public void onApplicationStartup(Object configurationParser, Constructor<?> conf
7449
getModule());
7550
return;
7651
}
77-
if (!bootstrapLoaded.get()) {
78-
onBootstrapStartup(configurationParser, configClassCreator, processConfigurationClass, registry,
79-
environment);
80-
}
8152
Object polarisAuthAutoConfiguration = ReflectionUtils.invokeConstructor(configClassCreator,
8253
PolarisAuthAutoConfiguration.class, "polarisAuthAutoConfiguration");
8354
ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser,

‎polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/inject/CircuitBreakerBeanInjector.java‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import cn.polarismesh.agent.plugin.spring.cloud.common.Utils;
2525
import com.tencent.cloud.polaris.circuitbreaker.config.GatewayPolarisCircuitBreakerAutoConfiguration;
2626
import com.tencent.cloud.polaris.circuitbreaker.config.PolarisCircuitBreakerAutoConfiguration;
27-
import com.tencent.cloud.polaris.circuitbreaker.config.PolarisCircuitBreakerBootstrapConfiguration;
2827
import com.tencent.cloud.polaris.circuitbreaker.config.PolarisCircuitBreakerFeignClientAutoConfiguration;
2928
import org.slf4j.Logger;
3029
import org.slf4j.LoggerFactory;
@@ -34,42 +33,23 @@
3433

3534
import java.lang.reflect.Constructor;
3635
import java.lang.reflect.Method;
37-
import java.util.concurrent.atomic.AtomicBoolean;
3836

3937
public class CircuitBreakerBeanInjector implements BeanInjector {
4038

4139
private static final Logger LOGGER = LoggerFactory.getLogger(CircuitBreakerBeanInjector.class);
4240

43-
private final AtomicBoolean bootstrapLoaded = new AtomicBoolean(false);
44-
4541
@Override
4642
public String getModule() {
4743
return "spring-cloud-starter-tencent-polaris-circuitbreaker";
4844
}
4945

50-
@Override
51-
public void onBootstrapStartup(Object configurationParser, Constructor<?> configClassCreator, Method processConfigurationClass, BeanDefinitionRegistry registry, Environment environment) {
52-
if (!(Utils.checkPolarisEnabled(environment) && Utils.checkKeyEnabled(environment, "spring.cloud.polaris.circuitbreaker.enabled"))) {
53-
LOGGER.warn("[PolarisJavaAgent] polaris circuitbreaker not enabled, skip inject bootstrap bean definitions for module {}", getModule());
54-
return;
55-
}
56-
bootstrapLoaded.set(true);
57-
Object polarisCircuitBreakerBootstrapConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, PolarisCircuitBreakerBootstrapConfiguration.class, "polarisCircuitBreakerBootstrapConfiguration");
58-
ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisCircuitBreakerBootstrapConfiguration, Constant.DEFAULT_EXCLUSION_FILTER);
59-
registry.registerBeanDefinition("polarisCircuitBreakerBootstrapConfiguration", BeanDefinitionBuilder.genericBeanDefinition(
60-
PolarisCircuitBreakerBootstrapConfiguration.class).getBeanDefinition());
61-
LOGGER.info("[PolarisJavaAgent] success to inject bootstrap bean definitions for module {}", getModule());
62-
}
6346

6447
@Override
6548
public void onApplicationStartup(Object configurationParser, Constructor<?> configClassCreator, Method processConfigurationClass, BeanDefinitionRegistry registry, Environment environment) {
6649
if (!(Utils.checkPolarisEnabled(environment) && Utils.checkKeyEnabled(environment, "spring.cloud.polaris.circuitbreaker.enabled"))) {
6750
LOGGER.warn("[PolarisJavaAgent] polaris not enabled, skip inject application bean definitions for module {}", getModule());
6851
return;
6952
}
70-
if (!bootstrapLoaded.get()) {
71-
onBootstrapStartup(configurationParser, configClassCreator, processConfigurationClass, registry, environment);
72-
}
7353
Object polarisCircuitBreakerAutoConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, PolarisCircuitBreakerAutoConfiguration.class, "polarisCircuitBreakerAutoConfiguration");
7454
ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisCircuitBreakerAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER);
7555
registry.registerBeanDefinition("polarisCircuitBreakerAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition(

‎polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/inject/CommonBeanInjector.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import cn.polarismesh.agent.core.common.utils.ReflectionUtils;
2121
import cn.polarismesh.agent.plugin.spring.cloud.common.BeanInjector;
2222
import cn.polarismesh.agent.plugin.spring.cloud.common.Constant;
23+
import com.tencent.cloud.common.async.PolarisAsyncPropertiesAutoConfiguration;
24+
import com.tencent.cloud.common.async.PolarisAsyncConfiguration;
2325
import com.tencent.cloud.common.metadata.config.MetadataAutoConfiguration;
2426
import com.tencent.cloud.common.util.ApplicationContextAwareUtils;
2527
import com.tencent.cloud.polaris.context.logging.PolarisLoggingApplicationListener;
@@ -31,14 +33,11 @@
3133

3234
import java.lang.reflect.Constructor;
3335
import java.lang.reflect.Method;
34-
import java.util.concurrent.atomic.AtomicBoolean;
3536

3637
public class CommonBeanInjector implements BeanInjector {
3738

3839
private static final Logger LOGGER = LoggerFactory.getLogger(CommonBeanInjector.class);
3940

40-
private final AtomicBoolean bootstrapLoaded = new AtomicBoolean(false);
41-
4241
@Override
4342
public String getModule() {
4443
return "spring-cloud-tencent-commons";
@@ -58,12 +57,14 @@ public void onApplicationStartup(Object configurationParser, Constructor<?> conf
5857
ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisLoggingApplicationListener, Constant.DEFAULT_EXCLUSION_FILTER);
5958
registry.registerBeanDefinition("polarisLoggingApplicationListener", BeanDefinitionBuilder.genericBeanDefinition(
6059
PolarisLoggingApplicationListener.class).getBeanDefinition());
60+
Object polarisAsyncPropertiesAutoConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, PolarisAsyncPropertiesAutoConfiguration.class, "polarisAsyncPropertiesAutoConfiguration");
61+
ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisAsyncPropertiesAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER);
62+
registry.registerBeanDefinition("polarisAsyncPropertiesAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition(
63+
PolarisAsyncPropertiesAutoConfiguration.class).getBeanDefinition());
64+
Object polarisAsyncConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, PolarisAsyncConfiguration.class, "polarisAsyncConfiguration");
65+
ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisAsyncConfiguration, Constant.DEFAULT_EXCLUSION_FILTER);
66+
registry.registerBeanDefinition("polarisAsyncConfiguration", BeanDefinitionBuilder.genericBeanDefinition(
67+
PolarisAsyncConfiguration.class).getBeanDefinition());
6168
LOGGER.info("[PolarisJavaAgent] success to inject application bean definitions for module {}", getModule());
6269
}
63-
64-
65-
@Override
66-
public void onBootstrapStartup(Object configurationParser, Constructor<?> configClassCreator, Method processConfigurationClass, BeanDefinitionRegistry registry, Environment environment) {
67-
LOGGER.info("[PolarisJavaAgent] success to inject bootstrap bean definitions for module {}", getModule());
68-
}
6970
}

‎polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/inject/LoadbalancerBeanInjector.java‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
import cn.polarismesh.agent.plugin.spring.cloud.common.Constant;
2323
import cn.polarismesh.agent.plugin.spring.cloud.common.Utils;
2424
import com.tencent.cloud.polaris.loadbalancer.PolarisLoadBalancerAutoConfiguration;
25-
import com.tencent.cloud.polaris.loadbalancer.PolarisLoadBalancerBootstrapAutoConfiguration;
2625
import com.tencent.cloud.polaris.loadbalancer.PolarisLoadBalancerPropertiesAutoConfiguration;
27-
import java.util.concurrent.atomic.AtomicBoolean;
2826
import org.slf4j.Logger;
2927
import org.slf4j.LoggerFactory;
3028
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -38,34 +36,16 @@ public class LoadbalancerBeanInjector implements BeanInjector {
3836

3937
private static final Logger LOGGER = LoggerFactory.getLogger(LoadbalancerBeanInjector.class);
4038

41-
private final AtomicBoolean bootstrapLoaded = new AtomicBoolean(false);
42-
4339
@Override
4440
public String getModule() {
4541
return "spring-cloud-tencent-polaris-loadbalancer";
4642
}
4743
@Override
48-
public void onBootstrapStartup(Object configurationParser, Constructor<?> configClassCreator,
49-
Method processConfigurationClass, BeanDefinitionRegistry registry, Environment environment) {
50-
bootstrapLoaded.set(true);
51-
Object polarisLoadBalancerBootstrapAutoConfiguration = ReflectionUtils.invokeConstructor(configClassCreator,
52-
PolarisLoadBalancerBootstrapAutoConfiguration.class, "polarisLoadBalancerBootstrapAutoConfiguration");
53-
ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser,
54-
polarisLoadBalancerBootstrapAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER);
55-
registry.registerBeanDefinition("polarisLoadBalancerBootstrapAutoConfiguration",
56-
BeanDefinitionBuilder.genericBeanDefinition(PolarisLoadBalancerBootstrapAutoConfiguration.class)
57-
.getBeanDefinition());
58-
LOGGER.info("[PolarisJavaAgent] success to inject bootstrap bean definitions for module {}", getModule());
59-
}
60-
@Override
6144
public void onApplicationStartup(Object configurationParser, Constructor<?> configClassCreator, Method processConfigurationClass, BeanDefinitionRegistry registry, Environment environment) {
6245
if (!(Utils.checkPolarisEnabled(environment) && Utils.checkKeyEnabled(environment, "spring.cloud.polaris.loadbalancer.enabled"))) {
6346
LOGGER.warn("[PolarisJavaAgent] polaris loadbalancer not enabled, skip inject application bean definitions for module {}", getModule());
6447
return;
6548
}
66-
if (!bootstrapLoaded.get()) {
67-
onBootstrapStartup(configurationParser, configClassCreator, processConfigurationClass, registry, environment);
68-
}
6949
Object polarisLoadBalancerPropertiesAutoConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, PolarisLoadBalancerPropertiesAutoConfiguration.class, "polarisLoadBalancerPropertiesAutoConfiguration");
7050
ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisLoadBalancerPropertiesAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER);
7151
registry.registerBeanDefinition("polarisLoadBalancerPropertiesAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition(

‎polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/inject/LosslessBeanInjector.java‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import cn.polarismesh.agent.plugin.spring.cloud.common.Utils;
2424
import com.tencent.cloud.plugin.lossless.config.LosslessAutoConfiguration;
2525
import com.tencent.cloud.plugin.lossless.config.LosslessPropertiesAutoConfiguration;
26-
import com.tencent.cloud.plugin.lossless.config.LosslessPropertiesBootstrapConfiguration;
2726
import org.slf4j.Logger;
2827
import org.slf4j.LoggerFactory;
2928
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -32,42 +31,23 @@
3231

3332
import java.lang.reflect.Constructor;
3433
import java.lang.reflect.Method;
35-
import java.util.concurrent.atomic.AtomicBoolean;
3634

3735
public class LosslessBeanInjector implements BeanInjector {
3836

3937
private static final Logger LOGGER = LoggerFactory.getLogger(LosslessBeanInjector.class);
4038

41-
private final AtomicBoolean bootstrapLoaded = new AtomicBoolean(false);
42-
4339
@Override
4440
public String getModule() {
4541
return "spring-cloud-tencent-lossless-plugin";
4642
}
4743

48-
@Override
49-
public void onBootstrapStartup(Object configurationParser, Constructor<?> configClassCreator, Method processConfigurationClass, BeanDefinitionRegistry registry, Environment environment) {
50-
if (!(Utils.checkPolarisEnabled(environment) && Utils.checkKeyEnabled(environment, "spring.cloud.polaris.lossless.enabled"))) {
51-
LOGGER.warn("[PolarisJavaAgent] polaris lossless not enabled, skip inject bootstrap bean definitions for module {}", getModule());
52-
return;
53-
}
54-
bootstrapLoaded.set(true);
55-
Object losslessPropertiesBootstrapConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, LosslessPropertiesBootstrapConfiguration.class, "losslessPropertiesBootstrapConfiguration");
56-
ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, losslessPropertiesBootstrapConfiguration, Constant.DEFAULT_EXCLUSION_FILTER);
57-
registry.registerBeanDefinition("losslessPropertiesBootstrapConfiguration", BeanDefinitionBuilder.genericBeanDefinition(
58-
LosslessPropertiesBootstrapConfiguration.class).getBeanDefinition());
59-
LOGGER.info("[PolarisJavaAgent] success to inject bootstrap bean definitions for module {}", getModule());
60-
}
6144

6245
@Override
6346
public void onApplicationStartup(Object configurationParser, Constructor<?> configClassCreator, Method processConfigurationClass, BeanDefinitionRegistry registry, Environment environment) {
6447
if (!(Utils.checkPolarisEnabled(environment) && Utils.checkKeyEnabled(environment, "spring.cloud.polaris.lossless.enabled"))) {
6548
LOGGER.warn("[PolarisJavaAgent] polaris lossless not enabled, skip inject application bean definitions for module {}", getModule());
6649
return;
6750
}
68-
if (!bootstrapLoaded.get()) {
69-
onBootstrapStartup(configurationParser, configClassCreator, processConfigurationClass, registry, environment);
70-
}
7151
Object losslessPropertiesAutoConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, LosslessPropertiesAutoConfiguration.class, "losslessPropertiesAutoConfiguration");
7252
ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, losslessPropertiesAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER);
7353
registry.registerBeanDefinition("losslessPropertiesAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition(

‎polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/inject/PolarisContextBeanInjector.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import cn.polarismesh.agent.plugin.spring.cloud.common.Constant;
2323
import cn.polarismesh.agent.plugin.spring.cloud.common.Utils;
2424
import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration;
25-
import com.tencent.cloud.polaris.context.config.PolarisContextBootstrapAutoConfiguration;
2625
import com.tencent.cloud.polaris.context.config.PolarisContextPostConfiguration;
26+
import com.tencent.cloud.polaris.context.config.PolarisContextPropertiesBootstrapAutoConfiguration;
2727
import org.slf4j.Logger;
2828
import org.slf4j.LoggerFactory;
2929
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -65,10 +65,10 @@ public void onBootstrapStartup(Object configurationParser,
6565
return;
6666
}
6767
bootstrapLoaded.set(true);
68-
Object polarisContextBootstrapAutoConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, PolarisContextBootstrapAutoConfiguration.class, "polarisContextBootstrapAutoConfiguration");
69-
ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisContextBootstrapAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER);
70-
registry.registerBeanDefinition("polarisContextBootstrapAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition(
71-
PolarisContextBootstrapAutoConfiguration.class).getBeanDefinition());
68+
Object polarisContextPropertiesBootstrapAutoConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, PolarisContextPropertiesBootstrapAutoConfiguration.class, "polarisContextPropertiesBootstrapAutoConfiguration");
69+
ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisContextPropertiesBootstrapAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER);
70+
registry.registerBeanDefinition("polarisContextPropertiesBootstrapAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition(
71+
PolarisContextPropertiesBootstrapAutoConfiguration.class).getBeanDefinition());
7272
LOGGER.info("[PolarisJavaAgent] success to inject bootstrap bean definitions for module {}", getModule());
7373
}
7474

0 commit comments

Comments
 (0)