diff --git a/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/util/OrderedExecutor.java b/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/util/OrderedExecutor.java
index 982a5d49516..bda846e8dbd 100644
--- a/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/util/OrderedExecutor.java
+++ b/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/util/OrderedExecutor.java
@@ -391,6 +391,10 @@ protected OrderedExecutor(String baseName, int numThreads, ThreadFactory threadF
             ExecutorService thread = createSingleThreadExecutor(
                     new ThreadFactoryBuilder().setNameFormat(name + "-" + getClass().getSimpleName() + "-" + i + "-%d")
                     .setThreadFactory(threadFactory).build());
+            SingleThreadExecutor ste = null;
+            if (thread instanceof SingleThreadExecutor) {
+                ste = (SingleThreadExecutor) thread;
+            }
 
             if (traceTaskExecution || preserveMdcForTaskExecution) {
                 thread = addExecutorDecorators(thread);
@@ -425,48 +429,8 @@ protected OrderedExecutor(String baseName, int numThreads, ThreadFactory threadF
                 throw new RuntimeException("Couldn't start thread " + i, e);
             }
 
-            if (thread instanceof SingleThreadExecutor) {
-                SingleThreadExecutor ste = (SingleThreadExecutor) thread;
-                ste.registerMetrics(statsLogger);
-            } else if (thread instanceof ThreadPoolExecutor) {
-                ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor) thread;
-                // Register gauges
-                statsLogger.scopeLabel("thread", String.valueOf(idx))
-                        .registerGauge(String.format("%s-queue", name), new Gauge<Number>() {
-                            @Override
-                            public Number getDefaultValue() {
-                                return 0;
-                            }
-
-                            @Override
-                            public Number getSample() {
-                                return threadPoolExecutor.getQueue().size();
-                            }
-                        });
-                statsLogger.scopeLabel("thread", String.valueOf(idx))
-                        .registerGauge(String.format("%s-completed-tasks", name), new Gauge<Number>() {
-                            @Override
-                            public Number getDefaultValue() {
-                                return 0;
-                            }
-
-                            @Override
-                            public Number getSample() {
-                                return threadPoolExecutor.getCompletedTaskCount();
-                            }
-                        });
-                statsLogger.scopeLabel("thread", String.valueOf(idx))
-                        .registerGauge(String.format("%s-total-tasks", name), new Gauge<Number>() {
-                            @Override
-                            public Number getDefaultValue() {
-                                return 0;
-                            }
-
-                            @Override
-                            public Number getSample() {
-                                return threadPoolExecutor.getTaskCount();
-                            }
-                        });
+            if (ste != null) {
+                ste.registerMetrics(statsLogger, name, idx);
             }
         }
 
diff --git a/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/util/SingleThreadExecutor.java b/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/util/SingleThreadExecutor.java
index 3c514ebbdaf..5427a815ec0 100644
--- a/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/util/SingleThreadExecutor.java
+++ b/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/util/SingleThreadExecutor.java
@@ -225,10 +225,10 @@ public void execute(Runnable r) {
         }
     }
 
-    public void registerMetrics(StatsLogger statsLogger) {
+    public void registerMetrics(StatsLogger statsLogger, String name, int idx) {
         // Register gauges
-        statsLogger.scopeLabel("thread", runner.getName())
-                .registerGauge("thread_executor_queue", new Gauge<Number>() {
+        statsLogger.scopeLabel("thread", String.valueOf(idx))
+                .registerGauge(String.format("%s-queue", name), new Gauge<Number>() {
                     @Override
                     public Number getDefaultValue() {
                         return 0;
@@ -239,8 +239,8 @@ public Number getSample() {
                         return getQueuedTasksCount();
                     }
                 });
-        statsLogger.scopeLabel("thread", runner.getName())
-                .registerGauge("thread_executor_completed", new Gauge<Number>() {
+        statsLogger.scopeLabel("thread", String.valueOf(idx))
+                .registerGauge(String.format("%s-completed-tasks", name), new Gauge<Number>() {
                     @Override
                     public Number getDefaultValue() {
                         return 0;
@@ -251,20 +251,8 @@ public Number getSample() {
                         return getCompletedTasksCount();
                     }
                 });
-        statsLogger.scopeLabel("thread", runner.getName())
-                .registerGauge("thread_executor_tasks_completed", new Gauge<Number>() {
-                    @Override
-                    public Number getDefaultValue() {
-                        return 0;
-                    }
-
-                    @Override
-                    public Number getSample() {
-                        return getCompletedTasksCount();
-                    }
-                });
-        statsLogger.scopeLabel("thread", runner.getName())
-                .registerGauge("thread_executor_tasks_rejected", new Gauge<Number>() {
+        statsLogger.scopeLabel("thread", String.valueOf(idx))
+                .registerGauge(String.format("%s-rejected-tasks", name), new Gauge<Number>() {
                     @Override
                     public Number getDefaultValue() {
                         return 0;
@@ -275,8 +263,8 @@ public Number getSample() {
                         return getRejectedTasksCount();
                     }
                 });
-        statsLogger.scopeLabel("thread", runner.getName())
-                .registerGauge("thread_executor_tasks_failed", new Gauge<Number>() {
+        statsLogger.scopeLabel("thread", String.valueOf(idx))
+                .registerGauge(String.format("%s-failed-tasks", name), new Gauge<Number>() {
                     @Override
                     public Number getDefaultValue() {
                         return 0;