opendev/gerrit
Code Issues Proposed changes

WorkQueue: Sanitize metric name when queue is created

Browse Source 
This is a follow up to I3f92b840b and makes sure that whatever metric
is created from WorkQueue will conform to the naming rules.

Change-Id: I332cb50b80bcf80333dad9b4105e599bbcdb01c4
Signed-off-by: Jacek Centkowski <jcentkowski@collab.net>
Signed-off-by: David Pursehouse <dpursehouse@collab.net>
This commit is contained in:
Jacek Centkowski
2018-05-16 12:27:35 +02:00
committed by David Pursehouse
parent d7a17e19a1
commit fccd70ed65
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,8 @@
package com.google.gerrit.server.git; 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.CaseFormat;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
import com.google.gerrit.extensions.events.LifecycleListener; import com.google.gerrit.extensions.events.LifecycleListener;
@@ -284,7 +286,7 @@ public class WorkQueue {
CaseFormat.UPPER_CAMEL.to( CaseFormat.UPPER_CAMEL.to(
CaseFormat.LOWER_UNDERSCORE, CaseFormat.LOWER_UNDERSCORE,
queueName.replaceFirst("SSH", "Ssh").replaceAll("-", "")); 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() { public void unregisterWorkQueue() {