opendev/gerrit
Code Issues Proposed changes

DropWizardMetricMaker: Improve error messages for invalid arguments

Browse Source 
- When the metric name is already defined, wrap the name in quotes in the
  error message.

- Adjust error messages about invalid counter consistent to use singular
  for consitency with other similar error messages.

Change-Id: If7298b5c6553f54b3422a83c613a888895cd7342
This commit is contained in:
David Pursehouse
2018-05-16 19:28:00 +09:00
parent 594a4632e3
commit 104ea59499
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-server/src/main/java/com/google/gerrit/metrics/dropwizard/DropWizardMetricMaker.java
View File

@@ -151,8 +151,8 @@ public class DropWizardMetricMaker extends MetricMaker {
private static void checkCounterDescription(String name, Description desc) { private static void checkCounterDescription(String name, Description desc) {
checkMetricName(name); checkMetricName(name);
checkArgument(!desc.isConstant(), "counters must not be constant"); checkArgument(!desc.isConstant(), "counter must not be constant");
checkArgument(!desc.isGauge(), "counters must not be gauge"); checkArgument(!desc.isGauge(), "counter must not be gauge");
} }
CounterImpl newCounterImpl(String name, boolean isRate) { CounterImpl newCounterImpl(String name, boolean isRate) {
@@ -326,7 +326,7 @@ public class DropWizardMetricMaker extends MetricMaker {
if (!desc.getAnnotations() if (!desc.getAnnotations()
.get(Description.DESCRIPTION) .get(Description.DESCRIPTION)
.equals(annotations.get(Description.DESCRIPTION))) { .equals(annotations.get(Description.DESCRIPTION))) {
throw new IllegalStateException(String.format("metric %s already defined", name)); throw new IllegalStateException(String.format("metric '%s' already defined", name));
} }
} else { } else {
descriptions.put(name, desc.getAnnotations()); descriptions.put(name, desc.getAnnotations());