Skip to content

Commit

Permalink
Issue ReactiveX#161: Fixed Spring Boot Prometheus AutoConfiguration
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Winkler committed Sep 15, 2017
1 parent 8b27935 commit e590f7b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,20 @@
*/
package io.github.resilience4j.circuitbreaker.autoconfigure;

import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
import io.github.resilience4j.prometheus.CircuitBreakerExports;
import io.prometheus.client.CollectorRegistry;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

/**
* {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration
* Auto-configuration} for resilience4j-metrics.
*/
@Configuration
@AutoConfigureAfter(value = CircuitBreakerAutoConfiguration.class)
@ConditionalOnClass(CollectorRegistry.class)
public class CircuitBreakerPrometheusAutoConfiguration {
@Bean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import io.github.resilience4j.prometheus.RateLimiterExports;
import io.github.resilience4j.ratelimiter.RateLimiterRegistry;
import io.prometheus.client.CollectorRegistry;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand All @@ -27,6 +28,7 @@
* Auto-configuration} for resilience4j-metrics.
*/
@Configuration
@AutoConfigureAfter(value = RateLimiterAutoConfiguration.class)
@ConditionalOnClass(CollectorRegistry.class)
public class RateLimiterPrometheusAutoConfiguration {
@Bean
Expand Down

0 comments on commit e590f7b

Please sign in to comment.