Merge changes I74a0c8b8,I332cb50b,Ic0074b53 into stable-2.14

* changes:
  WorkQueue: Don't fail when queue metric already exists
  WorkQueue: Sanitize metric name when queue is created
  DropWizardMetricMaker: Introduce method to sanitize metric name

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

@@ -344,6 +344,25 @@ public class DropWizardMetricMaker extends MetricMaker {
         METRIC_NAME_PATTERN.pattern());
   }
 
+  public static String sanitizeMetricName(String input) {
+    if (METRIC_NAME_PATTERN.matcher(input).matches()) {
+      return input;
+    }
+
+    String first = input.substring(0, 1).replaceFirst("[^\\w-]", "_");
+    if (input.length() == 1) {
+      return first;
+    }
+
+    String result = first + input.substring(1).replaceAll("/[/]+", "/").replaceAll("[^\\w-/]", "_");
+
+    if (result.endsWith("/")) {
+      result = result.substring(0, result.length() - 1);
+    }
+
+    return result;
+  }
+
   static String name(Description.FieldOrdering ordering, String codeName, String fieldValues) {
     if (ordering == FieldOrdering.PREFIX_FIELDS_BASENAME) {
       int s = codeName.lastIndexOf('/');

gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java

@@ -14,6 +14,8 @@
 
 package com.google.gerrit.server.git;
 
+import static com.google.gerrit.metrics.dropwizard.DropWizardMetricMaker.sanitizeMetricName;
+
 import com.google.common.base.CaseFormat;
 import com.google.common.base.Supplier;
 import com.google.gerrit.extensions.events.LifecycleListener;
@@ -205,7 +207,15 @@ public class WorkQueue {
               corePoolSize + 4 // concurrency level
               );
       queueName = prefix;
-      buildMetrics(queueName, metrics);
+      try {
+        buildMetrics(queueName, metrics);
+      } catch (IllegalArgumentException e) {
+        if (e.getMessage().contains("already")) {
+          log.warn("Not creating metrics for queue '{}': already exists", queueName);
+        } else {
+          throw e;
+        }
+      }
     }
 
     private void buildMetrics(String queueName, MetricMaker metric) {
@@ -284,7 +294,7 @@ public class WorkQueue {
           CaseFormat.UPPER_CAMEL.to(
               CaseFormat.LOWER_UNDERSCORE,
               queueName.replaceFirst("SSH", "Ssh").replaceAll("-", ""));
-      return String.format("queue/%s/%s", name, metricName);
+      return sanitizeMetricName(String.format("queue/%s/%s", name, metricName));
     }
 
     public void unregisterWorkQueue() {

gerrit-server/src/test/java/com/google/gerrit/metrics/dropwizard/DropWizardMetricMakerTest.java

@@ -0,0 +1,42 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// 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 com.google.gerrit.metrics.dropwizard;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.gerrit.metrics.dropwizard.DropWizardMetricMaker.sanitizeMetricName;
+
+import org.junit.Test;
+
+public class DropWizardMetricMakerTest {
+  @Test
+  public void shouldSanitizeUnwantedChars() throws Exception {
+    assertThat(sanitizeMetricName("very+confusing$long#metric@net/name^1"))
+        .isEqualTo("very_confusing_long_metric_net/name_1");
+    assertThat(sanitizeMetricName("/metric/submetric")).isEqualTo("_metric/submetric");
+  }
+
+  @Test
+  public void shouldReduceConsecutiveSlashesToOne() throws Exception {
+    assertThat(sanitizeMetricName("/metric//submetric1///submetric2/submetric3"))
+        .isEqualTo("_metric/submetric1/submetric2/submetric3");
+  }
+
+  @Test
+  public void shouldNotFinishWithSlash() throws Exception {
+    assertThat(sanitizeMetricName("metric/")).isEqualTo("metric");
+    assertThat(sanitizeMetricName("metric//")).isEqualTo("metric");
+    assertThat(sanitizeMetricName("metric/submetric/")).isEqualTo("metric/submetric");
+  }
+}