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

FeignBuilderCustomizer instead of capabilities

Browse Source
This commit is contained in:
Marcin Grzejszczak
2022-09-28 14:41:58 +02:00
parent d8c9f2b354
commit 71c65fad4a
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java
View File

@@ -28,7 +28,9 @@ import feign.codec.Decoder;
import feign.codec.Encoder;
import feign.form.MultipartFormContentProcessor;
import feign.form.spring.SpringFormEncoder;
import feign.micrometer.FeignObservationConvention;
import feign.micrometer.MicrometerCapability;
import feign.micrometer.ObservedClientInterceptor;
import feign.optionals.OptionalDecoder;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.observation.ObservationRegistry;
@@ -244,10 +246,16 @@ public class FeignClientsConfiguration {
@Bean
@ConditionalOnMissingBean
public MicrometerCapability micrometerCapability(MeterRegistry meterRegistry,
ObjectProvider<ObservationRegistry> observationRegistry) {
return new MicrometerCapability(meterRegistry,
observationRegistry.getIfAvailable(() -> ObservationRegistry.NOOP));
public MicrometerCapability micrometerCapability(MeterRegistry meterRegistry) {
return new MicrometerCapability(meterRegistry);
}
@Bean
@ConditionalOnBean(ObservationRegistry.class)
public FeignBuilderCustomizer defaultClientInterceptorProvider(ObservationRegistry observationRegistry,
ObjectProvider<FeignObservationConvention> feignObservationConvention) {
return builder -> builder.clientInterceptor(
new ObservedClientInterceptor(observationRegistry, feignObservationConvention.getIfAvailable()));
}
}