Skip to content

Commit 6d15e6d

Browse files
wilkinsonawilkinsona
committed
Adapt to breaking API changes in latest Micrometer snapshots
See gh-30800
1 parent fb16907 commit 6d15e6d

File tree

6 files changed

+22
-31
lines changed

6 files changed

+22
-31
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.boot.actuate.autoconfigure.observation;
1818

1919
import io.micrometer.core.instrument.MeterRegistry;
20+
import io.micrometer.observation.Observation.Context;
2021
import io.micrometer.observation.Observation.GlobalKeyValuesProvider;
2122
import io.micrometer.observation.ObservationHandler;
2223
import io.micrometer.observation.ObservationPredicate;
@@ -49,7 +50,7 @@ static ObservationRegistryPostProcessor observationRegistryPostProcessor(
4950
ObjectProvider<ObservationRegistryCustomizer<?>> observationRegistryCustomizers,
5051
ObjectProvider<ObservationPredicate> observationPredicates,
5152
ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders,
52-
ObjectProvider<ObservationHandler<?>> observationHandlers,
53+
ObjectProvider<ObservationHandler<Context>> observationHandlers,
5354
ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) {
5455
return new ObservationRegistryPostProcessor(observationRegistryCustomizers, observationPredicates, tagProviders,
5556
observationHandlers, observationHandlerGrouping);

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationHandlerGrouping.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.util.Collection;
2020

21+
import io.micrometer.observation.Observation.Context;
2122
import io.micrometer.observation.ObservationHandler;
2223
import io.micrometer.observation.ObservationRegistry.ObservationConfig;
2324

@@ -34,6 +35,6 @@ interface ObservationHandlerGrouping {
3435
* @param handlers the list of observation handlers
3536
* @param config the config to apply the handlers to
3637
*/
37-
void apply(Collection<ObservationHandler<?>> handlers, ObservationConfig config);
38+
void apply(Collection<ObservationHandler<Context>> handlers, ObservationConfig config);
3839

3940
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationRegistryConfigurer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.util.List;
2020

21+
import io.micrometer.observation.Observation.Context;
2122
import io.micrometer.observation.Observation.GlobalKeyValuesProvider;
2223
import io.micrometer.observation.ObservationHandler;
2324
import io.micrometer.observation.ObservationPredicate;
@@ -44,14 +45,14 @@ class ObservationRegistryConfigurer {
4445

4546
private final ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders;
4647

47-
private final ObjectProvider<ObservationHandler<?>> observationHandlers;
48+
private final ObjectProvider<ObservationHandler<Context>> observationHandlers;
4849

4950
private final ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping;
5051

5152
ObservationRegistryConfigurer(ObjectProvider<ObservationRegistryCustomizer<?>> customizers,
5253
ObjectProvider<ObservationPredicate> observationPredicates,
5354
ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders,
54-
ObjectProvider<ObservationHandler<?>> observationHandlers,
55+
ObjectProvider<ObservationHandler<Context>> observationHandlers,
5556
ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) {
5657
this.customizers = customizers;
5758
this.observationPredicates = observationPredicates;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationRegistryPostProcessor.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.observation;
1818

19+
import io.micrometer.observation.Observation.Context;
1920
import io.micrometer.observation.Observation.GlobalKeyValuesProvider;
2021
import io.micrometer.observation.ObservationHandler;
2122
import io.micrometer.observation.ObservationPredicate;
@@ -40,7 +41,7 @@ class ObservationRegistryPostProcessor implements BeanPostProcessor {
4041

4142
private final ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders;
4243

43-
private final ObjectProvider<ObservationHandler<?>> observationHandlers;
44+
private final ObjectProvider<ObservationHandler<Context>> observationHandlers;
4445

4546
private final ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping;
4647

@@ -49,7 +50,7 @@ class ObservationRegistryPostProcessor implements BeanPostProcessor {
4950
ObservationRegistryPostProcessor(ObjectProvider<ObservationRegistryCustomizer<?>> observationRegistryCustomizers,
5051
ObjectProvider<ObservationPredicate> observationPredicates,
5152
ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders,
52-
ObjectProvider<ObservationHandler<?>> observationHandlers,
53+
ObjectProvider<ObservationHandler<Context>> observationHandlers,
5354
ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) {
5455
this.observationRegistryCustomizers = observationRegistryCustomizers;
5556
this.observationPredicates = observationPredicates;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/OnlyMetricsObservationHandlerGrouping.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.List;
2222

2323
import io.micrometer.core.instrument.observation.MeterObservationHandler;
24+
import io.micrometer.observation.Observation.Context;
2425
import io.micrometer.observation.ObservationHandler;
2526
import io.micrometer.observation.ObservationHandler.FirstMatchingCompositeObservationHandler;
2627
import io.micrometer.observation.ObservationRegistry.ObservationConfig;
@@ -38,9 +39,9 @@
3839
class OnlyMetricsObservationHandlerGrouping implements ObservationHandlerGrouping {
3940

4041
@Override
41-
public void apply(Collection<ObservationHandler<?>> handlers, ObservationConfig config) {
42-
List<ObservationHandler<?>> meterObservationHandlers = new ArrayList<>();
43-
for (ObservationHandler<?> handler : handlers) {
42+
public void apply(Collection<ObservationHandler<Context>> handlers, ObservationConfig config) {
43+
List<ObservationHandler<Context>> meterObservationHandlers = new ArrayList<>();
44+
for (ObservationHandler<Context> handler : handlers) {
4445
if (handler instanceof MeterObservationHandler<?>) {
4546
meterObservationHandlers.add(handler);
4647
}
@@ -50,15 +51,8 @@ public void apply(Collection<ObservationHandler<?>> handlers, ObservationConfig
5051
}
5152

5253
if (!meterObservationHandlers.isEmpty()) {
53-
config.observationHandler(
54-
new FirstMatchingCompositeObservationHandler(castToRawType(meterObservationHandlers)));
54+
config.observationHandler(new FirstMatchingCompositeObservationHandler(meterObservationHandlers));
5555
}
5656
}
5757

58-
@SuppressWarnings({ "unchecked", "rawtypes" })
59-
private List<ObservationHandler> castToRawType(List<ObservationHandler<?>> handlers) {
60-
// See https://github.com/micrometer-metrics/micrometer/issues/3064
61-
return (List) handlers;
62-
}
63-
6458
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/TracingObservationHandlerGrouping.java

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.List;
2222

2323
import io.micrometer.core.instrument.observation.MeterObservationHandler;
24+
import io.micrometer.observation.Observation.Context;
2425
import io.micrometer.observation.ObservationHandler;
2526
import io.micrometer.observation.ObservationHandler.FirstMatchingCompositeObservationHandler;
2627
import io.micrometer.observation.ObservationRegistry.ObservationConfig;
@@ -41,10 +42,10 @@
4142
class TracingObservationHandlerGrouping implements ObservationHandlerGrouping {
4243

4344
@Override
44-
public void apply(Collection<ObservationHandler<?>> handlers, ObservationConfig config) {
45-
List<ObservationHandler<?>> meterObservationHandlers = new ArrayList<>();
46-
List<ObservationHandler<?>> tracingObservationHandlers = new ArrayList<>();
47-
for (ObservationHandler<?> handler : handlers) {
45+
public void apply(Collection<ObservationHandler<Context>> handlers, ObservationConfig config) {
46+
List<ObservationHandler<Context>> meterObservationHandlers = new ArrayList<>();
47+
List<ObservationHandler<Context>> tracingObservationHandlers = new ArrayList<>();
48+
for (ObservationHandler<Context> handler : handlers) {
4849
if (handler instanceof MeterObservationHandler<?>) {
4950
meterObservationHandlers.add(handler);
5051
}
@@ -57,19 +58,11 @@ else if (handler instanceof TracingObservationHandler<?>) {
5758
}
5859

5960
if (!meterObservationHandlers.isEmpty()) {
60-
config.observationHandler(
61-
new FirstMatchingCompositeObservationHandler(castToRawType(meterObservationHandlers)));
61+
config.observationHandler(new FirstMatchingCompositeObservationHandler(meterObservationHandlers));
6262
}
6363
if (!tracingObservationHandlers.isEmpty()) {
64-
config.observationHandler(
65-
new FirstMatchingCompositeObservationHandler(castToRawType(tracingObservationHandlers)));
64+
config.observationHandler(new FirstMatchingCompositeObservationHandler(tracingObservationHandlers));
6665
}
6766
}
6867

69-
@SuppressWarnings({ "unchecked", "rawtypes" })
70-
private List<ObservationHandler> castToRawType(List<ObservationHandler<?>> handlers) {
71-
// See https://github.com/micrometer-metrics/micrometer/issues/3064
72-
return (List) handlers;
73-
}
74-
7568
}

0 commit comments

Comments
 (0)