Skip to content

Commit ddd820a

Browse files
garyrussellwilkinsona
authored andcommitted
Remove redundant auto-configuration of SI Micrometer metrics
Spring Integration no longer requires a `MicrometerMetricsFactory` to support Micrometer metrics so there's nothing for Boot to auto-configure. See gh-12287
1 parent c4c50b7 commit ddd820a

File tree

3 files changed

+4
-106
lines changed

3 files changed

+4
-106
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/integration/IntegrationMetricsAutoConfiguration.java

Lines changed: 0 additions & 53 deletions
This file was deleted.

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/integration/package-info.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/integration/IntegrationMetricsAutoConfigurationTests.java

Lines changed: 4 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,19 @@
2626
import org.springframework.context.annotation.Bean;
2727
import org.springframework.context.annotation.Configuration;
2828
import org.springframework.integration.support.MessageBuilder;
29-
import org.springframework.integration.support.management.AbstractMessageChannelMetrics;
30-
import org.springframework.integration.support.management.DefaultMetricsFactory;
31-
import org.springframework.integration.support.management.MetricsFactory;
3229
import org.springframework.messaging.Message;
3330
import org.springframework.messaging.SubscribableChannel;
34-
import org.springframework.test.util.ReflectionTestUtils;
35-
36-
import static org.assertj.core.api.Assertions.assertThat;
3731

3832
/**
3933
* Tests for {@link IntegrationMetricsAutoConfiguration}.
4034
*
4135
* @author Phillip Webb
36+
* @author Gary Russell
4237
*/
4338
public class IntegrationMetricsAutoConfigurationTests {
4439

45-
private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
46-
.withConfiguration(AutoConfigurations.of(IntegrationAutoConfiguration.class,
47-
IntegrationMetricsAutoConfiguration.class))
40+
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
41+
.withConfiguration(AutoConfigurations.of(IntegrationAutoConfiguration.class))
4842
.withUserConfiguration(BaseConfiguration.class)
4943
.withPropertyValues("spring.jmx.enabled=false");
5044

@@ -56,23 +50,10 @@ public void autoConfiguredIntegrationIsInstrumented() {
5650
SubscribableChannel.class);
5751
channel.send(message);
5852
MeterRegistry registry = context.getBean(MeterRegistry.class);
59-
registry.get("errorChannel.timer").timer();
60-
registry.get("errorChannel.errorCounter").counter();
53+
registry.get("spring.integration.send").tag("name", "errorChannel").timer();
6154
});
6255
}
6356

64-
@Test
65-
public void autoConfigurationBacksOffWhenHasMetricsFactory() {
66-
this.contextRunner.withUserConfiguration(LegacyConfiguration.class)
67-
.run((context) -> {
68-
SubscribableChannel channel = context.getBean("errorChannel",
69-
SubscribableChannel.class);
70-
AbstractMessageChannelMetrics metrics = (AbstractMessageChannelMetrics) ReflectionTestUtils
71-
.getField(channel, "channelMetrics");
72-
assertThat(metrics.getTimer()).isNull();
73-
});
74-
}
75-
7657
@Configuration
7758
static class BaseConfiguration {
7859

@@ -83,14 +64,4 @@ public SimpleMeterRegistry simpleMeterRegistry() {
8364

8465
}
8566

86-
@Configuration
87-
static class LegacyConfiguration {
88-
89-
@Bean
90-
public MetricsFactory legacyMetricsFactory() {
91-
return new DefaultMetricsFactory();
92-
}
93-
94-
}
95-
9667
}

0 commit comments

Comments
 (0)