root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Adapt to breaking API changes in latest Micrometer snapshots

Browse Source 
See gh-30800
pull/30825/head
Andy Wilkinson 3 years ago
parent fb16907c0e
commit 6d15e6d4ef
6 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File

3
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfiguration.java
Unescape Escape View File

@ -17,6 +17,7 @@
package org.springframework.boot.actuate.autoconfigure.observation; package org.springframework.boot.actuate.autoconfigure.observation;
import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.observation.Observation.Context;
import io.micrometer.observation.Observation.GlobalKeyValuesProvider; import io.micrometer.observation.Observation.GlobalKeyValuesProvider;
import io.micrometer.observation.ObservationHandler; import io.micrometer.observation.ObservationHandler;
import io.micrometer.observation.ObservationPredicate; import io.micrometer.observation.ObservationPredicate;
@ -49,7 +50,7 @@ public class ObservationAutoConfiguration {
ObjectProvider<ObservationRegistryCustomizer<?>> observationRegistryCustomizers, ObjectProvider<ObservationRegistryCustomizer<?>> observationRegistryCustomizers,
ObjectProvider<ObservationPredicate> observationPredicates, ObjectProvider<ObservationPredicate> observationPredicates,
ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders, ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders,
ObjectProvider<ObservationHandler<?>> observationHandlers, ObjectProvider<ObservationHandler<Context>> observationHandlers,
ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) { ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) {
return new ObservationRegistryPostProcessor(observationRegistryCustomizers, observationPredicates, tagProviders, return new ObservationRegistryPostProcessor(observationRegistryCustomizers, observationPredicates, tagProviders,
observationHandlers, observationHandlerGrouping); observationHandlers, observationHandlerGrouping);

3
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationHandlerGrouping.java
Unescape Escape View File

@ -18,6 +18,7 @@ package org.springframework.boot.actuate.autoconfigure.observation;
import java.util.Collection; import java.util.Collection;
import io.micrometer.observation.Observation.Context;
import io.micrometer.observation.ObservationHandler; import io.micrometer.observation.ObservationHandler;
import io.micrometer.observation.ObservationRegistry.ObservationConfig; import io.micrometer.observation.ObservationRegistry.ObservationConfig;
@ -34,6 +35,6 @@ interface ObservationHandlerGrouping {
* @param handlers the list of observation handlers * @param handlers the list of observation handlers
* @param config the config to apply the handlers to * @param config the config to apply the handlers to
*/ */
void apply(Collection<ObservationHandler<?>> handlers, ObservationConfig config); void apply(Collection<ObservationHandler<Context>> handlers, ObservationConfig config);
} }

5
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationRegistryConfigurer.java
Unescape Escape View File

@ -18,6 +18,7 @@ package org.springframework.boot.actuate.autoconfigure.observation;
import java.util.List; import java.util.List;
import io.micrometer.observation.Observation.Context;
import io.micrometer.observation.Observation.GlobalKeyValuesProvider; import io.micrometer.observation.Observation.GlobalKeyValuesProvider;
import io.micrometer.observation.ObservationHandler; import io.micrometer.observation.ObservationHandler;
import io.micrometer.observation.ObservationPredicate; import io.micrometer.observation.ObservationPredicate;
@ -44,14 +45,14 @@ class ObservationRegistryConfigurer {
private final ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders; private final ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders;
private final ObjectProvider<ObservationHandler<?>> observationHandlers; private final ObjectProvider<ObservationHandler<Context>> observationHandlers;
private final ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping; private final ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping;
ObservationRegistryConfigurer(ObjectProvider<ObservationRegistryCustomizer<?>> customizers, ObservationRegistryConfigurer(ObjectProvider<ObservationRegistryCustomizer<?>> customizers,
ObjectProvider<ObservationPredicate> observationPredicates, ObjectProvider<ObservationPredicate> observationPredicates,
ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders, ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders,
ObjectProvider<ObservationHandler<?>> observationHandlers, ObjectProvider<ObservationHandler<Context>> observationHandlers,
ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) { ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) {
this.customizers = customizers; this.customizers = customizers;
this.observationPredicates = observationPredicates; this.observationPredicates = observationPredicates;

5
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationRegistryPostProcessor.java
Unescape Escape View File

@ -16,6 +16,7 @@
package org.springframework.boot.actuate.autoconfigure.observation; package org.springframework.boot.actuate.autoconfigure.observation;
import io.micrometer.observation.Observation.Context;
import io.micrometer.observation.Observation.GlobalKeyValuesProvider; import io.micrometer.observation.Observation.GlobalKeyValuesProvider;
import io.micrometer.observation.ObservationHandler; import io.micrometer.observation.ObservationHandler;
import io.micrometer.observation.ObservationPredicate; import io.micrometer.observation.ObservationPredicate;
@ -40,7 +41,7 @@ class ObservationRegistryPostProcessor implements BeanPostProcessor {
private final ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders; private final ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders;
private final ObjectProvider<ObservationHandler<?>> observationHandlers; private final ObjectProvider<ObservationHandler<Context>> observationHandlers;
private final ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping; private final ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping;
@ -49,7 +50,7 @@ class ObservationRegistryPostProcessor implements BeanPostProcessor {
ObservationRegistryPostProcessor(ObjectProvider<ObservationRegistryCustomizer<?>> observationRegistryCustomizers, ObservationRegistryPostProcessor(ObjectProvider<ObservationRegistryCustomizer<?>> observationRegistryCustomizers,
ObjectProvider<ObservationPredicate> observationPredicates, ObjectProvider<ObservationPredicate> observationPredicates,
ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders, ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders,
ObjectProvider<ObservationHandler<?>> observationHandlers, ObjectProvider<ObservationHandler<Context>> observationHandlers,
ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) { ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) {
this.observationRegistryCustomizers = observationRegistryCustomizers; this.observationRegistryCustomizers = observationRegistryCustomizers;
this.observationPredicates = observationPredicates; this.observationPredicates = observationPredicates;

16
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/OnlyMetricsObservationHandlerGrouping.java
Unescape Escape View File

@ -21,6 +21,7 @@ import java.util.Collection;
import java.util.List; import java.util.List;
import io.micrometer.core.instrument.observation.MeterObservationHandler; import io.micrometer.core.instrument.observation.MeterObservationHandler;
import io.micrometer.observation.Observation.Context;
import io.micrometer.observation.ObservationHandler; import io.micrometer.observation.ObservationHandler;
import io.micrometer.observation.ObservationHandler.FirstMatchingCompositeObservationHandler; import io.micrometer.observation.ObservationHandler.FirstMatchingCompositeObservationHandler;
import io.micrometer.observation.ObservationRegistry.ObservationConfig; import io.micrometer.observation.ObservationRegistry.ObservationConfig;
@ -38,9 +39,9 @@ import io.micrometer.observation.ObservationRegistry.ObservationConfig;
class OnlyMetricsObservationHandlerGrouping implements ObservationHandlerGrouping { class OnlyMetricsObservationHandlerGrouping implements ObservationHandlerGrouping {
@Override @Override
public void apply(Collection<ObservationHandler<?>> handlers, ObservationConfig config) { public void apply(Collection<ObservationHandler<Context>> handlers, ObservationConfig config) {
List<ObservationHandler<?>> meterObservationHandlers = new ArrayList<>(); List<ObservationHandler<Context>> meterObservationHandlers = new ArrayList<>();
for (ObservationHandler<?> handler : handlers) { for (ObservationHandler<Context> handler : handlers) {
if (handler instanceof MeterObservationHandler<?>) { if (handler instanceof MeterObservationHandler<?>) {
meterObservationHandlers.add(handler); meterObservationHandlers.add(handler);
} }
@ -50,15 +51,8 @@ class OnlyMetricsObservationHandlerGrouping implements ObservationHandlerGroupin
} }
if (!meterObservationHandlers.isEmpty()) { if (!meterObservationHandlers.isEmpty()) {
config.observationHandler( config.observationHandler(new FirstMatchingCompositeObservationHandler(meterObservationHandlers));
new FirstMatchingCompositeObservationHandler(castToRawType(meterObservationHandlers)));
} }
} }
@SuppressWarnings({ "unchecked", "rawtypes" })
private List<ObservationHandler> castToRawType(List<ObservationHandler<?>> handlers) {
// See https://github.com/micrometer-metrics/micrometer/issues/3064
return (List) handlers;
}
} }

21
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/TracingObservationHandlerGrouping.java
Unescape Escape View File

@ -21,6 +21,7 @@ import java.util.Collection;
import java.util.List; import java.util.List;
import io.micrometer.core.instrument.observation.MeterObservationHandler; import io.micrometer.core.instrument.observation.MeterObservationHandler;
import io.micrometer.observation.Observation.Context;
import io.micrometer.observation.ObservationHandler; import io.micrometer.observation.ObservationHandler;
import io.micrometer.observation.ObservationHandler.FirstMatchingCompositeObservationHandler; import io.micrometer.observation.ObservationHandler.FirstMatchingCompositeObservationHandler;
import io.micrometer.observation.ObservationRegistry.ObservationConfig; import io.micrometer.observation.ObservationRegistry.ObservationConfig;
@ -41,10 +42,10 @@ import io.micrometer.tracing.handler.TracingObservationHandler;
class TracingObservationHandlerGrouping implements ObservationHandlerGrouping { class TracingObservationHandlerGrouping implements ObservationHandlerGrouping {
@Override @Override
public void apply(Collection<ObservationHandler<?>> handlers, ObservationConfig config) { public void apply(Collection<ObservationHandler<Context>> handlers, ObservationConfig config) {
List<ObservationHandler<?>> meterObservationHandlers = new ArrayList<>(); List<ObservationHandler<Context>> meterObservationHandlers = new ArrayList<>();
List<ObservationHandler<?>> tracingObservationHandlers = new ArrayList<>(); List<ObservationHandler<Context>> tracingObservationHandlers = new ArrayList<>();
for (ObservationHandler<?> handler : handlers) { for (ObservationHandler<Context> handler : handlers) {
if (handler instanceof MeterObservationHandler<?>) { if (handler instanceof MeterObservationHandler<?>) {
meterObservationHandlers.add(handler); meterObservationHandlers.add(handler);
} }
@ -57,19 +58,11 @@ class TracingObservationHandlerGrouping implements ObservationHandlerGrouping {
} }
if (!meterObservationHandlers.isEmpty()) { if (!meterObservationHandlers.isEmpty()) {
config.observationHandler( config.observationHandler(new FirstMatchingCompositeObservationHandler(meterObservationHandlers));
new FirstMatchingCompositeObservationHandler(castToRawType(meterObservationHandlers)));
} }
if (!tracingObservationHandlers.isEmpty()) { if (!tracingObservationHandlers.isEmpty()) {
config.observationHandler( config.observationHandler(new FirstMatchingCompositeObservationHandler(tracingObservationHandlers));
new FirstMatchingCompositeObservationHandler(castToRawType(tracingObservationHandlers)));
} }
} }
@SuppressWarnings({ "unchecked", "rawtypes" })
private List<ObservationHandler> castToRawType(List<ObservationHandler<?>> handlers) {
// See https://github.com/micrometer-metrics/micrometer/issues/3064
return (List) handlers;
}
} }

Write Preview
Loading…
Cancel
Save