Skip to content

Integration 5.0.3 Micrometer Changes #12287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Integration 5.0.3 Micrometer Changes #12287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 0 additions & 53 deletions ...k/boot/actuate/autoconfigure/metrics/integration/IntegrationMetricsAutoConfiguration.java
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions ...java/org/springframework/boot/actuate/autoconfigure/metrics/integration/package-info.java
View file
Open in desktop

This file was deleted.

37 changes: 4 additions & 33 deletions ...t/actuate/autoconfigure/metrics/integration/IntegrationMetricsAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,19 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.integration.support.management.AbstractMessageChannelMetrics;
import org.springframework.integration.support.management.DefaultMetricsFactory;
import org.springframework.integration.support.management.MetricsFactory;
import org.springframework.messaging.Message;
import org.springframework.messaging.SubscribableChannel;
import org.springframework.test.util.ReflectionTestUtils;

import static org.assertj.core.api.Assertions.assertThat;

/**
* Tests for {@link IntegrationMetricsAutoConfiguration}.
*
* @author Phillip Webb
* @author Gary Russell
*/
public class IntegrationMetricsAutoConfigurationTests {

private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(IntegrationAutoConfiguration.class,
IntegrationMetricsAutoConfiguration.class))
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(IntegrationAutoConfiguration.class))
.withUserConfiguration(BaseConfiguration.class)
.withPropertyValues("spring.jmx.enabled=false");

Expand All @@ -56,23 +50,10 @@ public void autoConfiguredIntegrationIsInstrumented() {
SubscribableChannel.class);
channel.send(message);
MeterRegistry registry = context.getBean(MeterRegistry.class);
registry.get("errorChannel.timer").timer();
registry.get("errorChannel.errorCounter").counter();
registry.get("spring.integration.send").tag("name", "errorChannel").timer();
});
}

@Test
public void autoConfigurationBacksOffWhenHasMetricsFactory() {
this.contextRunner.withUserConfiguration(LegacyConfiguration.class)
.run((context) -> {
SubscribableChannel channel = context.getBean("errorChannel",
SubscribableChannel.class);
AbstractMessageChannelMetrics metrics = (AbstractMessageChannelMetrics) ReflectionTestUtils
.getField(channel, "channelMetrics");
assertThat(metrics.getTimer()).isNull();
});
}

@Configuration
static class BaseConfiguration {

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

}

@Configuration
static class LegacyConfiguration {

@Bean
public MetricsFactory legacyMetricsFactory() {
return new DefaultMetricsFactory();
}

}

}