Skip to content

Commit 99c673f

Browse files
bclozelbclozel
committed
Upgrade to Micrometer 1.12.0-RC1
Closes gh-31398
1 parent 307a2c7 commit 99c673f

File tree

5 files changed

+20
-19
lines changed

5 files changed

+20
-19
lines changed

‎framework-docs/modules/ROOT/pages/integration/observability.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ By default, the following `KeyValues` are created:
117117
[[observability.jms]]
118118
== JMS messaging instrumentation
119119

120-
Spring Framework uses the Jakarta JMS instrumentation provided by Micrometer if the `io.micrometer:micrometer-core` dependency is on the classpath.
121-
The `io.micrometer.core.instrument.binder.jms.JmsInstrumentation` instruments `jakarta.jms.Session` and records the relevant observations.
120+
Spring Framework uses the Jakarta JMS instrumentation provided by Micrometer if the `io.micrometer:micrometer-jakarta9` dependency is on the classpath.
121+
The `io.micrometer.jakarta9.instrument.jms.JmsInstrumentation` instruments `jakarta.jms.Session` and records the relevant observations.
122122

123123
This instrumentation will create 2 types of observations:
124124

@@ -158,7 +158,7 @@ You will need to configure the `ObservationRegistry` on the `JmsTemplate` to ena
158158

159159
include-code::./JmsTemplatePublish[]
160160

161-
It uses the `io.micrometer.core.instrument.binder.jms.DefaultJmsPublishObservationConvention` by default, backed by the `io.micrometer.core.instrument.binder.jms.JmsPublishObservationContext`.
161+
It uses the `io.micrometer.jakarta9.instrument.jms.DefaultJmsPublishObservationConvention` by default, backed by the `io.micrometer.jakarta9.instrument.jms.JmsPublishObservationContext`.
162162

163163
[[observability.jms.process]]
164164
=== JMS message Processing instrumentation
@@ -178,7 +178,7 @@ In all cases, Observations are only recorded if the observation registry is conf
178178
Similar observations are recorded with `JmsTemplate` when messages are processed by a `MessageListener`.
179179
Such listeners are set on a `MessageConsumer` within a session callback (see `JmsTemplate.execute(SessionCallback<T>)`).
180180

181-
This observation uses the `io.micrometer.core.instrument.binder.jms.DefaultJmsProcessObservationConvention` by default, backed by the `io.micrometer.core.instrument.binder.jms.JmsProcessObservationContext`.
181+
This observation uses the `io.micrometer.jakarta9.instrument.jms.DefaultJmsProcessObservationConvention` by default, backed by the `io.micrometer.jakarta9.instrument.jms.JmsProcessObservationContext`.
182182

183183
[[observability.http-server]]
184184
== HTTP Server instrumentation

‎framework-platform/framework-platform.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ javaPlatform {
88

99
dependencies {
1010
api(platform("com.fasterxml.jackson:jackson-bom:2.15.2"))
11-
api(platform("io.micrometer:micrometer-bom:1.12.0-M3"))
11+
api(platform("io.micrometer:micrometer-bom:1.12.0-RC1"))
1212
api(platform("io.netty:netty-bom:4.1.97.Final"))
1313
api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
1414
api(platform("io.projectreactor:reactor-bom:2023.0.0-M3"))
@@ -46,7 +46,7 @@ dependencies {
4646
api("com.thoughtworks.xstream:xstream:1.4.20")
4747
api("commons-io:commons-io:2.11.0")
4848
api("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.2")
49-
api("io.micrometer:context-propagation:1.1.0-M4")
49+
api("io.micrometer:context-propagation:1.1.0-RC1")
5050
api("io.mockk:mockk:1.13.4")
5151
api("io.projectreactor.netty:reactor-netty5-http:2.0.0-M3")
5252
api("io.projectreactor.tools:blockhound:1.0.8.RELEASE")

‎spring-jms/spring-jms.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ dependencies {
1111
optional(project(":spring-context"))
1212
optional(project(":spring-oxm"))
1313
optional("com.fasterxml.jackson.core:jackson-databind")
14-
optional("io.micrometer:micrometer-core")
14+
optional("io.micrometer:micrometer-jakarta9")
1515
optional("jakarta.resource:jakarta.resource-api")
1616
optional("jakarta.transaction:jakarta.transaction-api")
1717
testImplementation(testFixtures(project(":spring-beans")))
1818
testImplementation(testFixtures(project(":spring-tx")))
1919
testImplementation("jakarta.jms:jakarta.jms-api")
2020
testImplementation('io.micrometer:context-propagation')
21+
testImplementation("io.micrometer:micrometer-jakarta9")
2122
testImplementation("io.micrometer:micrometer-observation-test")
2223
testImplementation("org.apache.activemq:artemis-junit-5")
2324
testImplementation("org.apache.activemq:artemis-jakarta-client")

‎spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java

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

1717
package org.springframework.jms.core;
1818

19-
import io.micrometer.core.instrument.binder.jms.JmsInstrumentation;
19+
import io.micrometer.jakarta9.instrument.jms.JmsInstrumentation;
2020
import io.micrometer.observation.ObservationRegistry;
2121
import jakarta.jms.Connection;
2222
import jakarta.jms.ConnectionFactory;
@@ -92,8 +92,8 @@
9292
*/
9393
public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations {
9494

95-
private static final boolean micrometerCorePresent = ClassUtils.isPresent(
96-
"io.micrometer.core.instrument.binder.jms.JmsInstrumentation", JmsTemplate.class.getClassLoader());
95+
private static final boolean micrometerJakartaPresent = ClassUtils.isPresent(
96+
"io.micrometer.jakarta9.instrument.jms.JmsInstrumentation", JmsTemplate.class.getClassLoader());
9797

9898
/** Internal ResourceFactory adapter for interacting with ConnectionFactoryUtils. */
9999
private final JmsTemplateResourceFactory transactionalResourceFactory = new JmsTemplateResourceFactory();
@@ -474,7 +474,7 @@ public long getTimeToLive() {
474474
* Configure the {@link ObservationRegistry} to use for recording JMS observations.
475475
* @param observationRegistry the observation registry to use.
476476
* @since 6.1
477-
* @see io.micrometer.core.instrument.binder.jms.JmsObservationDocumentation
477+
* @see io.micrometer.jakarta10.instrument.jms.JmsInstrumentation
478478
*/
479479
public void setObservationRegistry(ObservationRegistry observationRegistry) {
480480
this.observationRegistry = observationRegistry;
@@ -524,7 +524,7 @@ public <T> T execute(SessionCallback<T> action, boolean startConnection) throws
524524
if (logger.isDebugEnabled()) {
525525
logger.debug("Executing callback on JMS Session: " + sessionToUse);
526526
}
527-
if (micrometerCorePresent && this.observationRegistry != null) {
527+
if (micrometerJakartaPresent && this.observationRegistry != null) {
528528
sessionToUse = MicrometerInstrumentation.instrumentSession(sessionToUse, this.observationRegistry);
529529
}
530530
return action.doInJms(sessionToUse);

‎spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java

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

1717
package org.springframework.jms.listener;
1818

19-
import io.micrometer.core.instrument.binder.jms.DefaultJmsProcessObservationConvention;
20-
import io.micrometer.core.instrument.binder.jms.JmsObservationDocumentation;
21-
import io.micrometer.core.instrument.binder.jms.JmsProcessObservationContext;
22-
import io.micrometer.core.instrument.binder.jms.JmsProcessObservationConvention;
19+
import io.micrometer.jakarta9.instrument.jms.DefaultJmsProcessObservationConvention;
20+
import io.micrometer.jakarta9.instrument.jms.JmsObservationDocumentation;
21+
import io.micrometer.jakarta9.instrument.jms.JmsProcessObservationContext;
22+
import io.micrometer.jakarta9.instrument.jms.JmsProcessObservationConvention;
2323
import io.micrometer.observation.Observation;
2424
import io.micrometer.observation.ObservationRegistry;
2525
import jakarta.jms.Connection;
@@ -150,8 +150,8 @@
150150
public abstract class AbstractMessageListenerContainer extends AbstractJmsListeningContainer
151151
implements MessageListenerContainer {
152152

153-
private static final boolean micrometerCorePresent = ClassUtils.isPresent(
154-
"io.micrometer.core.instrument.binder.jms.JmsInstrumentation", AbstractMessageListenerContainer.class.getClassLoader());
153+
private static final boolean micrometerJakartaPresent = ClassUtils.isPresent(
154+
"io.micrometer.jakarta9.instrument.jms.JmsInstrumentation", AbstractMessageListenerContainer.class.getClassLoader());
155155

156156
@Nullable
157157
private volatile Object destination;
@@ -716,7 +716,7 @@ protected void doExecuteListener(Session session, Message message) throws JMSExc
716716
}
717717

718718
private Observation createObservation(Message message) {
719-
if (micrometerCorePresent && this.observationRegistry != null) {
719+
if (micrometerJakartaPresent && this.observationRegistry != null) {
720720
return ObservationFactory.create(this.observationRegistry, message);
721721
}
722722
else {

0 commit comments

Comments
 (0)