diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/gray-release-examples/service-a/deployment.yaml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/gray-release-examples/service-a/deployment.yaml index a8b7a25d..f055094a 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/gray-release-examples/service-a/deployment.yaml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/gray-release-examples/service-a/deployment.yaml @@ -17,13 +17,13 @@ spec: app: service-a-2023 annotations: polarismesh.cn/javaagent: "true" - polarismesh.cn/javaagentVersion: "1.7.0-RC.0" + polarismesh.cn/javaagentVersion: "1.7.0-RC3" polarismesh.cn/javaagentFrameworkName: "spring-cloud" polarismesh.cn/javaagentFrameworkVersion: "2023" polarismesh.cn/javaagentConfig: "{\"spring.cloud.polaris.namespace\": \"default\", \"spring.cloud.polaris.router.nearby-router.matchLevel\": \"campus\"}" spec: containers: - - image: polarismesh/polaris-javaagent-demo-sc-gray-2023-service-a:1.7.0-RC.0-java17 + - image: polarismesh/polaris-javaagent-demo-sc-gray-2023-service-a:1.7.0-RC3-java17 imagePullPolicy: Always name: consumer resources: diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/gray-release-examples/service-b/deployment.yaml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/gray-release-examples/service-b/deployment.yaml index ab008070..49cdef34 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/gray-release-examples/service-b/deployment.yaml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/gray-release-examples/service-b/deployment.yaml @@ -17,13 +17,13 @@ spec: app: service-b-2023 annotations: polarismesh.cn/javaagent: "true" - polarismesh.cn/javaagentVersion: "1.7.0-RC.0" + polarismesh.cn/javaagentVersion: "1.7.0-RC3" polarismesh.cn/javaagentFrameworkName: "spring-cloud" polarismesh.cn/javaagentFrameworkVersion: "2023" polarismesh.cn/javaagentConfig: "{\"spring.cloud.polaris.namespace\": \"default\", \"spring.cloud.polaris.router.nearby-router.matchLevel\": \"campus\"}" spec: containers: - - image: polarismesh/polaris-javaagent-demo-sc-gray-2023-service-b:1.7.0-RC.0-java17 + - image: polarismesh/polaris-javaagent-demo-sc-gray-2023-service-b:1.7.0-RC3-java17 imagePullPolicy: Always name: consumer resources: diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/gray-release-examples/service-c/deployment.yaml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/gray-release-examples/service-c/deployment.yaml index d4a3dd56..e70d0985 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/gray-release-examples/service-c/deployment.yaml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/gray-release-examples/service-c/deployment.yaml @@ -17,13 +17,13 @@ spec: app: service-c-2023 annotations: polarismesh.cn/javaagent: "true" - polarismesh.cn/javaagentVersion: "1.7.0-RC.0" + polarismesh.cn/javaagentVersion: "1.7.0-RC3" polarismesh.cn/javaagentFrameworkName: "spring-cloud" polarismesh.cn/javaagentFrameworkVersion: "2023" polarismesh.cn/javaagentConfig: "{\"spring.cloud.polaris.namespace\": \"default\", \"spring.cloud.polaris.router.nearby-router.matchLevel\": \"campus\"}" spec: containers: - - image: polarismesh/polaris-javaagent-demo-sc-gray-2023-service-c:1.7.0-RC.0-java17 + - image: polarismesh/polaris-javaagent-demo-sc-gray-2023-service-c:1.7.0-RC3-java17 imagePullPolicy: Always name: consumer resources: diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/gray-release-examples/service-gateway/deployment.yaml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/gray-release-examples/service-gateway/deployment.yaml index a9062581..7cdaaad2 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/gray-release-examples/service-gateway/deployment.yaml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/gray-release-examples/service-gateway/deployment.yaml @@ -17,13 +17,13 @@ spec: app: sc-gateway-2023 annotations: polarismesh.cn/javaagent: "true" - polarismesh.cn/javaagentVersion: "1.7.0-RC.0" + polarismesh.cn/javaagentVersion: "1.7.0-RC3" polarismesh.cn/javaagentFrameworkName: "spring-cloud" polarismesh.cn/javaagentFrameworkVersion: "2023" polarismesh.cn/javaagentConfig: "{\"spring.cloud.polaris.namespace\": \"default\", \"spring.cloud.polaris.router.nearby-router.matchLevel\": \"campus\"}" spec: containers: - - image: polarismesh/polaris-javaagent-demo-sc-gray-2023-service-gateway:1.7.0-RC.0-java17 + - image: polarismesh/polaris-javaagent-demo-sc-gray-2023-service-gateway:1.7.0-RC3-java17 imagePullPolicy: Always name: consumer resources: diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/quickstart-examples/consumer/deployment.yaml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/quickstart-examples/consumer/deployment.yaml index abfbf9f1..7d273945 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/quickstart-examples/consumer/deployment.yaml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/quickstart-examples/consumer/deployment.yaml @@ -17,13 +17,13 @@ spec: app: service-consumer-2023 annotations: polarismesh.cn/javaagent: "true" - polarismesh.cn/javaagentVersion: "1.7.0-RC.0" + polarismesh.cn/javaagentVersion: "1.7.0-RC3" polarismesh.cn/javaagentFrameworkName: "spring-cloud" polarismesh.cn/javaagentFrameworkVersion: "2023" polarismesh.cn/javaagentConfig: "{\"spring.cloud.polaris.namespace\": \"default\", \"spring.cloud.polaris.router.nearby-router.matchLevel\": \"campus\", \"spring.cloud.polaris.lossless.healthCheckPath\": \"/actuator/health\"}" spec: containers: - - image: polarismesh/polaris-javaagent-demo-sc-quickstart-2023-consumer:1.7.0-RC.0-java17 + - image: polarismesh/polaris-javaagent-demo-sc-quickstart-2023-consumer:1.7.0-RC3-java17 imagePullPolicy: Always name: consumer resources: diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/quickstart-examples/gateway/deployment.yaml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/quickstart-examples/gateway/deployment.yaml index e2d9a806..fb3c163b 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/quickstart-examples/gateway/deployment.yaml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/quickstart-examples/gateway/deployment.yaml @@ -17,13 +17,13 @@ spec: app: service-gateway-2023 annotations: polarismesh.cn/javaagent: "true" - polarismesh.cn/javaagentVersion: "1.7.0-RC.0" + polarismesh.cn/javaagentVersion: "1.7.0-RC3" polarismesh.cn/javaagentFrameworkName: "spring-cloud" polarismesh.cn/javaagentFrameworkVersion: "2023" polarismesh.cn/javaagentConfig: "{\"spring.cloud.polaris.namespace\": \"default\", \"spring.cloud.polaris.router.nearby-router.matchLevel\": \"campus\", \"spring.cloud.polaris.lossless.healthCheckPath\": \"/actuator/health\"}" spec: containers: - - image: polarismesh/polaris-javaagent-demo-sc-quickstart-2023-scg:1.7.0-RC.0-java17 + - image: polarismesh/polaris-javaagent-demo-sc-quickstart-2023-scg:1.7.0-RC3-java17 imagePullPolicy: Always name: consumer resources: diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/quickstart-examples/provider/deployment.yaml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/quickstart-examples/provider/deployment.yaml index 92b066b3..923b74a7 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/quickstart-examples/provider/deployment.yaml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-2023-examples/quickstart-examples/provider/deployment.yaml @@ -17,13 +17,13 @@ spec: app: service-provider-2023 annotations: polarismesh.cn/javaagent: "true" - polarismesh.cn/javaagentVersion: "1.7.0-RC.0" + polarismesh.cn/javaagentVersion: "1.7.0-RC3" polarismesh.cn/javaagentFrameworkName: "spring-cloud" polarismesh.cn/javaagentFrameworkVersion: "2023" polarismesh.cn/javaagentConfig: "{\"spring.cloud.polaris.namespace\": \"default\", \"spring.cloud.polaris.router.nearby-router.matchLevel\": \"campus\", \"spring.cloud.polaris.lossless.healthCheckPath\": \"/actuator/health\"}" spec: containers: - - image: polarismesh/polaris-javaagent-demo-sc-quickstart-2023-provider:1.7.0-RC.0-java17 + - image: polarismesh/polaris-javaagent-demo-sc-quickstart-2023-provider:1.7.0-RC3-java17 imagePullPolicy: Always name: consumer resources: 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 index 2ca445b6..59d6b32b 100644 --- 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 @@ -56,11 +56,6 @@ - - - - - com.tencent.polaris spring-cloud-plugin-common @@ -412,12 +407,6 @@ - - com.tencent.polaris - spring-cloud-plugin-2023-common - 1.7.0-RC2 - compile - diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/inject/CommonBeanInjector.java b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/inject/CommonBeanInjector.java index 5d020040..4fb14366 100644 --- a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/inject/CommonBeanInjector.java +++ b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/inject/CommonBeanInjector.java @@ -25,7 +25,7 @@ import cn.polarismesh.agent.core.common.utils.ReflectionUtils; import cn.polarismesh.agent.plugin.spring.cloud.common.BeanInjector; import cn.polarismesh.agent.plugin.spring.cloud.common.Utils; -import cn.polarismesh.agent.plugin.spring.cloud.con.Constant; +import cn.polarismesh.agent.plugin.spring.cloud.common.Constant; import com.tencent.cloud.common.metadata.config.MetadataAutoConfiguration; import com.tencent.cloud.common.metadata.endpoint.PolarisMetadataEndpointAutoConfiguration; import com.tencent.cloud.common.util.ApplicationContextAwareUtils; @@ -54,21 +54,21 @@ public String getModule() { @Override public void onApplicationStartup(Object configurationParser, Constructor configClassCreator, Method processConfigurationClass, BeanDefinitionRegistry registry, Environment environment) { Object metadataAutoConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, MetadataAutoConfiguration.class, "metadataAutoConfiguration"); - ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, metadataAutoConfiguration, cn.polarismesh.agent.plugin.spring.cloud.con.Constant.DEFAULT_EXCLUSION_FILTER); + ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, metadataAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER); registry.registerBeanDefinition("metadataAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition( MetadataAutoConfiguration.class).getBeanDefinition()); Object polarisMetadataEndpointAutoConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, PolarisMetadataEndpointAutoConfiguration.class, "polarisMetadataEndpointAutoConfiguration"); - ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisMetadataEndpointAutoConfiguration, cn.polarismesh.agent.plugin.spring.cloud.con.Constant.DEFAULT_EXCLUSION_FILTER); + ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisMetadataEndpointAutoConfiguration,Constant.DEFAULT_EXCLUSION_FILTER); registry.registerBeanDefinition("polarisMetadataEndpointAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition( PolarisMetadataEndpointAutoConfiguration.class).getBeanDefinition()); Object applicationContextAwareUtils = ReflectionUtils.invokeConstructor(configClassCreator, ApplicationContextAwareUtils.class, "applicationContextAwareUtils"); - ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, applicationContextAwareUtils, cn.polarismesh.agent.plugin.spring.cloud.con.Constant.DEFAULT_EXCLUSION_FILTER); + ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, applicationContextAwareUtils, Constant.DEFAULT_EXCLUSION_FILTER); registry.registerBeanDefinition("applicationContextAwareUtils", BeanDefinitionBuilder.genericBeanDefinition( ApplicationContextAwareUtils.class).getBeanDefinition()); if (null != ClassUtils.getClazz("feign.RequestInterceptor", Thread.currentThread().getContextClassLoader())) { Object feignAutoConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, FeignAutoConfiguration.class, "feignAutoConfiguration"); - ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, feignAutoConfiguration, cn.polarismesh.agent.plugin.spring.cloud.con.Constant.DEFAULT_EXCLUSION_FILTER); + ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, feignAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER); registry.registerBeanDefinition("feignAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition( FeignAutoConfiguration.class).getBeanDefinition()); } diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/inject/RegistryBeanInjector.java b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/inject/RegistryBeanInjector.java index 877997cd..0a9ed910 100644 --- a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/inject/RegistryBeanInjector.java +++ b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-2023-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/inject/RegistryBeanInjector.java @@ -70,35 +70,35 @@ public void onBootstrapStartup(Object configurationParser, Constructor config @Override public void onApplicationStartup(Object configurationParser, Constructor configClassCreator, Method processConfigurationClass, BeanDefinitionRegistry registry, Environment environment) { Object polarisDiscoveryAutoConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, PolarisDiscoveryAutoConfiguration.class, "polarisDiscoveryAutoConfiguration"); - ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisDiscoveryAutoConfiguration, cn.polarismesh.agent.plugin.spring.cloud.con.Constant.DEFAULT_EXCLUSION_FILTER); + ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisDiscoveryAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER); registry.registerBeanDefinition("polarisDiscoveryAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition( PolarisDiscoveryAutoConfiguration.class).getBeanDefinition()); Object polarisDiscoveryClientConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, PolarisDiscoveryClientConfiguration.class, "polarisDiscoveryClientConfiguration"); - ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisDiscoveryClientConfiguration, cn.polarismesh.agent.plugin.spring.cloud.con.Constant.DEFAULT_EXCLUSION_FILTER); + ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisDiscoveryClientConfiguration, Constant.DEFAULT_EXCLUSION_FILTER); registry.registerBeanDefinition("polarisDiscoveryClientConfiguration", BeanDefinitionBuilder.genericBeanDefinition( PolarisDiscoveryClientConfiguration.class).getBeanDefinition()); Object polarisReactiveDiscoveryClientConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, PolarisReactiveDiscoveryClientConfiguration.class, "polarisReactiveDiscoveryClientConfiguration"); - ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisReactiveDiscoveryClientConfiguration, cn.polarismesh.agent.plugin.spring.cloud.con.Constant.DEFAULT_EXCLUSION_FILTER); + ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisReactiveDiscoveryClientConfiguration,Constant.DEFAULT_EXCLUSION_FILTER); registry.registerBeanDefinition("polarisReactiveDiscoveryClientConfiguration", BeanDefinitionBuilder.genericBeanDefinition( PolarisReactiveDiscoveryClientConfiguration.class).getBeanDefinition()); Object polarisRefreshConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, PolarisRefreshConfiguration.class, "polarisRefreshConfiguration"); - ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisRefreshConfiguration, cn.polarismesh.agent.plugin.spring.cloud.con.Constant.DEFAULT_EXCLUSION_FILTER); + ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisRefreshConfiguration, Constant.DEFAULT_EXCLUSION_FILTER); registry.registerBeanDefinition("polarisRefreshConfiguration", BeanDefinitionBuilder.genericBeanDefinition( PolarisRefreshConfiguration.class).getBeanDefinition()); Object polarisServiceRegistryAutoConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, PolarisServiceRegistryAutoConfiguration.class, "polarisServiceRegistryAutoConfiguration"); - ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisServiceRegistryAutoConfiguration, cn.polarismesh.agent.plugin.spring.cloud.con.Constant.DEFAULT_EXCLUSION_FILTER); + ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisServiceRegistryAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER); registry.registerBeanDefinition("polarisServiceRegistryAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition( PolarisServiceRegistryAutoConfiguration.class).getBeanDefinition()); Object polarisDiscoveryEndpointAutoConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, PolarisDiscoveryEndpointAutoConfiguration.class, "polarisDiscoveryEndpointAutoConfiguration"); - ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisDiscoveryEndpointAutoConfiguration, cn.polarismesh.agent.plugin.spring.cloud.con.Constant.DEFAULT_EXCLUSION_FILTER); + ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisDiscoveryEndpointAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER); registry.registerBeanDefinition("polarisDiscoveryEndpointAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition( PolarisDiscoveryEndpointAutoConfiguration.class).getBeanDefinition()); Object discoveryPropertiesAutoConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, DiscoveryPropertiesAutoConfiguration.class, "discoveryPropertiesAutoConfiguration"); - ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, discoveryPropertiesAutoConfiguration, cn.polarismesh.agent.plugin.spring.cloud.con.Constant.DEFAULT_EXCLUSION_FILTER); + ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, discoveryPropertiesAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER); registry.registerBeanDefinition("discoveryPropertiesAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition( DiscoveryPropertiesAutoConfiguration.class).getBeanDefinition()); Object discoveryPropertiesBootstrapAutoConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, DiscoveryPropertiesBootstrapAutoConfiguration.class, "discoveryPropertiesBootstrapAutoConfiguration"); - ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, discoveryPropertiesBootstrapAutoConfiguration, cn.polarismesh.agent.plugin.spring.cloud.con.Constant.DEFAULT_EXCLUSION_FILTER); + ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, discoveryPropertiesBootstrapAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER); registry.registerBeanDefinition("discoveryPropertiesBootstrapAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition( DiscoveryPropertiesBootstrapAutoConfiguration.class).getBeanDefinition()); LOGGER.info("[PolarisJavaAgent] success to inject application bean definitions for module {}", getModule()); diff --git a/pom.xml b/pom.xml index 635d2ada..ee1b95c9 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ https://github.com/polarismesh/polaris-java-agent - 1.7.0-RC2 + 1.7.0-RC3 1.15.5 32.0.1-jre UTF-8