From af9f144e1de6617d27e91e7a226fb626cd3e0ae9 Mon Sep 17 00:00:00 2001 From: Ruth Linehan Date: Tue, 4 Oct 2016 11:42:27 -0700 Subject: [PATCH] (TK-402) Add note about precedence of metric-prefix and server-id options Add note to clojure client docs about precendence of `metric-prefix` option if both it and `server-id` are specified as client options. Also remove some empty lines. --- doc/clojure-client.md | 4 +++- .../com/puppetlabs/http/client/impl/metrics/TimerUtils.java | 1 - src/java/com/puppetlabs/http/client/metrics/Metrics.java | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/clojure-client.md b/doc/clojure-client.md index cb2984e..6186f00 100644 --- a/doc/clojure-client.md +++ b/doc/clojure-client.md @@ -42,7 +42,9 @@ The following are the base set of options supported by the `create-client` funct from. If specified, used in the namespace for metrics: `puppetlabs..http-client.experimental`. * `:metric-prefix`: a string for the prefix for metrics. If specified, metric - namespace is `.http-client.experimental`. + namespace is `.http-client.experimental`. If both + `metric-prefix` and `server-id` are specified, `metric-prefix` takes + precendence. ### SSL Options diff --git a/src/java/com/puppetlabs/http/client/impl/metrics/TimerUtils.java b/src/java/com/puppetlabs/http/client/impl/metrics/TimerUtils.java index e782baa..e7e449a 100644 --- a/src/java/com/puppetlabs/http/client/impl/metrics/TimerUtils.java +++ b/src/java/com/puppetlabs/http/client/impl/metrics/TimerUtils.java @@ -109,5 +109,4 @@ public class TimerUtils { return null; } } - } diff --git a/src/java/com/puppetlabs/http/client/metrics/Metrics.java b/src/java/com/puppetlabs/http/client/metrics/Metrics.java index 5edd401..965e1fc 100644 --- a/src/java/com/puppetlabs/http/client/metrics/Metrics.java +++ b/src/java/com/puppetlabs/http/client/metrics/Metrics.java @@ -47,8 +47,6 @@ public class Metrics { public enum MetricType { FULL_RESPONSE } public enum MetricCategory { URL, URL_AND_METHOD, METRIC_ID } - - public static String urlToMetricUrl(String uriString) throws URISyntaxException { final URI uri = new URI(uriString); final URI convertedUri = new URI(uri.getScheme(), null, uri.getHost(),