diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-fault-injection-plugin/src/main/java/com/tencent/cloud/plugin/fault/config/FaultInjectionAutoConfiguration.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-fault-injection-plugin/src/main/java/com/tencent/cloud/plugin/fault/config/FaultInjectionAutoConfiguration.java index 32aedb416..c81ffd29d 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-fault-injection-plugin/src/main/java/com/tencent/cloud/plugin/fault/config/FaultInjectionAutoConfiguration.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-fault-injection-plugin/src/main/java/com/tencent/cloud/plugin/fault/config/FaultInjectionAutoConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Configuration; * @author Haotian Zhang */ @Configuration(proxyBeanMethods = false) -@ConditionalOnProperty(value = "spring.cloud.polaris.fault-injection.enabled", matchIfMissing = true) +@ConditionalOnProperty("spring.cloud.polaris.fault-injection.enabled") @EnableConfigurationProperties(FaultInjectionProperties.class) public class FaultInjectionAutoConfiguration { diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-fault-injection-plugin/src/main/java/com/tencent/cloud/plugin/fault/config/FaultInjectionProperties.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-fault-injection-plugin/src/main/java/com/tencent/cloud/plugin/fault/config/FaultInjectionProperties.java index af2af1842..bbaf4f63d 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-fault-injection-plugin/src/main/java/com/tencent/cloud/plugin/fault/config/FaultInjectionProperties.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-fault-injection-plugin/src/main/java/com/tencent/cloud/plugin/fault/config/FaultInjectionProperties.java @@ -28,9 +28,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties; public class FaultInjectionProperties { /** - * If traffic mirroring is enabled. Default is true. + * If traffic mirroring is enabled. Default is false. */ - private boolean enabled = true; + private boolean enabled = false; public boolean isEnabled() { return enabled; diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-traffic-mirroring-plugin/src/main/java/com/tencent/cloud/plugin/trafficmirroring/config/TrafficMirroringAutoConfiguration.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-traffic-mirroring-plugin/src/main/java/com/tencent/cloud/plugin/trafficmirroring/config/TrafficMirroringAutoConfiguration.java index d7b385b31..023152070 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-traffic-mirroring-plugin/src/main/java/com/tencent/cloud/plugin/trafficmirroring/config/TrafficMirroringAutoConfiguration.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-traffic-mirroring-plugin/src/main/java/com/tencent/cloud/plugin/trafficmirroring/config/TrafficMirroringAutoConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration(proxyBeanMethods = false) @ConditionalOnPolarisRouterEnabled -@ConditionalOnProperty(value = "spring.cloud.polaris.traffic-mirroring.enabled", matchIfMissing = true) +@ConditionalOnProperty("spring.cloud.polaris.traffic-mirroring.enabled") @EnableConfigurationProperties(TrafficMirroringProperties.class) public class TrafficMirroringAutoConfiguration { diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-traffic-mirroring-plugin/src/main/java/com/tencent/cloud/plugin/trafficmirroring/config/TrafficMirroringProperties.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-traffic-mirroring-plugin/src/main/java/com/tencent/cloud/plugin/trafficmirroring/config/TrafficMirroringProperties.java index b4e12d773..0bcb13196 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-traffic-mirroring-plugin/src/main/java/com/tencent/cloud/plugin/trafficmirroring/config/TrafficMirroringProperties.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-traffic-mirroring-plugin/src/main/java/com/tencent/cloud/plugin/trafficmirroring/config/TrafficMirroringProperties.java @@ -28,9 +28,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties; public class TrafficMirroringProperties { /** - * If traffic mirroring is enabled. Default is true. + * If traffic mirroring is enabled. Default is false. */ - private boolean enabled = true; + private boolean enabled = false; /** * Traffic mirroring request pool size. Default is 100. diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-traffic-mirroring-plugin/src/test/java/com/tencent/cloud/plugin/trafficmirroring/config/TrafficMirroringPropertiesTest.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-traffic-mirroring-plugin/src/test/java/com/tencent/cloud/plugin/trafficmirroring/config/TrafficMirroringPropertiesTest.java index 871923e45..205682236 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-traffic-mirroring-plugin/src/test/java/com/tencent/cloud/plugin/trafficmirroring/config/TrafficMirroringPropertiesTest.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-traffic-mirroring-plugin/src/test/java/com/tencent/cloud/plugin/trafficmirroring/config/TrafficMirroringPropertiesTest.java @@ -31,7 +31,7 @@ public class TrafficMirroringPropertiesTest { void testDefaultValues() { TrafficMirroringProperties properties = new TrafficMirroringProperties(); - assertThat(properties.isEnabled()).isTrue(); + assertThat(properties.isEnabled()).isFalse(); assertThat(properties.getRequestPoolSize()).isEqualTo(100); assertThat(properties.getRequestConnectionTimeout()).isEqualTo(5000L); } @@ -40,9 +40,9 @@ public class TrafficMirroringPropertiesTest { void testEnabledProperty() { TrafficMirroringProperties properties = new TrafficMirroringProperties(); - properties.setEnabled(false); + properties.setEnabled(true); - assertThat(properties.isEnabled()).isFalse(); + assertThat(properties.isEnabled()).isTrue(); } @Test @@ -88,14 +88,14 @@ public class TrafficMirroringPropertiesTest { @Test void testToString() { TrafficMirroringProperties properties = new TrafficMirroringProperties(); - properties.setEnabled(false); + properties.setEnabled(true); properties.setRequestPoolSize(8); properties.setRequestConnectionTimeout(2000L); String result = properties.toString(); assertThat(result) - .contains("enabled=false") + .contains("enabled=true") .contains("requestPoolSize=8") .contains("requestConnectionTimeout=2000"); }