From 3ca365cff061f32f27513092382230cae00512b1 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Sat, 9 Apr 2016 22:04:58 -0700 Subject: [PATCH] Export MessageChannel metric writer Update the auto-configured MessageChannelMetricWriter with @ExportMetricWriter so that metrics are actually exported. Fixes gh-5517 --- .../autoconfigure/MetricsChannelAutoConfiguration.java | 3 ++- .../autoconfigure/MetricExportAutoConfigurationTests.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsChannelAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsChannelAutoConfiguration.java index fd44d6b104b..61b856cad9d 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsChannelAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsChannelAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 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. @@ -41,6 +41,7 @@ import org.springframework.messaging.MessageChannel; public class MetricsChannelAutoConfiguration { @Bean + @ExportMetricWriter @ConditionalOnMissingBean public MessageChannelMetricWriter messageChannelMetricWriter( @Qualifier("metricsChannel") MessageChannel channel) { diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfigurationTests.java index 288d9bf1a11..170258fd6b9 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 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. @@ -45,6 +45,7 @@ import org.springframework.messaging.SubscribableChannel; import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; /** * Tests for {@link MetricExportAutoConfiguration}. @@ -77,6 +78,7 @@ public class MetricExportAutoConfigurationTests { PropertyPlaceholderAutoConfiguration.class); MetricExporters exporter = this.context.getBean(MetricExporters.class); assertNotNull(exporter); + assertTrue(exporter.getExporters().containsKey("messageChannelMetricWriter")); } @Test