diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java index f3b909ca44..19da432bb8 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java +++ b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java @@ -602,6 +602,8 @@ public static ConfVars getMetaConf(String name) { "alongside the dropped table data. This ensures that the metadata will be cleaned up along with the dropped table data."), METRICS_ENABLED("metastore.metrics.enabled", "hive.metastore.metrics.enabled", false, "Enable metrics on the metastore."), + METRICS_HADOOP2_COMPONENT_NAME("metastore.metrics.hadoop2.component", "hive.service.metrics.hadoop2.component", "hivemetastore", + "Component name to provide to Hadoop2 Metrics system."), METRICS_JSON_FILE_INTERVAL("metastore.metrics.file.frequency", "hive.service.metrics.file.frequency", 1, TimeUnit.MINUTES, "For json metric reporter, the frequency of updating JSON metrics file."), diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java index b081026467..e4866a6767 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java +++ b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java @@ -220,11 +220,12 @@ private Metrics(Configuration conf) { reporters.add(reporter); scheduledReporters.add(reporter); } else if (reporterName.startsWith("hadoop") || reporterName.endsWith("metrics2reporter")) { + String applicationName = MetastoreConf.getVar(conf, MetastoreConf.ConfVars.METRICS_HADOOP2_COMPONENT_NAME); HadoopMetrics2Reporter reporter = HadoopMetrics2Reporter.forRegistry(registry) .convertRatesTo(TimeUnit.SECONDS) .convertDurationsTo(TimeUnit.MILLISECONDS) - .build(DefaultMetricsSystem.initialize("metastore"), "metastore", "Runtime metadata" + - " catalog", "general-metadata"); + .build(DefaultMetricsSystem.initialize(applicationName), applicationName, "Runtime metadata" + + " catalog", "General"); reporter.start(1, TimeUnit.MINUTES); reporters.add(reporter); scheduledReporters.add(reporter);