Skip to content

Commit 5280cfe

Browse files
committed
Adapt to breaking API change in Micrometer
See gh-37703
1 parent 1d410dc commit 5280cfe

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ dependencies {
3737
optional("io.dropwizard.metrics:metrics-jmx")
3838
optional("io.lettuce:lettuce-core")
3939
optional("io.micrometer:micrometer-observation")
40-
optional("io.micrometer:micrometer-core")
40+
optional("io.micrometer:micrometer-jakarta9")
4141
optional("io.micrometer:micrometer-tracing")
4242
optional("io.micrometer:micrometer-tracing-bridge-brave")
4343
optional("io.micrometer:micrometer-tracing-bridge-otel")

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/jms/JmsTemplateObservationAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

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

19-
import io.micrometer.core.instrument.binder.jms.JmsPublishObservationContext;
19+
import io.micrometer.jakarta9.instrument.jms.JmsPublishObservationContext;
2020
import io.micrometer.observation.Observation;
2121
import io.micrometer.observation.ObservationRegistry;
2222
import jakarta.jms.Message;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/jms/JmsTemplateObservationAutoConfigurationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ void shouldConfigureObservationRegistryOnTemplate() {
5151
}
5252

5353
@Test
54-
void shouldBackOffWhenMircrometerCoreIsNotPresent() {
55-
this.contextRunner.withClassLoader(new FilteredClassLoader("io.micrometer.core")).run((context) -> {
54+
void shouldBackOffWhenMicrometerJakartaIsNotPresent() {
55+
this.contextRunner.withClassLoader(new FilteredClassLoader("io.micrometer.jakarta")).run((context) -> {
5656
JmsTemplate jmsTemplate = context.getBean(JmsTemplate.class);
5757
assertThat(jmsTemplate).extracting("observationRegistry").isNull();
5858
});

spring-boot-project/spring-boot-actuator/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies {
2222
optional("com.zaxxer:HikariCP")
2323
optional("io.lettuce:lettuce-core")
2424
optional("io.micrometer:micrometer-observation")
25-
optional("io.micrometer:micrometer-core")
25+
optional("io.micrometer:micrometer-jakarta9")
2626
optional("io.micrometer:micrometer-tracing")
2727
optional("io.micrometer:micrometer-registry-prometheus")
2828
optional("io.prometheus:simpleclient_pushgateway") {

spring-boot-project/spring-boot-docs/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ dependencies {
8989
implementation(project(path: ":spring-boot-project:spring-boot-devtools"))
9090
implementation("ch.qos.logback:logback-classic")
9191
implementation("com.zaxxer:HikariCP")
92-
implementation("io.micrometer:micrometer-core")
92+
implementation("io.micrometer:micrometer-jakarta9")
9393
implementation("io.micrometer:micrometer-tracing")
9494
implementation("io.micrometer:micrometer-registry-graphite")
9595
implementation("io.micrometer:micrometer-registry-jmx")

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/httpclients/webclientreactornettycustomization/MyReactorNettyClientConfiguration.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.Bean
2222
import org.springframework.context.annotation.Configuration
2323
import org.springframework.http.client.reactive.ClientHttpConnector
2424
import org.springframework.http.client.reactive.ReactorClientHttpConnector
25-
import org.springframework.http.client.reactive.ReactorResourceFactory
25+
import org.springframework.http.client.ReactorResourceFactory
2626
import reactor.netty.http.client.HttpClient
2727

2828
@Configuration(proxyBeanMethods = false)

spring-boot-project/spring-boot-starters/spring-boot-starter-actuator/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ dependencies {
88
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
99
api(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
1010
api("io.micrometer:micrometer-observation")
11-
api("io.micrometer:micrometer-core")
11+
api("io.micrometer:micrometer-jakarta9")
1212
}

0 commit comments

Comments
 (0)