diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerConfiguration.java index 913b54c9..f23e5282 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2014 the original author or authors. + * Copyright 2013-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,6 +32,7 @@ import org.springframework.boot.actuate.metrics.GaugeService; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.client.actuator.HasFeatures; import org.springframework.cloud.client.actuator.NamedFeature; import org.springframework.context.SmartLifecycle; @@ -49,6 +50,7 @@ import com.netflix.hystrix.contrib.metrics.eventstream.HystrixMetricsStreamServl /** * @author Spencer Gibb * @author Christian Dupuis + * @author Venil Noronha */ @Configuration public class HystrixCircuitBreakerConfiguration { @@ -88,6 +90,7 @@ public class HystrixCircuitBreakerConfiguration { @Configuration @ConditionalOnProperty(value = "hystrix.metrics.enabled", matchIfMissing = true) @ConditionalOnClass({ HystrixMetricsPoller.class, GaugeService.class }) + @EnableConfigurationProperties(HystrixMetricsProperties.class) protected static class HystrixMetricsPollerConfiguration implements SmartLifecycle { private static Log logger = LogFactory @@ -96,6 +99,9 @@ public class HystrixCircuitBreakerConfiguration { @Autowired(required = false) private GaugeService gauges; + @Autowired + private HystrixMetricsProperties metricsProperties; + private ObjectMapper mapper = new ObjectMapper(); private HystrixMetricsPoller poller; @@ -125,7 +131,8 @@ public class HystrixCircuitBreakerConfiguration { } }; - this.poller = new HystrixMetricsPoller(listener, 2000); + this.poller = new HystrixMetricsPoller(listener, + metricsProperties.getPollingIntervalMs()); // start polling and it will write directly to the listener this.poller.start(); logger.info("Starting poller"); diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixMetricsProperties.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixMetricsProperties.java new file mode 100644 index 00000000..d40b8c80 --- /dev/null +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixMetricsProperties.java @@ -0,0 +1,36 @@ +/* + * Copyright 2013-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.netflix.hystrix; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +import lombok.Data; + +/** + * @author Venil Noronha + */ +@Data +@ConfigurationProperties("hystrix.metrics") +public class HystrixMetricsProperties { + + /** Enable Hystrix metrics polling. Defaults to true. */ + private boolean enabled = true; + + /** Interval between subsequent polling of metrics. Defaults to 2000 ms. */ + private Integer pollingIntervalMs = 2000; + +}