[incubator-druid] branch master updated: Make JvmThreadsMonitor injectable (#6369)

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jihoonson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git


The following commit(s) were added to refs/heads/master by this push:
     new d08c2c5  Make JvmThreadsMonitor injectable (#6369)
d08c2c5 is described below

commit d08c2c5eba637d4288b96bf0be5fdb0a31b77f9e
Author: Jihoon Son <ji...@apache.org>
AuthorDate: Mon Sep 24 20:41:17 2018 -0700

    Make JvmThreadsMonitor injectable (#6369)
---
 .../apache/druid/java/util/metrics/JvmThreadsMonitor.java   |  7 ++++++-
 .../java/org/apache/druid/server/metrics/MetricsModule.java | 13 +++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/java-util/src/main/java/org/apache/druid/java/util/metrics/JvmThreadsMonitor.java b/java-util/src/main/java/org/apache/druid/java/util/metrics/JvmThreadsMonitor.java
index acb7783..eabb3a4 100644
--- a/java-util/src/main/java/org/apache/druid/java/util/metrics/JvmThreadsMonitor.java
+++ b/java-util/src/main/java/org/apache/druid/java/util/metrics/JvmThreadsMonitor.java
@@ -35,10 +35,15 @@ public class JvmThreadsMonitor extends FeedDefiningMonitor
   private int lastLiveThreads = 0;
   private long lastStartedThreads = 0;
 
+  public JvmThreadsMonitor(Map<String, String[]> dimensions)
+  {
+    this(dimensions, DEFAULT_METRICS_FEED);
+  }
+
   public JvmThreadsMonitor(Map<String, String[]> dimensions, String feed)
   {
     super(feed);
-    Preconditions.checkNotNull(dimensions);
+    Preconditions.checkNotNull(dimensions, "dimensions");
     this.dimensions = ImmutableMap.copyOf(dimensions);
   }
 
diff --git a/server/src/main/java/org/apache/druid/server/metrics/MetricsModule.java b/server/src/main/java/org/apache/druid/server/metrics/MetricsModule.java
index 11d8162..7e3a25a 100644
--- a/server/src/main/java/org/apache/druid/server/metrics/MetricsModule.java
+++ b/server/src/main/java/org/apache/druid/server/metrics/MetricsModule.java
@@ -31,6 +31,7 @@ import com.google.inject.name.Names;
 import org.apache.druid.java.util.emitter.service.ServiceEmitter;
 import org.apache.druid.java.util.metrics.JvmCpuMonitor;
 import org.apache.druid.java.util.metrics.JvmMonitor;
+import org.apache.druid.java.util.metrics.JvmThreadsMonitor;
 import org.apache.druid.java.util.metrics.Monitor;
 import org.apache.druid.java.util.metrics.MonitorScheduler;
 import org.apache.druid.java.util.metrics.SysMonitor;
@@ -131,6 +132,18 @@ public class MetricsModule implements Module
 
   @Provides
   @ManageLifecycle
+  public JvmThreadsMonitor getJvmThreadsMonitor(DataSourceTaskIdHolder dataSourceTaskIdHolder)
+  {
+    return new JvmThreadsMonitor(
+        MonitorsConfig.mapOfDatasourceAndTaskID(
+            dataSourceTaskIdHolder.getDataSource(),
+            dataSourceTaskIdHolder.getTaskId()
+        )
+    );
+  }
+
+  @Provides
+  @ManageLifecycle
   public SysMonitor getSysMonitor(
       DataSourceTaskIdHolder dataSourceTaskIdHolder
   )


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org