mirror of
https://github.com/spring-projects/spring-boot.git
synced 2026-05-03 03:43:54 +01:00
Prevent 'not eligible for getting processed' warnings when using JMX
Update auto-configured `IntegrationMBeanExporter` to be created from a static method since it's a post-processor. Relevant injection now occurs by overriding the `afterSingletonsInstantiated()` method. Closes gh-45186
This commit is contained in:
+17
-10
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2024 the original author or authors.
|
||||
* Copyright 2012-2025 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -23,7 +23,6 @@ import javax.sql.DataSource;
|
||||
|
||||
import io.rsocket.transport.netty.server.TcpServerTransport;
|
||||
|
||||
import org.springframework.beans.factory.BeanFactory;
|
||||
import org.springframework.beans.factory.ObjectProvider;
|
||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
|
||||
@@ -44,6 +43,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
|
||||
import org.springframework.boot.context.properties.PropertyMapper;
|
||||
import org.springframework.boot.context.properties.source.MutuallyExclusiveConfigurationPropertiesException;
|
||||
import org.springframework.boot.task.ThreadPoolTaskSchedulerBuilder;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Conditional;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
@@ -200,14 +200,21 @@ public class IntegrationAutoConfiguration {
|
||||
protected static class IntegrationJmxConfiguration {
|
||||
|
||||
@Bean
|
||||
public IntegrationMBeanExporter integrationMbeanExporter(BeanFactory beanFactory, JmxProperties properties) {
|
||||
IntegrationMBeanExporter exporter = new IntegrationMBeanExporter();
|
||||
String defaultDomain = properties.getDefaultDomain();
|
||||
if (StringUtils.hasLength(defaultDomain)) {
|
||||
exporter.setDefaultDomain(defaultDomain);
|
||||
}
|
||||
exporter.setServer(beanFactory.getBean(properties.getServer(), MBeanServer.class));
|
||||
return exporter;
|
||||
public static IntegrationMBeanExporter integrationMbeanExporter(ApplicationContext applicationContext) {
|
||||
return new IntegrationMBeanExporter() {
|
||||
|
||||
@Override
|
||||
public void afterSingletonsInstantiated() {
|
||||
JmxProperties properties = applicationContext.getBean(JmxProperties.class);
|
||||
String defaultDomain = properties.getDefaultDomain();
|
||||
if (StringUtils.hasLength(defaultDomain)) {
|
||||
setDefaultDomain(defaultDomain);
|
||||
}
|
||||
setServer(applicationContext.getBean(properties.getServer(), MBeanServer.class));
|
||||
super.afterSingletonsInstantiated();
|
||||
}
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+1
-1
@@ -143,7 +143,7 @@ class IntegrationAutoConfigurationTests {
|
||||
this.contextRunner.withPropertyValues("spring.jmx.enabled=true").run((context) -> {
|
||||
MBeanServer mBeanServer = context.getBean(MBeanServer.class);
|
||||
assertThat(mBeanServer.getDomains()).contains("org.springframework.integration",
|
||||
"org.springframework.integration.monitor");
|
||||
"org.springframework.boot.autoconfigure.integration");
|
||||
assertThat(context).hasBean(IntegrationManagementConfigurer.MANAGEMENT_CONFIGURER_NAME);
|
||||
});
|
||||
}
|
||||
|
||||
+1
@@ -9,6 +9,7 @@ dependencies {
|
||||
|
||||
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-integration"))
|
||||
implementation("org.springframework.integration:spring-integration-file")
|
||||
implementation("org.springframework.integration:spring-integration-jmx")
|
||||
|
||||
testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
|
||||
testImplementation("org.awaitility:awaitility")
|
||||
|
||||
+1
@@ -2,3 +2,4 @@ logging.level.org.springframework.integration.file=DEBUG
|
||||
service.greeting=Hello
|
||||
service.input-dir=input
|
||||
service.output-dir=output
|
||||
spring.jmx.enabled=true
|
||||
+8
-2
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2023 the original author or authors.
|
||||
* Copyright 2012-2025 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -25,18 +25,22 @@ import java.time.Duration;
|
||||
import org.awaitility.Awaitility;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.junit.jupiter.api.io.TempDir;
|
||||
import smoketest.integration.SampleIntegrationApplication;
|
||||
import smoketest.integration.ServiceProperties;
|
||||
import smoketest.integration.producer.ProducerApplication;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.test.system.CapturedOutput;
|
||||
import org.springframework.boot.test.system.OutputCaptureExtension;
|
||||
import org.springframework.context.ConfigurableApplicationContext;
|
||||
import org.springframework.core.io.DefaultResourceLoader;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.core.io.support.ResourcePatternUtils;
|
||||
import org.springframework.util.StreamUtils;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.hamcrest.Matchers.containsString;
|
||||
|
||||
/**
|
||||
@@ -45,12 +49,14 @@ import static org.hamcrest.Matchers.containsString;
|
||||
* @author Dave Syer
|
||||
* @author Andy Wilkinson
|
||||
*/
|
||||
@ExtendWith(OutputCaptureExtension.class)
|
||||
class SampleIntegrationApplicationTests {
|
||||
|
||||
private ConfigurableApplicationContext context;
|
||||
|
||||
@AfterEach
|
||||
void stop() {
|
||||
void stopAndCheck(CapturedOutput output) {
|
||||
assertThat(output).doesNotContain("WARN");
|
||||
if (this.context != null) {
|
||||
this.context.close();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user