From 9f2114170e619905db164298258a2195532f1ed5 Mon Sep 17 00:00:00 2001 From: izeye Date: Fri, 29 Apr 2022 22:12:45 +0900 Subject: [PATCH] Apply key values rename consistently See gh-30837 --- .../ObservationAutoConfiguration.java | 6 +++--- .../ObservationRegistryConfigurer.java | 16 ++++++++-------- .../ObservationRegistryPostProcessor.java | 8 ++++---- .../ObservationAutoConfigurationTests.java | 12 ++++++------ 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfiguration.java index e02b307e89..f7d6971f35 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfiguration.java @@ -49,11 +49,11 @@ public class ObservationAutoConfiguration { static ObservationRegistryPostProcessor observationRegistryPostProcessor( ObjectProvider> observationRegistryCustomizers, ObjectProvider observationPredicates, - ObjectProvider> tagProviders, + ObjectProvider> keyValuesProviders, ObjectProvider> observationHandlers, ObjectProvider observationHandlerGrouping) { - return new ObservationRegistryPostProcessor(observationRegistryCustomizers, observationPredicates, tagProviders, - observationHandlers, observationHandlerGrouping); + return new ObservationRegistryPostProcessor(observationRegistryCustomizers, observationPredicates, + keyValuesProviders, observationHandlers, observationHandlerGrouping); } @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationRegistryConfigurer.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationRegistryConfigurer.java index 7ac6287fbe..227b31666d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationRegistryConfigurer.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationRegistryConfigurer.java @@ -31,7 +31,7 @@ import org.springframework.boot.util.LambdaSafe; * Configurer to apply {@link ObservationRegistryCustomizer customizers} to * {@link ObservationRegistry observation registries}. Installs * {@link ObservationPredicate observation predicates} and {@link GlobalKeyValuesProvider - * global tag providers} into the {@link ObservationRegistry}. Also uses a + * global key values providers} into the {@link ObservationRegistry}. Also uses a * {@link ObservationHandlerGrouping} to group handlers, which are then added to the * {@link ObservationRegistry}. * @@ -43,7 +43,7 @@ class ObservationRegistryConfigurer { private final ObjectProvider observationPredicates; - private final ObjectProvider> tagProviders; + private final ObjectProvider> keyValuesProviders; private final ObjectProvider> observationHandlers; @@ -51,19 +51,19 @@ class ObservationRegistryConfigurer { ObservationRegistryConfigurer(ObjectProvider> customizers, ObjectProvider observationPredicates, - ObjectProvider> tagProviders, + ObjectProvider> keyValuesProviders, ObjectProvider> observationHandlers, ObjectProvider observationHandlerGrouping) { this.customizers = customizers; this.observationPredicates = observationPredicates; - this.tagProviders = tagProviders; + this.keyValuesProviders = keyValuesProviders; this.observationHandlers = observationHandlers; this.observationHandlerGrouping = observationHandlerGrouping; } void configure(ObservationRegistry registry) { registerObservationPredicates(registry); - registerGlobalTagsProvider(registry); + registerGlobalKeyValuesProviders(registry); registerHandlers(registry); customize(registry); } @@ -78,9 +78,9 @@ class ObservationRegistryConfigurer { (observationPredicate) -> registry.observationConfig().observationPredicate(observationPredicate)); } - private void registerGlobalTagsProvider(ObservationRegistry registry) { - this.tagProviders.orderedStream() - .forEach((tagProvider) -> registry.observationConfig().keyValuesProvider(tagProvider)); + private void registerGlobalKeyValuesProviders(ObservationRegistry registry) { + this.keyValuesProviders.orderedStream() + .forEach((keyValuesProvider) -> registry.observationConfig().keyValuesProvider(keyValuesProvider)); } @SuppressWarnings("unchecked") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationRegistryPostProcessor.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationRegistryPostProcessor.java index 06dcccfec3..6918ae4614 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationRegistryPostProcessor.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationRegistryPostProcessor.java @@ -39,7 +39,7 @@ class ObservationRegistryPostProcessor implements BeanPostProcessor { private final ObjectProvider observationPredicates; - private final ObjectProvider> tagProviders; + private final ObjectProvider> keyValuesProviders; private final ObjectProvider> observationHandlers; @@ -49,12 +49,12 @@ class ObservationRegistryPostProcessor implements BeanPostProcessor { ObservationRegistryPostProcessor(ObjectProvider> observationRegistryCustomizers, ObjectProvider observationPredicates, - ObjectProvider> tagProviders, + ObjectProvider> keyValuesProviders, ObjectProvider> observationHandlers, ObjectProvider observationHandlerGrouping) { this.observationRegistryCustomizers = observationRegistryCustomizers; this.observationPredicates = observationPredicates; - this.tagProviders = tagProviders; + this.keyValuesProviders = keyValuesProviders; this.observationHandlers = observationHandlers; this.observationHandlerGrouping = observationHandlerGrouping; } @@ -70,7 +70,7 @@ class ObservationRegistryPostProcessor implements BeanPostProcessor { private ObservationRegistryConfigurer getConfigurer() { if (this.configurer == null) { this.configurer = new ObservationRegistryConfigurer(this.observationRegistryCustomizers, - this.observationPredicates, this.tagProviders, this.observationHandlers, + this.observationPredicates, this.keyValuesProviders, this.observationHandlers, this.observationHandlerGrouping); } return this.configurer; diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfigurationTests.java index 3b59e4550e..e5ca581f69 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfigurationTests.java @@ -99,12 +99,12 @@ class ObservationAutoConfigurationTests { } @Test - void autoConfiguresGlobalTagsProvider() { - this.contextRunner.withUserConfiguration(GlobalTagsProviders.class).run((context) -> { + void autoConfiguresGlobalKeyValuesProvider() { + this.contextRunner.withUserConfiguration(GlobalKeyValuesProviders.class).run((context) -> { ObservationRegistry observationRegistry = context.getBean(ObservationRegistry.class); Context micrometerContext = new Context(); Observation.start("test-observation", micrometerContext, observationRegistry).stop(); - assertThat(micrometerContext.getAllKeyValues()).containsExactly(KeyValue.of("tag1", "value1")); + assertThat(micrometerContext.getAllKeyValues()).containsExactly(KeyValue.of("key1", "value1")); }); } @@ -161,10 +161,10 @@ class ObservationAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - static class GlobalTagsProviders { + static class GlobalKeyValuesProviders { @Bean - Observation.GlobalKeyValuesProvider customTagsProvider() { + Observation.GlobalKeyValuesProvider customKeyValuesProvider() { return new GlobalKeyValuesProvider<>() { @Override public boolean supportsContext(Context context) { @@ -173,7 +173,7 @@ class ObservationAutoConfigurationTests { @Override public KeyValues getLowCardinalityKeyValues(Context context) { - return KeyValues.of("tag1", "value1"); + return KeyValues.of("key1", "value1"); } }; }