diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactory.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactory.java index 4ad9f33..d6b1392 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactory.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactory.java @@ -47,9 +47,9 @@ * @return The Camel Cased context name. */ protected static String createContextName(String serverName) { - if (serverName.contains("HMaster")) { + if (serverName.contains("HMaster") || serverName.contains("master")) { return "Master"; - } else if (serverName.contains("HRegion")) { + } else if (serverName.contains("HRegion") || serverName.contains("regionserver")) { return "RegionServer"; } return "IPC"; diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.java index df40e68..cca53e0 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.java @@ -46,7 +46,7 @@ if (source == null) { //Create the source. source = new MetricsHBaseServerSourceImpl( - METRICS_NAME, + context, METRICS_DESCRIPTION, context.toLowerCase(), context + METRICS_JMX_CONTEXT_SUFFIX, wrapper);