tchekai704
/
src-spring-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Upgrade to Micrometer 1.12.0-RC1 

Closes gh-31398
pull/31413/head
Brian Clozel 12 months ago
parent
307a2c7d7b
commit
99c673f3ea
5 changed files with 20 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      framework-docs/modules/ROOT/pages/integration/observability.adoc
  2. 4
      framework-platform/framework-platform.gradle
  3. 3
      spring-jms/spring-jms.gradle
  4. 10
      spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java
  5. 14
      spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java

8
framework-docs/modules/ROOT/pages/integration/observability.adoc
Unescape View File

@ -117,8 +117,8 @@ By default, the following `KeyValues` are created:
[[observability.jms]] [[observability.jms]]
== JMS messaging instrumentation == JMS messaging instrumentation
Spring Framework uses the Jakarta JMS instrumentation provided by Micrometer if the `io.micrometer:micrometer-core` dependency is on the classpath. Spring Framework uses the Jakarta JMS instrumentation provided by Micrometer if the `io.micrometer:micrometer-jakarta9` dependency is on the classpath.
The `io.micrometer.core.instrument.binder.jms.JmsInstrumentation` instruments `jakarta.jms.Session` and records the relevant observations. The `io.micrometer.jakarta9.instrument.jms.JmsInstrumentation` instruments `jakarta.jms.Session` and records the relevant observations.
This instrumentation will create 2 types of observations: This instrumentation will create 2 types of observations:
@ -158,7 +158,7 @@ You will need to configure the `ObservationRegistry` on the `JmsTemplate` to ena
include-code::./JmsTemplatePublish[] include-code::./JmsTemplatePublish[]
It uses the `io.micrometer.core.instrument.binder.jms.DefaultJmsPublishObservationConvention` by default, backed by the `io.micrometer.core.instrument.binder.jms.JmsPublishObservationContext`. It uses the `io.micrometer.jakarta9.instrument.jms.DefaultJmsPublishObservationConvention` by default, backed by the `io.micrometer.jakarta9.instrument.jms.JmsPublishObservationContext`.
[[observability.jms.process]] [[observability.jms.process]]
=== JMS message Processing instrumentation === JMS message Processing instrumentation
@ -178,7 +178,7 @@ In all cases, Observations are only recorded if the observation registry is conf
Similar observations are recorded with `JmsTemplate` when messages are processed by a `MessageListener`. Similar observations are recorded with `JmsTemplate` when messages are processed by a `MessageListener`.
Such listeners are set on a `MessageConsumer` within a session callback (see `JmsTemplate.execute(SessionCallback<T>)`). Such listeners are set on a `MessageConsumer` within a session callback (see `JmsTemplate.execute(SessionCallback<T>)`).
This observation uses the `io.micrometer.core.instrument.binder.jms.DefaultJmsProcessObservationConvention` by default, backed by the `io.micrometer.core.instrument.binder.jms.JmsProcessObservationContext`. This observation uses the `io.micrometer.jakarta9.instrument.jms.DefaultJmsProcessObservationConvention` by default, backed by the `io.micrometer.jakarta9.instrument.jms.JmsProcessObservationContext`.
[[observability.http-server]] [[observability.http-server]]
== HTTP Server instrumentation == HTTP Server instrumentation

4
framework-platform/framework-platform.gradle
Unescape View File

@ -8,7 +8,7 @@ javaPlatform {
dependencies { dependencies {
api(platform("com.fasterxml.jackson:jackson-bom:2.15.2")) api(platform("com.fasterxml.jackson:jackson-bom:2.15.2"))
api(platform("io.micrometer:micrometer-bom:1.12.0-M3")) api(platform("io.micrometer:micrometer-bom:1.12.0-RC1"))
api(platform("io.netty:netty-bom:4.1.97.Final")) api(platform("io.netty:netty-bom:4.1.97.Final"))
api(platform("io.netty:netty5-bom:5.0.0.Alpha5")) api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
api(platform("io.projectreactor:reactor-bom:2023.0.0-M3")) api(platform("io.projectreactor:reactor-bom:2023.0.0-M3"))
@ -46,7 +46,7 @@ dependencies {
api("com.thoughtworks.xstream:xstream:1.4.20") api("com.thoughtworks.xstream:xstream:1.4.20")
api("commons-io:commons-io:2.11.0") api("commons-io:commons-io:2.11.0")
api("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.2") api("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.2")
api("io.micrometer:context-propagation:1.1.0-M4") api("io.micrometer:context-propagation:1.1.0-RC1")
api("io.mockk:mockk:1.13.4") api("io.mockk:mockk:1.13.4")
api("io.projectreactor.netty:reactor-netty5-http:2.0.0-M3") api("io.projectreactor.netty:reactor-netty5-http:2.0.0-M3")
api("io.projectreactor.tools:blockhound:1.0.8.RELEASE") api("io.projectreactor.tools:blockhound:1.0.8.RELEASE")

3
spring-jms/spring-jms.gradle
Unescape View File

@ -11,13 +11,14 @@ dependencies {
optional(project(":spring-context")) optional(project(":spring-context"))
optional(project(":spring-oxm")) optional(project(":spring-oxm"))
optional("com.fasterxml.jackson.core:jackson-databind") optional("com.fasterxml.jackson.core:jackson-databind")
optional("io.micrometer:micrometer-core") optional("io.micrometer:micrometer-jakarta9")
optional("jakarta.resource:jakarta.resource-api") optional("jakarta.resource:jakarta.resource-api")
optional("jakarta.transaction:jakarta.transaction-api") optional("jakarta.transaction:jakarta.transaction-api")
testImplementation(testFixtures(project(":spring-beans"))) testImplementation(testFixtures(project(":spring-beans")))
testImplementation(testFixtures(project(":spring-tx"))) testImplementation(testFixtures(project(":spring-tx")))
testImplementation("jakarta.jms:jakarta.jms-api") testImplementation("jakarta.jms:jakarta.jms-api")
testImplementation('io.micrometer:context-propagation') testImplementation('io.micrometer:context-propagation')
testImplementation("io.micrometer:micrometer-jakarta9")
testImplementation("io.micrometer:micrometer-observation-test") testImplementation("io.micrometer:micrometer-observation-test")
testImplementation("org.apache.activemq:artemis-junit-5") testImplementation("org.apache.activemq:artemis-junit-5")
testImplementation("org.apache.activemq:artemis-jakarta-client") testImplementation("org.apache.activemq:artemis-jakarta-client")

10
spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java
Unescape View File

@ -16,7 +16,7 @@
package org.springframework.jms.core; package org.springframework.jms.core;
import io.micrometer.core.instrument.binder.jms.JmsInstrumentation; import io.micrometer.jakarta9.instrument.jms.JmsInstrumentation;
import io.micrometer.observation.ObservationRegistry; import io.micrometer.observation.ObservationRegistry;
import jakarta.jms.Connection; import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory; import jakarta.jms.ConnectionFactory;
@ -92,8 +92,8 @@ import org.springframework.util.ClassUtils;
*/ */
public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations { public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations {
private static final boolean micrometerCorePresent = ClassUtils.isPresent( private static final boolean micrometerJakartaPresent = ClassUtils.isPresent(
"io.micrometer.core.instrument.binder.jms.JmsInstrumentation", JmsTemplate.class.getClassLoader()); "io.micrometer.jakarta9.instrument.jms.JmsInstrumentation", JmsTemplate.class.getClassLoader());
/** Internal ResourceFactory adapter for interacting with ConnectionFactoryUtils. */ /** Internal ResourceFactory adapter for interacting with ConnectionFactoryUtils. */
private final JmsTemplateResourceFactory transactionalResourceFactory = new JmsTemplateResourceFactory(); private final JmsTemplateResourceFactory transactionalResourceFactory = new JmsTemplateResourceFactory();
@ -474,7 +474,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
* Configure the {@link ObservationRegistry} to use for recording JMS observations. * Configure the {@link ObservationRegistry} to use for recording JMS observations.
* @param observationRegistry the observation registry to use. * @param observationRegistry the observation registry to use.
* @since 6.1 * @since 6.1
* @see io.micrometer.core.instrument.binder.jms.JmsObservationDocumentation * @see io.micrometer.jakarta10.instrument.jms.JmsInstrumentation
*/ */
public void setObservationRegistry(ObservationRegistry observationRegistry) { public void setObservationRegistry(ObservationRegistry observationRegistry) {
this.observationRegistry = observationRegistry; this.observationRegistry = observationRegistry;
@ -524,7 +524,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Executing callback on JMS Session: " + sessionToUse); logger.debug("Executing callback on JMS Session: " + sessionToUse);
} }
if (micrometerCorePresent && this.observationRegistry != null) { if (micrometerJakartaPresent && this.observationRegistry != null) {
sessionToUse = MicrometerInstrumentation.instrumentSession(sessionToUse, this.observationRegistry); sessionToUse = MicrometerInstrumentation.instrumentSession(sessionToUse, this.observationRegistry);
} }
return action.doInJms(sessionToUse); return action.doInJms(sessionToUse);

14
spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java
Unescape View File

@ -16,10 +16,10 @@
package org.springframework.jms.listener; package org.springframework.jms.listener;
import io.micrometer.core.instrument.binder.jms.DefaultJmsProcessObservationConvention; import io.micrometer.jakarta9.instrument.jms.DefaultJmsProcessObservationConvention;
import io.micrometer.core.instrument.binder.jms.JmsObservationDocumentation; import io.micrometer.jakarta9.instrument.jms.JmsObservationDocumentation;
import io.micrometer.core.instrument.binder.jms.JmsProcessObservationContext; import io.micrometer.jakarta9.instrument.jms.JmsProcessObservationContext;
import io.micrometer.core.instrument.binder.jms.JmsProcessObservationConvention; import io.micrometer.jakarta9.instrument.jms.JmsProcessObservationConvention;
import io.micrometer.observation.Observation; import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationRegistry; import io.micrometer.observation.ObservationRegistry;
import jakarta.jms.Connection; import jakarta.jms.Connection;
@ -150,8 +150,8 @@ import org.springframework.util.ErrorHandler;
public abstract class AbstractMessageListenerContainer extends AbstractJmsListeningContainer public abstract class AbstractMessageListenerContainer extends AbstractJmsListeningContainer
implements MessageListenerContainer { implements MessageListenerContainer {
private static final boolean micrometerCorePresent = ClassUtils.isPresent( private static final boolean micrometerJakartaPresent = ClassUtils.isPresent(
"io.micrometer.core.instrument.binder.jms.JmsInstrumentation", AbstractMessageListenerContainer.class.getClassLoader()); "io.micrometer.jakarta9.instrument.jms.JmsInstrumentation", AbstractMessageListenerContainer.class.getClassLoader());
@Nullable @Nullable
private volatile Object destination; private volatile Object destination;
@ -716,7 +716,7 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen
} }
private Observation createObservation(Message message) { private Observation createObservation(Message message) {
if (micrometerCorePresent && this.observationRegistry != null) { if (micrometerJakartaPresent && this.observationRegistry != null) {
return ObservationFactory.create(this.observationRegistry, message); return ObservationFactory.create(this.observationRegistry, message);
} }
else { else {

Write Preview
Loading…
Cancel
Save