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

Switch to Micrometer 1.10.0-SNAPSHOT 

See gh-32598
This commit is contained in:
Brian Clozel 2022-10-06 15:12:58 +02:00
parent f2f4a4a40e
commit 3e6ad67f16
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/ClientObservationConventionAdapter.java
View File

@ -55,8 +55,7 @@ class ClientObservationConventionAdapter implements ClientObservationConvention
public KeyValues getLowCardinalityKeyValues(ClientObservationContext context) {
KeyValues keyValues = KeyValues.empty();
mutateClientRequest(context);
Iterable<Tag> tags = this.tagsProvider.tags(context.getCarrier(), context.getResponse(),
context.getError().orElse(null));
Iterable<Tag> tags = this.tagsProvider.tags(context.getCarrier(), context.getResponse(), context.getError());
for (Tag tag : tags) {
keyValues = keyValues.and(tag.getKey(), tag.getValue());
}

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

@ -98,7 +98,7 @@ class ObservationAutoConfigurationTests {
this.contextRunner.withUserConfiguration(CustomGlobalObservationConvention.class).run((context) -> {
ObservationRegistry observationRegistry = context.getBean(ObservationRegistry.class);
Context micrometerContext = new Context();
Observation.start("test-observation", micrometerContext, observationRegistry).stop();
Observation.start("test-observation", () -> micrometerContext, observationRegistry).stop();
assertThat(micrometerContext.getAllKeyValues()).containsExactly(KeyValue.of("key1", "value1"));
});
}
@ -129,7 +129,7 @@ class ObservationAutoConfigurationTests {
ObservationRegistry observationRegistry = context.getBean(ObservationRegistry.class);
List<ObservationHandler<?>> handlers = context.getBean(CalledHandlers.class).getCalledHandlers();
CustomContext customContext = new CustomContext();
Observation.start("test-observation", customContext, observationRegistry);
Observation.start("test-observation", () -> customContext, observationRegistry);
assertThat(handlers).hasSize(1);
assertThat(handlers.get(0)).isInstanceOf(ObservationHandlerWithCustomContext.class);
});

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

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