forked from spring-projects/spring-boot
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add MetricsEndpointMetricReader for exporting all metrics
User can add a bean of type MetricsEndpointMetricReader to opt in to exporting all metrics via the MetricsEndpoint (instead of via MetricReaders). There are disadvantages (like no accurate timestamps) so it's best to leave it as an opt in. Also improved tests for metric auto configuration a bit.
- Loading branch information
Showing
5 changed files
with
243 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 71 additions & 0 deletions
71
.../src/main/java/org/springframework/boot/actuate/endpoint/MetricsEndpointMetricReader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /* | ||
| * Copyright 2012-2015 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. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.springframework.boot.actuate.endpoint; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Date; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Map.Entry; | ||
|
|
||
| import org.springframework.boot.actuate.metrics.Metric; | ||
| import org.springframework.boot.actuate.metrics.reader.MetricReader; | ||
|
|
||
| /** | ||
| * A {@link MetricReader} that pulls all current values out of the {@link MetricsEndpoint} | ||
| * . No timestamp information is available, so there is no way to check if the values are | ||
| * recent, and they all come out with the default (current time). | ||
| * | ||
| * @author Dave Syer | ||
| * | ||
| */ | ||
| public class MetricsEndpointMetricReader implements MetricReader { | ||
|
|
||
| private final MetricsEndpoint endpoint; | ||
|
|
||
| public MetricsEndpointMetricReader(MetricsEndpoint endpoint) { | ||
| this.endpoint = endpoint; | ||
| } | ||
|
|
||
| @Override | ||
| public Metric<?> findOne(String metricName) { | ||
| Metric<Number> metric = null; | ||
| Object value = endpoint.invoke().get(metricName); | ||
| if (value != null) { | ||
| metric = new Metric<Number>(metricName, (Number) value); | ||
| } | ||
| return metric; | ||
| } | ||
|
|
||
| @Override | ||
| public Iterable<Metric<?>> findAll() { | ||
| List<Metric<?>> metrics = new ArrayList<Metric<?>>(); | ||
| Map<String, Object> values = endpoint.invoke(); | ||
| Date timestamp = new Date(); | ||
| for (Entry<String, Object> entry : values.entrySet()) { | ||
| String name = entry.getKey(); | ||
| Object value = entry.getValue(); | ||
| metrics.add(new Metric<Number>(name, (Number) value, timestamp)); | ||
| } | ||
| return metrics; | ||
| } | ||
|
|
||
| @Override | ||
| public long count() { | ||
| return endpoint.invoke().size(); | ||
| } | ||
|
|
||
| } |
135 changes: 135 additions & 0 deletions
135
...va/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfigurationTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| /* | ||
| * Copyright 2012-2015 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. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.springframework.boot.actuate.autoconfigure; | ||
|
|
||
| import static org.junit.Assert.assertNotNull; | ||
|
|
||
| import org.junit.After; | ||
| import org.junit.Test; | ||
| import org.mockito.Matchers; | ||
| import org.mockito.Mockito; | ||
| import org.springframework.boot.actuate.endpoint.MetricsEndpointMetricReader; | ||
| import org.springframework.boot.actuate.metrics.GaugeService; | ||
| import org.springframework.boot.actuate.metrics.Metric; | ||
| import org.springframework.boot.actuate.metrics.export.MetricCopyExporter; | ||
| import org.springframework.boot.actuate.metrics.export.MetricExporters; | ||
| import org.springframework.boot.actuate.metrics.writer.MetricWriter; | ||
| import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; | ||
| import org.springframework.context.annotation.AnnotationConfigApplicationContext; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.integration.channel.FixedSubscriberChannel; | ||
| import org.springframework.messaging.Message; | ||
| import org.springframework.messaging.MessageHandler; | ||
| import org.springframework.messaging.MessagingException; | ||
| import org.springframework.messaging.SubscribableChannel; | ||
|
|
||
| /** | ||
| * Tests for {@link MetricRepositoryAutoConfiguration}. | ||
| * | ||
| * @author Phillip Webb | ||
| * @author Dave Syer | ||
| */ | ||
| public class MetricExportAutoConfigurationTests { | ||
|
|
||
| private AnnotationConfigApplicationContext context; | ||
|
|
||
| @After | ||
| public void after() { | ||
| if (this.context != null) { | ||
| this.context.close(); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void defaultExporterWhenMessageChannelAvailable() throws Exception { | ||
| this.context = new AnnotationConfigApplicationContext( | ||
| MessageChannelConfiguration.class, | ||
| MetricRepositoryAutoConfiguration.class, | ||
| MetricsChannelAutoConfiguration.class, | ||
| MetricExportAutoConfiguration.class, | ||
| PropertyPlaceholderAutoConfiguration.class); | ||
| MetricExporters exporter = this.context.getBean(MetricExporters.class); | ||
| assertNotNull(exporter); | ||
| } | ||
|
|
||
| @Test | ||
| public void provideAdditionalWriter() { | ||
| this.context = new AnnotationConfigApplicationContext(WriterConfig.class, | ||
| MetricRepositoryAutoConfiguration.class, | ||
| MetricExportAutoConfiguration.class, | ||
| PropertyPlaceholderAutoConfiguration.class); | ||
| GaugeService gaugeService = this.context.getBean(GaugeService.class); | ||
| assertNotNull(gaugeService); | ||
| gaugeService.submit("foo", 2.7); | ||
| MetricExporters exporters = this.context.getBean(MetricExporters.class); | ||
| MetricCopyExporter exporter = (MetricCopyExporter) exporters.getExporters().get( | ||
| "writer"); | ||
| exporter.setIgnoreTimestamps(true); | ||
| exporter.export(); | ||
| MetricWriter writer = this.context.getBean("writer", MetricWriter.class); | ||
| Mockito.verify(writer, Mockito.atLeastOnce()).set(Matchers.any(Metric.class)); | ||
| } | ||
|
|
||
| @Test | ||
| public void exportMetricsEndpoint() { | ||
| this.context = new AnnotationConfigApplicationContext(WriterConfig.class, | ||
| MetricEndpointConfiguration.class, | ||
| MetricExportAutoConfiguration.class, | ||
| PropertyPlaceholderAutoConfiguration.class); | ||
| MetricExporters exporters = this.context.getBean(MetricExporters.class); | ||
| MetricCopyExporter exporter = (MetricCopyExporter) exporters.getExporters().get( | ||
| "writer"); | ||
| exporter.setIgnoreTimestamps(true); | ||
| exporter.export(); | ||
| MetricsEndpointMetricReader reader = this.context.getBean("endpointReader", MetricsEndpointMetricReader.class); | ||
| Mockito.verify(reader, Mockito.atLeastOnce()).findAll(); | ||
| } | ||
|
|
||
| @Configuration | ||
| public static class MessageChannelConfiguration { | ||
| @Bean | ||
| public SubscribableChannel metricsChannel() { | ||
| return new FixedSubscriberChannel(new MessageHandler() { | ||
| @Override | ||
| public void handleMessage(Message<?> message) throws MessagingException { | ||
| } | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| @Configuration | ||
| public static class WriterConfig { | ||
|
|
||
| @Bean | ||
| public MetricWriter writer() { | ||
| return Mockito.mock(MetricWriter.class); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| @Configuration | ||
| public static class MetricEndpointConfiguration { | ||
|
|
||
| @Bean | ||
| public MetricsEndpointMetricReader endpointReader() { | ||
| return Mockito.mock(MetricsEndpointMetricReader.class); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } |
Oops, something went wrong.