Skip to content

Switch to Micrometer 1.10.0-SNAPSHOT #30693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Switch to Micrometer 1.10.0-SNAPSHOT #30693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package org.springframework.boot.actuate.autoconfigure.observation;

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.ObservationPredicate;
import io.micrometer.observation.ObservationRegistry;
Expand Down Expand Up @@ -48,7 +48,7 @@ public class ObservationAutoConfiguration {
static ObservationRegistryPostProcessor observationRegistryPostProcessor(
ObjectProvider<ObservationRegistryCustomizer<?>> observationRegistryCustomizers,
ObjectProvider<ObservationPredicate> observationPredicates,
ObjectProvider<GlobalTagsProvider<?>> tagProviders,
ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders,
ObjectProvider<ObservationHandler<?>> observationHandlers,
ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) {
return new ObservationRegistryPostProcessor(observationRegistryCustomizers, observationPredicates, tagProviders,
Expand Down
10 changes: 5 additions & 5 deletions ...springframework/boot/actuate/autoconfigure/observation/ObservationRegistryConfigurer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

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.ObservationPredicate;
import io.micrometer.observation.ObservationRegistry;
Expand All @@ -29,7 +29,7 @@
/**
* Configurer to apply {@link ObservationRegistryCustomizer customizers} to
* {@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
* {@link ObservationHandlerGrouping} to group handlers, which are then added to the
* {@link ObservationRegistry}.
Expand All @@ -42,15 +42,15 @@ class ObservationRegistryConfigurer {

private final ObjectProvider<ObservationPredicate> observationPredicates;

private final ObjectProvider<GlobalTagsProvider<?>> tagProviders;
private final ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders;

private final ObjectProvider<ObservationHandler<?>> observationHandlers;

private final ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping;

ObservationRegistryConfigurer(ObjectProvider<ObservationRegistryCustomizer<?>> customizers,
ObjectProvider<ObservationPredicate> observationPredicates,
ObjectProvider<GlobalTagsProvider<?>> tagProviders,
ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders,
ObjectProvider<ObservationHandler<?>> observationHandlers,
ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) {
this.customizers = customizers;
Expand Down Expand Up @@ -79,7 +79,7 @@ private void registerObservationPredicates(ObservationRegistry registry) {

private void registerGlobalTagsProvider(ObservationRegistry registry) {
this.tagProviders.orderedStream()
.forEach((tagProvider) -> registry.observationConfig().tagsProvider(tagProvider));
.forEach((tagProvider) -> registry.observationConfig().keyValuesProvider(tagProvider));
}

@SuppressWarnings("unchecked")
Expand Down
6 changes: 3 additions & 3 deletions ...ingframework/boot/actuate/autoconfigure/observation/ObservationRegistryPostProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

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.ObservationPredicate;
import io.micrometer.observation.ObservationRegistry;
Expand All @@ -38,7 +38,7 @@ class ObservationRegistryPostProcessor implements BeanPostProcessor {

private final ObjectProvider<ObservationPredicate> observationPredicates;

private final ObjectProvider<GlobalTagsProvider<?>> tagProviders;
private final ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders;

private final ObjectProvider<ObservationHandler<?>> observationHandlers;

Expand All @@ -48,7 +48,7 @@ class ObservationRegistryPostProcessor implements BeanPostProcessor {

ObservationRegistryPostProcessor(ObjectProvider<ObservationRegistryCustomizer<?>> observationRegistryCustomizers,
ObjectProvider<ObservationPredicate> observationPredicates,
ObjectProvider<GlobalTagsProvider<?>> tagProviders,
ObjectProvider<GlobalKeyValuesProvider<?>> tagProviders,
ObjectProvider<ObservationHandler<?>> observationHandlers,
ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping) {
this.observationRegistryCustomizers = observationRegistryCustomizers;
Expand Down
17 changes: 9 additions & 8 deletions ...ngframework/boot/actuate/autoconfigure/observation/ObservationAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@
import java.util.ArrayList;
import java.util.List;

import io.micrometer.common.Tag;
import io.micrometer.common.Tags;
import io.micrometer.common.KeyValue;
import io.micrometer.common.KeyValues;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Tags;
import io.micrometer.core.instrument.observation.MeterObservationHandler;
import io.micrometer.core.instrument.search.MeterNotFoundException;
import io.micrometer.observation.Observation;
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.AllMatchingCompositeObservationHandler;
import io.micrometer.observation.ObservationHandler.FirstMatchingCompositeObservationHandler;
Expand Down Expand Up @@ -104,7 +105,7 @@ void autoConfiguresGlobalTagsProvider() {
ObservationRegistry observationRegistry = context.getBean(ObservationRegistry.class);
Context micrometerContext = new Context();
Observation.start("test-observation", micrometerContext, observationRegistry).stop();
assertThat(micrometerContext.getAllTags()).containsExactly(Tag.of("tag1", "value1"));
assertThat(micrometerContext.getAllKeyValues()).containsExactly(KeyValue.of("tag1", "value1"));
});
}

Expand Down Expand Up @@ -164,16 +165,16 @@ ObservationPredicate customPredicate() {
static class GlobalTagsProviders {

@Bean
GlobalTagsProvider<?> customTagsProvider() {
return new GlobalTagsProvider<>() {
Observation.GlobalKeyValuesProvider<?> customTagsProvider() {
return new GlobalKeyValuesProvider<>() {
@Override
public boolean supportsContext(Context context) {
return true;
}

@Override
public Tags getLowCardinalityTags(Context context) {
return Tags.of("tag1", "value1");
public KeyValues getLowCardinalityKeyValues(Context context) {
return KeyValues.of("tag1", "value1");
}
};
}
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-project/spring-boot-dependencies/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -976,7 +976,7 @@ bom {
]
}
}
library("Micrometer", "2.0.0-SNAPSHOT") {
library("Micrometer", "1.10.0-SNAPSHOT") {
group("io.micrometer") {
modules = [
"micrometer-registry-stackdriver" {
Expand Down