SpringCloud/spring-cloud-circuitbreaker
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #218 from ryanjbaxter/duplicate-metrics

Browse Source 
Add autoconfigureafter annotation to avoid duplicate metrics
This commit is contained in:
Ryan Baxter
2024-10-16 10:26:40 -04:00
committed by GitHub
parent 39609c3bb3 854e1f1fa1
commit 9d48c8cda3
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/maven.yaml vendored
View File

@@ -5,9 +5,9 @@ name: Build
on:
push:
branches: [ main, 3.0.x, 2.1.x ]
branches: [ main, 3.1.x, 3.0.x, 2.1.x ]
pull_request:
branches: [ main, 3.0.x, 2.1.x ]
branches: [ main, 3.1.x, 3.0.x, 2.1.x ]
jobs:
build:

3
spring-cloud-circuitbreaker-resilience4j/src/main/java/org/springframework/cloud/circuitbreaker/resilience4j/Resilience4JAutoConfiguration.java
View File

@@ -27,6 +27,7 @@ import io.github.resilience4j.micrometer.tagged.TaggedBulkheadMetrics;
import io.github.resilience4j.micrometer.tagged.TaggedCircuitBreakerMetrics;
import io.github.resilience4j.micrometer.tagged.TaggedCircuitBreakerMetricsPublisher;
import io.github.resilience4j.micrometer.tagged.TaggedThreadPoolBulkheadMetrics;
import io.github.resilience4j.springboot3.circuitbreaker.autoconfigure.CircuitBreakerMetricsAutoConfiguration;
import io.github.resilience4j.timelimiter.TimeLimiterRegistry;
import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.MeterRegistry;
@@ -36,6 +37,7 @@ import io.micrometer.observation.ObservationRegistry;
import jakarta.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -55,6 +57,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(Resilience4JConfigurationProperties.class)
@ConditionalOnProperty(name = { "spring.cloud.circuitbreaker.resilience4j.enabled",
"spring.cloud.circuitbreaker.resilience4j.blocking.enabled" }, matchIfMissing = true)
@AutoConfigureAfter(CircuitBreakerMetricsAutoConfiguration.class)
public class Resilience4JAutoConfiguration {
@Autowired(required = false)