Skip to content

Commit 048ca9f

Browse files
snicollsnicoll
committed
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
2 parents aecb035 + 8c68b33 commit 048ca9f

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

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

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

1919
import io.micrometer.core.instrument.MeterRegistry;
20-
import io.micrometer.observation.Observation.GlobalTagsProvider;
20+
import io.micrometer.observation.Observation.GlobalKeyValuesProvider;
2121
import io.micrometer.observation.ObservationHandler;
2222
import io.micrometer.observation.ObservationPredicate;
2323
import io.micrometer.observation.ObservationRegistry;
@@ -48,7 +48,7 @@ public class ObservationAutoConfiguration {
4848
static ObservationRegistryPostProcessor observationRegistryPostProcessor(
4949
ObjectProvider<ObservationRegistryCustomizer<?>> observationRegistryCustomizers,
5050
ObjectProvider<ObservationPredicate> observationPredicates,
51-
ObjectProvider<GlobalTagsProvider<?>> tagProviders,
51+
ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders,
5252
ObjectProvider<ObservationHandler<?>> observationHandlers,
5353
ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) {
5454
return new ObservationRegistryPostProcessor(observationRegistryCustomizers, observationPredicates, tagProviders,

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

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

1919
import java.util.List;
2020

21-
import io.micrometer.observation.Observation.GlobalTagsProvider;
21+
import io.micrometer.observation.Observation.GlobalKeyValuesProvider;
2222
import io.micrometer.observation.ObservationHandler;
2323
import io.micrometer.observation.ObservationPredicate;
2424
import io.micrometer.observation.ObservationRegistry;
@@ -29,7 +29,7 @@
2929
/**
3030
* Configurer to apply {@link ObservationRegistryCustomizer customizers} to
3131
* {@link ObservationRegistry observation registries}. Installs
32-
* {@link ObservationPredicate observation predicates} and {@link GlobalTagsProvider
32+
* {@link ObservationPredicate observation predicates} and {@link GlobalKeyValuesProvider
3333
* global tag providers} into the {@link ObservationRegistry}. Also uses a
3434
* {@link ObservationHandlerGrouping} to group handlers, which are then added to the
3535
* {@link ObservationRegistry}.
@@ -42,15 +42,15 @@ class ObservationRegistryConfigurer {
4242

4343
private final ObjectProvider<ObservationPredicate> observationPredicates;
4444

45-
private final ObjectProvider<GlobalTagsProvider<?>> tagProviders;
45+
private final ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders;
4646

4747
private final ObjectProvider<ObservationHandler<?>> observationHandlers;
4848

4949
private final ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping;
5050

5151
ObservationRegistryConfigurer(ObjectProvider<ObservationRegistryCustomizer<?>> customizers,
5252
ObjectProvider<ObservationPredicate> observationPredicates,
53-
ObjectProvider<GlobalTagsProvider<?>> tagProviders,
53+
ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders,
5454
ObjectProvider<ObservationHandler<?>> observationHandlers,
5555
ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) {
5656
this.customizers = customizers;
@@ -79,7 +79,7 @@ private void registerObservationPredicates(ObservationRegistry registry) {
7979

8080
private void registerGlobalTagsProvider(ObservationRegistry registry) {
8181
this.tagProviders.orderedStream()
82-
.forEach((tagProvider) -> registry.observationConfig().tagsProvider(tagProvider));
82+
.forEach((tagProvider) -> registry.observationConfig().keyValuesProvider(tagProvider));
8383
}
8484

8585
@SuppressWarnings("unchecked")

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

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

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

19-
import io.micrometer.observation.Observation.GlobalTagsProvider;
19+
import io.micrometer.observation.Observation.GlobalKeyValuesProvider;
2020
import io.micrometer.observation.ObservationHandler;
2121
import io.micrometer.observation.ObservationPredicate;
2222
import io.micrometer.observation.ObservationRegistry;
@@ -38,7 +38,7 @@ class ObservationRegistryPostProcessor implements BeanPostProcessor {
3838

3939
private final ObjectProvider<ObservationPredicate> observationPredicates;
4040

41-
private final ObjectProvider<GlobalTagsProvider<?>> tagProviders;
41+
private final ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders;
4242

4343
private final ObjectProvider<ObservationHandler<?>> observationHandlers;
4444

@@ -48,7 +48,7 @@ class ObservationRegistryPostProcessor implements BeanPostProcessor {
4848

4949
ObservationRegistryPostProcessor(ObjectProvider<ObservationRegistryCustomizer<?>> observationRegistryCustomizers,
5050
ObjectProvider<ObservationPredicate> observationPredicates,
51-
ObjectProvider<GlobalTagsProvider<?>> tagProviders,
51+
ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders,
5252
ObjectProvider<ObservationHandler<?>> observationHandlers,
5353
ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) {
5454
this.observationRegistryCustomizers = observationRegistryCustomizers;

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
import java.util.ArrayList;
2020
import java.util.List;
2121

22-
import io.micrometer.common.Tag;
23-
import io.micrometer.common.Tags;
22+
import io.micrometer.common.KeyValue;
23+
import io.micrometer.common.KeyValues;
2424
import io.micrometer.core.instrument.MeterRegistry;
2525
import io.micrometer.core.instrument.observation.MeterObservationHandler;
2626
import io.micrometer.core.instrument.search.MeterNotFoundException;
2727
import io.micrometer.observation.Observation;
2828
import io.micrometer.observation.Observation.Context;
29-
import io.micrometer.observation.Observation.GlobalTagsProvider;
29+
import io.micrometer.observation.Observation.GlobalKeyValuesProvider;
3030
import io.micrometer.observation.ObservationHandler;
3131
import io.micrometer.observation.ObservationHandler.AllMatchingCompositeObservationHandler;
3232
import io.micrometer.observation.ObservationHandler.FirstMatchingCompositeObservationHandler;
@@ -104,7 +104,7 @@ void autoConfiguresGlobalTagsProvider() {
104104
ObservationRegistry observationRegistry = context.getBean(ObservationRegistry.class);
105105
Context micrometerContext = new Context();
106106
Observation.start("test-observation", micrometerContext, observationRegistry).stop();
107-
assertThat(micrometerContext.getAllTags()).containsExactly(Tag.of("tag1", "value1"));
107+
assertThat(micrometerContext.getAllKeyValues()).containsExactly(KeyValue.of("tag1", "value1"));
108108
});
109109
}
110110

@@ -164,16 +164,16 @@ ObservationPredicate customPredicate() {
164164
static class GlobalTagsProviders {
165165

166166
@Bean
167-
GlobalTagsProvider<?> customTagsProvider() {
168-
return new GlobalTagsProvider<>() {
167+
Observation.GlobalKeyValuesProvider<?> customTagsProvider() {
168+
return new GlobalKeyValuesProvider<>() {
169169
@Override
170170
public boolean supportsContext(Context context) {
171171
return true;
172172
}
173173

174174
@Override
175-
public Tags getLowCardinalityTags(Context context) {
176-
return Tags.of("tag1", "value1");
175+
public KeyValues getLowCardinalityKeyValues(Context context) {
176+
return KeyValues.of("tag1", "value1");
177177
}
178178
};
179179
}

‎spring-boot-project/spring-boot-dependencies/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,7 @@ bom {
976976
]
977977
}
978978
}
979-
library("Micrometer", "2.0.0-SNAPSHOT") {
979+
library("Micrometer", "1.10.0-SNAPSHOT") {
980980
group("io.micrometer") {
981981
modules = [
982982
"micrometer-registry-stackdriver" {

0 commit comments

Comments
 (0)