From 7438fde0884e12f47b9dd3c1eb7fdeb7a4ad07aa Mon Sep 17 00:00:00 2001 From: Vinicius Carvalho Date: Thu, 30 Mar 2017 17:28:13 -0400 Subject: [PATCH] Changing metrics channel name to align with boot --- .../main/asciidoc/spring-cloud-stream-overview.adoc | 4 ++-- .../BinderMetricsEnvironmentPostProcessor.java | 2 +- .../cloud/stream/metrics/config/Emitter.java | 2 +- .../metrics/ApplicationMetricsExporterTests.java | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spring-cloud-stream-core-docs/src/main/asciidoc/spring-cloud-stream-overview.adoc b/spring-cloud-stream-core-docs/src/main/asciidoc/spring-cloud-stream-overview.adoc index 1e39fde4c..1ae0e9b85 100644 --- a/spring-cloud-stream-core-docs/src/main/asciidoc/spring-cloud-stream-overview.adoc +++ b/spring-cloud-stream-core-docs/src/main/asciidoc/spring-cloud-stream-overview.adoc @@ -1828,7 +1828,7 @@ This module allow operators to collect metrics from stream applications without HTTP polling can be challenging on cloud environments since applications could be on a private network or behind a Load balancer that prevents per instance access. -The module is activated when you set the destination name for its channel, `spring.cloud.stream.bindings.streamMetrics.destination=`. +The module is activated when you set the destination name for its channel, `spring.cloud.stream.bindings.aggregateMetricsChannel.destination=`. By default the module is configured to only send Spring Integration message channel metrics. @@ -1864,7 +1864,7 @@ properties:: + Default: null. + -spring.cloud.stream.bindings.streamMetrics.contentType:: +spring.cloud.stream.bindings.aggregateMetricsChannel.contentType:: Content-Type of the message + Default: `application/json` diff --git a/spring-cloud-stream-metrics/src/main/java/org/springframework/cloud/stream/metrics/config/BinderMetricsEnvironmentPostProcessor.java b/spring-cloud-stream-metrics/src/main/java/org/springframework/cloud/stream/metrics/config/BinderMetricsEnvironmentPostProcessor.java index 2b53b1506..3e947e14b 100644 --- a/spring-cloud-stream-metrics/src/main/java/org/springframework/cloud/stream/metrics/config/BinderMetricsEnvironmentPostProcessor.java +++ b/spring-cloud-stream-metrics/src/main/java/org/springframework/cloud/stream/metrics/config/BinderMetricsEnvironmentPostProcessor.java @@ -32,7 +32,7 @@ public class BinderMetricsEnvironmentPostProcessor implements EnvironmentPostPro public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) { Map propertiesToAdd = new HashMap<>(); - propertiesToAdd.put("spring.cloud.stream.bindings.streamMetrics.contentType", + propertiesToAdd.put("spring.cloud.stream.bindings."+Emitter.METRICS_CHANNEL_NAME+".contentType", "application/json"); propertiesToAdd.put("spring.cloud.stream.metrics.instanceIndex", "${spring.cloud.stream.instanceIndex:${INSTANCE_INDEX:${CF_INSTANCE_INDEX:0}}}"); diff --git a/spring-cloud-stream-metrics/src/main/java/org/springframework/cloud/stream/metrics/config/Emitter.java b/spring-cloud-stream-metrics/src/main/java/org/springframework/cloud/stream/metrics/config/Emitter.java index 138f67d7c..954b6f37c 100644 --- a/spring-cloud-stream-metrics/src/main/java/org/springframework/cloud/stream/metrics/config/Emitter.java +++ b/spring-cloud-stream-metrics/src/main/java/org/springframework/cloud/stream/metrics/config/Emitter.java @@ -24,7 +24,7 @@ import org.springframework.messaging.MessageChannel; */ public interface Emitter { - String METRICS_CHANNEL_NAME = "streamMetrics"; + String METRICS_CHANNEL_NAME = "aggregateMetricsChannel"; @Output(METRICS_CHANNEL_NAME) MessageChannel metrics(); diff --git a/spring-cloud-stream-metrics/src/test/java/org/springframework/cloud/stream/metrics/ApplicationMetricsExporterTests.java b/spring-cloud-stream-metrics/src/test/java/org/springframework/cloud/stream/metrics/ApplicationMetricsExporterTests.java index 17748c5fe..f21ac7a75 100644 --- a/spring-cloud-stream-metrics/src/test/java/org/springframework/cloud/stream/metrics/ApplicationMetricsExporterTests.java +++ b/spring-cloud-stream-metrics/src/test/java/org/springframework/cloud/stream/metrics/ApplicationMetricsExporterTests.java @@ -73,7 +73,7 @@ public class ApplicationMetricsExporterTests { ConfigurableApplicationContext applicationContext = SpringApplication.run( BinderExporterApplication.class, "--server.port=0", "--spring.jmx.enabled=false", "--spring.metrics.export.delay-millis=500", - "--spring.cloud.stream.bindings.streamMetrics.destination=foo"); + "--spring.cloud.stream.bindings.aggregateMetricsChannel.destination=foo"); Emitter emitterSource = applicationContext.getBean(Emitter.class); MessageCollector collector = applicationContext.getBean(MessageCollector.class); Message message = collector.forChannel(emitterSource.metrics()).poll(1000, @@ -97,7 +97,7 @@ public class ApplicationMetricsExporterTests { BinderExporterApplication.class, "--server.port=0", "--spring.jmx.enabled=false", "--spring.metrics.export.delay-millis=500", "--spring.application.name=foo", "--spring.cloud.stream.instanceIndex=1", - "--spring.cloud.stream.bindings.streamMetrics.destination=foo"); + "--spring.cloud.stream.bindings.aggregateMetricsChannel.destination=foo"); Emitter emitterSource = applicationContext.getBean(Emitter.class); MessageCollector collector = applicationContext.getBean(MessageCollector.class); Message message = collector.forChannel(emitterSource.metrics()).poll(1000, @@ -122,7 +122,7 @@ public class ApplicationMetricsExporterTests { "--spring.jmx.enabled=false", "--spring.metrics.export.delay-millis=500", "--spring.cloud.stream.metrics.prefix=foo", "--spring.cloud.stream.instanceIndex=1", - "--spring.cloud.stream.bindings.streamMetrics.destination=foo"); + "--spring.cloud.stream.bindings.aggregateMetricsChannel.destination=foo"); Emitter emitterSource = applicationContext.getBean(Emitter.class); MessageCollector collector = applicationContext.getBean(MessageCollector.class); Message message = collector.forChannel(emitterSource.metrics()).poll(1000, @@ -145,7 +145,7 @@ public class ApplicationMetricsExporterTests { ConfigurableApplicationContext applicationContext = SpringApplication.run( BinderExporterApplication.class, "--server.port=0", "--spring.jmx.enabled=false", "--spring.metrics.export.delay-millis=500", - "--spring.cloud.stream.bindings.streamMetrics.destination=foo", + "--spring.cloud.stream.bindings.aggregateMetricsChannel.destination=foo", "--spring.metrics.export.includes=mem**", "--spring.metrics.export.excludes=integration**"); Emitter emitterSource = applicationContext.getBean(Emitter.class); @@ -168,7 +168,7 @@ public class ApplicationMetricsExporterTests { ConfigurableApplicationContext applicationContext = SpringApplication.run( BinderExporterApplication.class, "--server.port=0", "--spring.jmx.enabled=false", "--spring.metrics.export.delay-millis=500", - "--spring.cloud.stream.bindings.streamMetrics.destination=foo", + "--spring.cloud.stream.bindings.aggregateMetricsChannel.destination=foo", "--spring.metrics.export.includes=integration**", "--spring.cloud.stream.metrics.properties=java**,spring.test.env**"); Emitter emitterSource = applicationContext.getBean(Emitter.class); @@ -194,7 +194,7 @@ public class ApplicationMetricsExporterTests { BinderExporterApplication.class, "--server.port=0", "--spring.jmx.enabled=false", "--spring.metrics.export.delay-millis=500", "--spring.application.name=foo", "--spring.cloud.stream.instanceIndex=1", - "--spring.cloud.stream.bindings.streamMetrics.destination=foo", + "--spring.cloud.stream.bindings.aggregateMetricsChannel.destination=foo", "--spring.cloud.stream.metrics.key=foobarfoo"); Emitter emitterSource = applicationContext.getBean(Emitter.class); MessageCollector collector = applicationContext.getBean(MessageCollector.class);