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

Sets up MicrometerCapabilities

Browse Source
This commit is contained in:
Marcin Grzejszczak
2022-09-19 16:52:35 +02:00
parent 4dc2852ee0
commit d8c9f2b354
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ import feign.form.spring.SpringFormEncoder;
import feign.micrometer.MicrometerCapability;
import feign.optionals.OptionalDecoder;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.observation.ObservationRegistry;
import org.springframework.beans.factory.ObjectFactory;
import org.springframework.beans.factory.ObjectProvider;
@@ -243,8 +244,10 @@ public class FeignClientsConfiguration {
@Bean
@ConditionalOnMissingBean
public MicrometerCapability micrometerCapability(MeterRegistry meterRegistry) {
return new MicrometerCapability(meterRegistry);
public MicrometerCapability micrometerCapability(MeterRegistry meterRegistry,
ObjectProvider<ObservationRegistry> observationRegistry) {
return new MicrometerCapability(meterRegistry,
observationRegistry.getIfAvailable(() -> ObservationRegistry.NOOP));
}
}

2
spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/QueryMapParameterProcessor.java
View File

@@ -45,7 +45,7 @@ public class QueryMapParameterProcessor implements AnnotatedParameterProcessor {
MethodMetadata metadata = context.getMethodMetadata();
if (metadata.queryMapIndex() == null) {
metadata.queryMapIndex(paramIndex);
metadata.queryMapEncoded(SpringQueryMap.class.cast(annotation).encoded());
// metadata.queryMapEncoded(SpringQueryMap.class.cast(annotation).encoded());
}
return true;
}

2
spring-cloud-openfeign-dependencies/pom.xml
View File

@@ -15,7 +15,7 @@
<name>spring-cloud-openfeign-dependencies</name>
<description>Spring Cloud OpenFeign Dependencies</description>
<properties>
<feign.version>11.8</feign.version>
<feign.version>11.10-SNAPSHOT</feign.version>
<feign-form.version>3.8.0</feign-form.version>
<!-- Deprecated - reached EOL -->
<spring-security-oauth2-autoconfigure.version>2.5.2</spring-security-oauth2-autoconfigure.version>