Support automatic addition of percentiles to client requests (issue m…

…icrometer-metrics#72)
jkemming · Sep 5, 2017 · f6bed73 · f6bed73
1 parent 016d23c
commit f6bed73
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 10 deletions.
diff --git a/...eter-spring-legacy/src/main/java/io/micrometer/spring/MetricsConfigurationProperties.java b/...eter-spring-legacy/src/main/java/io/micrometer/spring/MetricsConfigurationProperties.java
@@ -86,6 +86,22 @@ public void setClientRequestsName(String clientRequestsName) {
         public String getClientRequestsName() {
             return clientRequestsName;
         }
+
+        public void setServerRequestPercentiles(Boolean serverRequestPercentiles) {
+            this.serverRequestPercentiles = serverRequestPercentiles;
+        }
+
+        public Boolean getServerRequestPercentiles() {
+            return serverRequestPercentiles;
+        }
+
+        public void setClientRequestPercentiles(Boolean clientRequestPercentiles) {
+            this.clientRequestPercentiles = clientRequestPercentiles;
+        }
+
+        public Boolean getClientRequestPercentiles() {
+            return clientRequestPercentiles;
+        }
     }
 
     public Web getWeb() {

diff --git a/micrometer-spring-legacy/src/main/java/io/micrometer/spring/web/ControllerMetrics.java b/micrometer-spring-legacy/src/main/java/io/micrometer/spring/web/ControllerMetrics.java
@@ -154,7 +154,7 @@ private class TimerConfig {
         Iterable<Tag> extraTags = Collections.emptyList();
         boolean longTask = false;
         double[] quantiles = new double[0];
-        boolean percentiles = properties.getWeb().getAutoTimeServerRequests();
+        boolean percentiles = properties.getWeb().getServerRequestPercentiles();
 
         @Override
         public boolean equals(Object o) {

diff --git a/...-spring-legacy/src/main/java/io/micrometer/spring/web/MetricsRestTemplateInterceptor.java b/...-spring-legacy/src/main/java/io/micrometer/spring/web/MetricsRestTemplateInterceptor.java
@@ -1,12 +1,12 @@
 /**
  * Copyright 2017 Pivotal Software, Inc.
- *
+ * <p>
  * 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
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * 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.
@@ -16,6 +16,8 @@
 package io.micrometer.spring.web;
 
 import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Timer;
+import io.micrometer.core.instrument.stats.hist.Histogram;
 import io.micrometer.spring.MetricsConfigurationProperties;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.client.ClientHttpRequestExecution;
@@ -33,14 +35,14 @@
 public class MetricsRestTemplateInterceptor implements ClientHttpRequestInterceptor {
     private final MeterRegistry meterRegistry;
     private final RestTemplateTagConfigurer tagProvider;
-    private final String metricName;
+    private final MetricsConfigurationProperties properties;
 
     public MetricsRestTemplateInterceptor(MeterRegistry meterRegistry,
                                           RestTemplateTagConfigurer tagProvider,
                                           MetricsConfigurationProperties properties) {
         this.tagProvider = tagProvider;
         this.meterRegistry = meterRegistry;
-        this.metricName = properties.getWeb().getClientRequestsName();
+        this.properties = properties;
     }
 
     @Override
@@ -53,8 +55,15 @@ public ClientHttpResponse intercept(HttpRequest request, byte[] body,
             response = execution.execute(request, body);
             return response;
         } finally {
-            meterRegistry.timer(metricName, tagProvider.clientHttpRequestTags(request, response))
-                    .record(System.nanoTime() - startTime, TimeUnit.NANOSECONDS);
+            Timer.Builder builder = meterRegistry.timerBuilder(properties.getWeb().getClientRequestsName())
+                .tags(tagProvider.clientHttpRequestTags(request, response));
+
+            if(properties.getWeb().getClientRequestPercentiles())
+                builder = builder.histogram(Histogram.percentiles());
+
+            builder
+                .create()
+                .record(System.nanoTime() - startTime, TimeUnit.NANOSECONDS);
         }
     }
 }
diff --git a/...ing-legacy/src/test/java/io/micrometer/spring/web/MetricsRestTemplateInterceptorTest.java b/...ing-legacy/src/test/java/io/micrometer/spring/web/MetricsRestTemplateInterceptorTest.java
@@ -16,6 +16,7 @@
 package io.micrometer.spring.web;
 
 import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import io.micrometer.spring.MetricsConfigurationProperties;
 import org.junit.Test;
@@ -28,6 +29,7 @@
 
 import static io.micrometer.core.instrument.Statistic.Count;
 import static java.util.Collections.singletonList;
+import static java.util.stream.StreamSupport.stream;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -39,9 +41,13 @@ public void interceptRestTemplate() {
         MeterRegistry registry = new SimpleMeterRegistry();
 
         RestTemplate restTemplate = new RestTemplate();
+
+        MetricsConfigurationProperties properties = new MetricsConfigurationProperties();
+        properties.getWeb().setClientRequestPercentiles(true);
+
         restTemplate.setInterceptors(singletonList(new MetricsRestTemplateInterceptor(
                 registry, new RestTemplateTagConfigurer(),
-                new MetricsConfigurationProperties()
+            properties
         )));
 
         MockRestServiceServer mockServer = MockRestServiceServer.createServer(restTemplate);
@@ -55,6 +61,10 @@ registry, new RestTemplateTagConfigurer(),
         assertThat(registry.find("http.client.requests").tags("method", "GET", "uri", "none", "status", "200")
             .value(Count, 1.0).timer()).isPresent();
 
+        assertThat(registry.find("http.client.requests").meters().stream()
+            .flatMap(m -> stream(m.getId().getTags().spliterator(), false))
+            .map(Tag::getKey)).contains("bucket");
+
         assertThat(s).isEqualTo("OK");
 
         mockServer.verify();