From fe270ddd54c0f4c2d20edc74fa1e890080bd0630 Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Fri, 18 May 2018 19:58:48 +0900
Subject: [PATCH] WorkQueue.Executor#buildMetrics: Remove MetricMaker parameter

It's not necessary to pass a MetricMaker; the member variable
can be used.

Change-Id: I466ac5e9a6d18d14f91d6bb81448755b1dfdf7fc
---
 .../com/google/gerrit/server/git/WorkQueue.java  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java
index ffa22940f1..3b8e4c441d 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java
@@ -208,7 +208,7 @@ public class WorkQueue {
               );
       queueName = prefix;
       try {
-        buildMetrics(queueName, metrics);
+        buildMetrics(queueName);
       } catch (IllegalArgumentException e) {
         if (e.getMessage().contains("already")) {
           log.warn("Not creating metrics for queue '{}': already exists", queueName);
@@ -218,8 +218,8 @@ public class WorkQueue {
       }
     }
 
-    private void buildMetrics(String queueName, MetricMaker metric) {
-      metric.newCallbackMetric(
+    private void buildMetrics(String queueName) {
+      metrics.newCallbackMetric(
           getMetricName(queueName, "max_pool_size"),
           Long.class,
           new Description("Maximum allowed number of threads in the pool")
@@ -231,7 +231,7 @@ public class WorkQueue {
               return (long) getMaximumPoolSize();
             }
           });
-      metric.newCallbackMetric(
+      metrics.newCallbackMetric(
           getMetricName(queueName, "pool_size"),
           Long.class,
           new Description("Current number of threads in the pool").setGauge().setUnit("threads"),
@@ -241,7 +241,7 @@ public class WorkQueue {
               return (long) getPoolSize();
             }
           });
-      metric.newCallbackMetric(
+      metrics.newCallbackMetric(
           getMetricName(queueName, "active_threads"),
           Long.class,
           new Description("Number number of threads that are actively executing tasks")
@@ -253,7 +253,7 @@ public class WorkQueue {
               return (long) getActiveCount();
             }
           });
-      metric.newCallbackMetric(
+      metrics.newCallbackMetric(
           getMetricName(queueName, "scheduled_tasks"),
           Integer.class,
           new Description("Number of scheduled tasks in the queue").setGauge().setUnit("tasks"),
@@ -263,7 +263,7 @@ public class WorkQueue {
               return getQueue().size();
             }
           });
-      metric.newCallbackMetric(
+      metrics.newCallbackMetric(
           getMetricName(queueName, "total_scheduled_tasks_count"),
           Long.class,
           new Description("Total number of tasks that have been scheduled for execution")
@@ -275,7 +275,7 @@ public class WorkQueue {
               return (long) getTaskCount();
             }
           });
-      metric.newCallbackMetric(
+      metrics.newCallbackMetric(
           getMetricName(queueName, "total_completed_tasks_count"),
           Long.class,
           new Description("Total number of tasks that have completed execution")