From 0f8add8a60d159c2933a8fccffd83a64eb73eadc Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Wed, 14 Aug 2019 12:24:03 +0900
Subject: [PATCH] HADOOP-16495. Fix invalid metric types in
 PrometheusMetricsSink (#1244)

---
 .../metrics2/sink/PrometheusMetricsSink.java  |  5 +++--
 .../sink/TestPrometheusMetricsSink.java       | 22 +++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/PrometheusMetricsSink.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/PrometheusMetricsSink.java
index 291cfe3295..b1e8da8583 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/PrometheusMetricsSink.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/PrometheusMetricsSink.java
@@ -46,6 +46,7 @@ public class PrometheusMetricsSink implements MetricsSink {
 
   private static final Pattern SPLIT_PATTERN =
       Pattern.compile("(?<!(^|[A-Z_]))(?=[A-Z])|(?<!^)(?=[A-Z][a-z])");
+  private static final Pattern DELIMITERS = Pattern.compile("[^a-zA-Z0-9]+");
 
   public PrometheusMetricsSink() {
   }
@@ -92,9 +93,9 @@ public String prometheusName(String recordName,
                                String metricName) {
     String baseName = StringUtils.capitalize(recordName)
         + StringUtils.capitalize(metricName);
-    baseName = baseName.replace('-', '_');
     String[] parts = SPLIT_PATTERN.split(baseName);
-    return String.join("_", parts).toLowerCase();
+    String joined =  String.join("_", parts).toLowerCase();
+    return DELIMITERS.matcher(joined).replaceAll("_");
   }
 
   @Override
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestPrometheusMetricsSink.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestPrometheusMetricsSink.java
index f9649a6bfd..3fc4aa4cc3 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestPrometheusMetricsSink.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestPrometheusMetricsSink.java
@@ -99,6 +99,28 @@ public void testNamingPipeline() {
         sink.prometheusName(recordName, metricName));
   }
 
+  @Test
+  public void testNamingPeriods() {
+    PrometheusMetricsSink sink = new PrometheusMetricsSink();
+
+    String recordName = "org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetImpl";
+    String metricName = "DfsUsed";
+    Assert.assertEquals(
+        "org_apache_hadoop_hdfs_server_datanode_fsdataset_impl_fs_dataset_impl_dfs_used",
+        sink.prometheusName(recordName, metricName));
+  }
+
+  @Test
+  public void testNamingWhitespaces() {
+    PrometheusMetricsSink sink = new PrometheusMetricsSink();
+
+    String recordName = "JvmMetrics";
+    String metricName = "GcCount" + "G1 Old Generation";
+    Assert.assertEquals(
+        "jvm_metrics_gc_count_g1_old_generation",
+        sink.prometheusName(recordName, metricName));
+  }
+
   /**
    * Example metric pojo.
    */