diff options
author | Arne H Juul <arnej27959@users.noreply.github.com> | 2017-09-13 15:17:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-13 15:17:16 +0200 |
commit | 4ae255a8a59ed3277c19502449a8c1c5aed1803f (patch) | |
tree | a695d629e3ca3631c22ef7a8896cba3548010850 /simplemetrics | |
parent | f2bd97d4658bb95821aabe7b304a5bb8d401946f (diff) | |
parent | 20e0f554af91af0410fe81868896f5cdf94ffdc7 (diff) |
Merge pull request #3382 from vespa-engine/bratseth/support-error-removal
Bratseth/support error removal
Diffstat (limited to 'simplemetrics')
-rw-r--r-- | simplemetrics/src/main/java/com/yahoo/metrics/simple/UntypedMetric.java | 45 | ||||
-rw-r--r-- | simplemetrics/src/main/java/com/yahoo/metrics/simple/package-info.java | 2 |
2 files changed, 25 insertions, 22 deletions
diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/UntypedMetric.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/UntypedMetric.java index 731ef633f94..3a9f71b932c 100644 --- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/UntypedMetric.java +++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/UntypedMetric.java @@ -11,9 +11,10 @@ import com.yahoo.log.LogLevel; * A gauge or a counter or... who knows? The class for storing a metric when the * metric has not been declared. * - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> + * @author Steinar Knutsen */ public class UntypedMetric { + private static final Logger log = Logger.getLogger(UntypedMetric.class.getName()); private long count = 0L; @@ -27,26 +28,6 @@ public class UntypedMetric { public enum AssumedType { NONE, GAUGE, COUNTER }; - public String toString() { - StringBuilder buf = new StringBuilder(); - buf.append(this.getClass().getName()).append(": "); - buf.append("outputFormat=").append(outputFormat).append(", "); - if (count > 0 && outputFormat == AssumedType.GAUGE) { - buf.append("max=").append(max).append(", "); - buf.append("min=").append(min).append(", "); - buf.append("sum=").append(sum).append(", "); - } - if (histogram != null) { - buf.append("histogram=").append(histogram).append(", "); - } - if (metricSettings != null) { - buf.append("metricSettings=").append(metricSettings).append(", "); - } - buf.append("current=").append(current).append(", "); - buf.append("count=").append(count); - return buf.toString(); - } - UntypedMetric(MetricSettings metricSettings) { this.metricSettings = metricSettings; if (metricSettings == null || !metricSettings.isHistogram()) { @@ -128,4 +109,26 @@ public class UntypedMetric { public DoubleHistogram getHistogram() { return histogram; } + + @Override + public String toString() { + StringBuilder buf = new StringBuilder(); + buf.append(this.getClass().getName()).append(": "); + buf.append("outputFormat=").append(outputFormat).append(", "); + if (count > 0 && outputFormat == AssumedType.GAUGE) { + buf.append("max=").append(max).append(", "); + buf.append("min=").append(min).append(", "); + buf.append("sum=").append(sum).append(", "); + } + if (histogram != null) { + buf.append("histogram=").append(histogram).append(", "); + } + if (metricSettings != null) { + buf.append("metricSettings=").append(metricSettings).append(", "); + } + buf.append("current=").append(current).append(", "); + buf.append("count=").append(count); + return buf.toString(); + } + } diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/package-info.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/package-info.java index efa01121e04..9306c7c59db 100644 --- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/package-info.java +++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/package-info.java @@ -23,7 +23,7 @@ * {@link com.yahoo.metrics.simple.MetricUpdater}. * </p> * - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> + * @author Steinar Knutsen */ @PublicApi @ExportPackage |