root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #30693 from marcingrzejszczak 

* pr/30693:
  Polish "Start building against Micrometer 1.10.0 snapshots"
  Start building against Micrometer 1.10.0 snapshots

Closes gh-30693
This commit is contained in:
Stephane Nicoll 2022-04-15 15:59:53 +02:00
parent aecb035e99 8c68b33240
commit 048ca9fc3c
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +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.GlobalTagsProvider; 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;
import io.micrometer.observation.ObservationRegistry; import io.micrometer.observation.ObservationRegistry;
@ -48,7 +48,7 @@ public class ObservationAutoConfiguration {
static ObservationRegistryPostProcessor observationRegistryPostProcessor( static ObservationRegistryPostProcessor observationRegistryPostProcessor(
ObjectProvider<ObservationRegistryCustomizer<?>> observationRegistryCustomizers, ObjectProvider<ObservationRegistryCustomizer<?>> observationRegistryCustomizers,
ObjectProvider<ObservationPredicate> observationPredicates, ObjectProvider<ObservationPredicate> observationPredicates,
ObjectProvider<GlobalTagsProvider<?>> tagProviders, ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders,
ObjectProvider<ObservationHandler<?>> observationHandlers, ObjectProvider<ObservationHandler<?>> observationHandlers,
ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) { ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) {
return new ObservationRegistryPostProcessor(observationRegistryCustomizers, observationPredicates, tagProviders, return new ObservationRegistryPostProcessor(observationRegistryCustomizers, observationPredicates, tagProviders,

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

@ -18,7 +18,7 @@ package org.springframework.boot.actuate.autoconfigure.observation;
import java.util.List; import java.util.List;
import io.micrometer.observation.Observation.GlobalTagsProvider; 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;
import io.micrometer.observation.ObservationRegistry; import io.micrometer.observation.ObservationRegistry;
@ -29,7 +29,7 @@ import org.springframework.boot.util.LambdaSafe;
/** /**
* Configurer to apply {@link ObservationRegistryCustomizer customizers} to * Configurer to apply {@link ObservationRegistryCustomizer customizers} to
* {@link ObservationRegistry observation registries}. Installs * {@link ObservationRegistry observation registries}. Installs
* {@link ObservationPredicate observation predicates} and {@link GlobalTagsProvider * {@link ObservationPredicate observation predicates} and {@link GlobalKeyValuesProvider
* global tag providers} into the {@link ObservationRegistry}. Also uses a * global tag providers} into the {@link ObservationRegistry}. Also uses a
* {@link ObservationHandlerGrouping} to group handlers, which are then added to the * {@link ObservationHandlerGrouping} to group handlers, which are then added to the
* {@link ObservationRegistry}. * {@link ObservationRegistry}.
@ -42,7 +42,7 @@ class ObservationRegistryConfigurer {
private final ObjectProvider<ObservationPredicate> observationPredicates; private final ObjectProvider<ObservationPredicate> observationPredicates;
private final ObjectProvider<GlobalTagsProvider<?>> tagProviders; private final ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders;
private final ObjectProvider<ObservationHandler<?>> observationHandlers; private final ObjectProvider<ObservationHandler<?>> observationHandlers;
@ -50,7 +50,7 @@ class ObservationRegistryConfigurer {
ObservationRegistryConfigurer(ObjectProvider<ObservationRegistryCustomizer<?>> customizers, ObservationRegistryConfigurer(ObjectProvider<ObservationRegistryCustomizer<?>> customizers,
ObjectProvider<ObservationPredicate> observationPredicates, ObjectProvider<ObservationPredicate> observationPredicates,
ObjectProvider<GlobalTagsProvider<?>> tagProviders, ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders,
ObjectProvider<ObservationHandler<?>> observationHandlers, ObjectProvider<ObservationHandler<?>> observationHandlers,
ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) { ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) {
this.customizers = customizers; this.customizers = customizers;
@ -79,7 +79,7 @@ class ObservationRegistryConfigurer {
private void registerGlobalTagsProvider(ObservationRegistry registry) { private void registerGlobalTagsProvider(ObservationRegistry registry) {
this.tagProviders.orderedStream() this.tagProviders.orderedStream()
.forEach((tagProvider) -> registry.observationConfig().tagsProvider(tagProvider)); .forEach((tagProvider) -> registry.observationConfig().keyValuesProvider(tagProvider));
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")

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

@ -16,7 +16,7 @@
package org.springframework.boot.actuate.autoconfigure.observation; package org.springframework.boot.actuate.autoconfigure.observation;
import io.micrometer.observation.Observation.GlobalTagsProvider; 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;
import io.micrometer.observation.ObservationRegistry; import io.micrometer.observation.ObservationRegistry;
@ -38,7 +38,7 @@ class ObservationRegistryPostProcessor implements BeanPostProcessor {
private final ObjectProvider<ObservationPredicate> observationPredicates; private final ObjectProvider<ObservationPredicate> observationPredicates;
private final ObjectProvider<GlobalTagsProvider<?>> tagProviders; private final ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders;
private final ObjectProvider<ObservationHandler<?>> observationHandlers; private final ObjectProvider<ObservationHandler<?>> observationHandlers;
@ -48,7 +48,7 @@ class ObservationRegistryPostProcessor implements BeanPostProcessor {
ObservationRegistryPostProcessor(ObjectProvider<ObservationRegistryCustomizer<?>> observationRegistryCustomizers, ObservationRegistryPostProcessor(ObjectProvider<ObservationRegistryCustomizer<?>> observationRegistryCustomizers,
ObjectProvider<ObservationPredicate> observationPredicates, ObjectProvider<ObservationPredicate> observationPredicates,
ObjectProvider<GlobalTagsProvider<?>> tagProviders, ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders,
ObjectProvider<ObservationHandler<?>> observationHandlers, ObjectProvider<ObservationHandler<?>> observationHandlers,
ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) { ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) {
this.observationRegistryCustomizers = observationRegistryCustomizers; this.observationRegistryCustomizers = observationRegistryCustomizers;

16
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfigurationTests.java
View File

@ -19,14 +19,14 @@ package org.springframework.boot.actuate.autoconfigure.observation;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import io.micrometer.common.Tag; import io.micrometer.common.KeyValue;
import io.micrometer.common.Tags; import io.micrometer.common.KeyValues;
import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.observation.MeterObservationHandler; import io.micrometer.core.instrument.observation.MeterObservationHandler;
import io.micrometer.core.instrument.search.MeterNotFoundException; import io.micrometer.core.instrument.search.MeterNotFoundException;
import io.micrometer.observation.Observation; import io.micrometer.observation.Observation;
import io.micrometer.observation.Observation.Context; import io.micrometer.observation.Observation.Context;
import io.micrometer.observation.Observation.GlobalTagsProvider; import io.micrometer.observation.Observation.GlobalKeyValuesProvider;
import io.micrometer.observation.ObservationHandler; import io.micrometer.observation.ObservationHandler;
import io.micrometer.observation.ObservationHandler.AllMatchingCompositeObservationHandler; import io.micrometer.observation.ObservationHandler.AllMatchingCompositeObservationHandler;
import io.micrometer.observation.ObservationHandler.FirstMatchingCompositeObservationHandler; import io.micrometer.observation.ObservationHandler.FirstMatchingCompositeObservationHandler;
@ -104,7 +104,7 @@ class ObservationAutoConfigurationTests {
ObservationRegistry observationRegistry = context.getBean(ObservationRegistry.class); ObservationRegistry observationRegistry = context.getBean(ObservationRegistry.class);
Context micrometerContext = new Context(); Context micrometerContext = new Context();
Observation.start("test-observation", micrometerContext, observationRegistry).stop(); Observation.start("test-observation", micrometerContext, observationRegistry).stop();
assertThat(micrometerContext.getAllTags()).containsExactly(Tag.of("tag1", "value1")); assertThat(micrometerContext.getAllKeyValues()).containsExactly(KeyValue.of("tag1", "value1"));
}); });
} }
@ -164,16 +164,16 @@ class ObservationAutoConfigurationTests {
static class GlobalTagsProviders { static class GlobalTagsProviders {
@Bean @Bean
GlobalTagsProvider<?> customTagsProvider() { Observation.GlobalKeyValuesProvider<?> customTagsProvider() {
return new GlobalTagsProvider<>() { return new GlobalKeyValuesProvider<>() {
@Override @Override
public boolean supportsContext(Context context) { public boolean supportsContext(Context context) {
return true; return true;
} }
@Override @Override
public Tags getLowCardinalityTags(Context context) { public KeyValues getLowCardinalityKeyValues(Context context) {
return Tags.of("tag1", "value1"); return KeyValues.of("tag1", "value1");
} }
}; };
} }

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -976,7 +976,7 @@ bom {
] ]
} }
} }
library("Micrometer", "2.0.0-SNAPSHOT") { library("Micrometer", "1.10.0-SNAPSHOT") {
group("io.micrometer") { group("io.micrometer") {
modules = [ modules = [
"micrometer-registry-stackdriver" { "micrometer-registry-stackdriver" {