HBASE-29972 Expose HBase version in metrics

hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSource.java

@@ -71,6 +71,8 @@ public interface MetricsMasterSource extends BaseSource {
   String CLUSTER_READ_REQUESTS_NAME = "clusterReadRequests";
   String CLUSTER_WRITE_REQUESTS_NAME = "clusterWriteRequests";
   String OLD_WAL_DIR_SIZE_NAME = "oldWALsDirSize";
+  String HBASE_VERSION_NAME = "hbaseVersion";
+
   String MASTER_ACTIVE_TIME_DESC = "Master Active Time";
   String MASTER_START_TIME_DESC = "Master Start Time";
   String MASTER_FINISHED_INITIALIZATION_TIME_DESC =
@@ -93,6 +95,7 @@ public interface MetricsMasterSource extends BaseSource {
 
   String SERVER_CRASH_METRIC_PREFIX = "serverCrash";
   String OLD_WAL_DIR_SIZE_DESC = "size of old WALs directory in bytes";
+  String HBASE_VERSION_DESC = "HBase Version";
 
   /**
    * Increment the number of requests the cluster has seen.

hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceImpl.java

@@ -131,7 +131,8 @@ public void getMetrics(MetricsCollector metricsCollector, boolean all) {
         .tag(Interns.info(IS_ACTIVE_MASTER_NAME, IS_ACTIVE_MASTER_DESC),
           String.valueOf(masterWrapper.getIsActiveMaster()))
         .addGauge(Interns.info(OLD_WAL_DIR_SIZE_NAME, OLD_WAL_DIR_SIZE_DESC),
-          masterWrapper.getOldWALsDirSize());
+          masterWrapper.getOldWALsDirSize())
+        .tag(Interns.info(HBASE_VERSION_NAME, HBASE_VERSION_DESC), masterWrapper.getSoftwareVersion());
     }
 
     metricsRegistry.snapshot(metricsRecordBuilder, all);

hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapper.java

@@ -158,4 +158,9 @@ public interface MetricsMasterWrapper {
    * Get the size of old WALs directory in bytes.
    */
   long getOldWALsDirSize();
+
+  /*
+   * Get the HBase version.
+   */
+  String getSoftwareVersion();
 }

hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java

@@ -673,4 +673,6 @@ public interface MetricsRegionServerSource extends BaseSource, JvmPauseMonitorSo
     "Count of slow/connect error DataNodes excluded during WAL write operation";
   String EXCLUDE_DATA_NODES_DETAILS = "excludedDataNodesDetails";
   String EXCLUDE_DATA_NODES_DETAILS_DESC = "Excluded DataNodes info";
+  String HBASE_VERSION_NAME = "hbaseVersion";
+  String HBASE_VERSION_DESC = "The version of HBase";
 }

hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java

@@ -502,7 +502,8 @@ public void getMetrics(MetricsCollector metricsCollector, boolean all) {
         .tag(Interns.info(ZOOKEEPER_QUORUM_NAME, ZOOKEEPER_QUORUM_DESC),
           rsWrap.getZookeeperQuorum())
         .tag(Interns.info(SERVER_NAME_NAME, SERVER_NAME_DESC), rsWrap.getServerName())
-        .tag(Interns.info(CLUSTER_ID_NAME, CLUSTER_ID_DESC), rsWrap.getClusterId());
+        .tag(Interns.info(CLUSTER_ID_NAME, CLUSTER_ID_DESC), rsWrap.getClusterId())
+        .tag(Interns.info(HBASE_VERSION_NAME, HBASE_VERSION_DESC), rsWrap.getSoftwareVersion());
       if (!rsWrap.getWALExcludeDNs().isEmpty()) {
         metricsRecordBuilder.tag(
           Interns.info(EXCLUDE_DATA_NODES_DETAILS, EXCLUDE_DATA_NODES_DETAILS_DESC),

hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java

@@ -688,4 +688,6 @@ public interface MetricsRegionServerWrapper {
   long getByteBuffAllocatorUsedBufferCount();
 
   int getActiveScanners();
+
+  String getSoftwareVersion();
 }

hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapperImpl.java

@@ -32,6 +32,7 @@
 import org.apache.hadoop.hbase.quotas.QuotaObserverChore;
 import org.apache.hadoop.hbase.quotas.SpaceQuotaSnapshot;
 import org.apache.hadoop.hbase.util.PairOfSameType;
+import org.apache.hadoop.hbase.util.VersionInfo;
 import org.apache.hadoop.hbase.zookeeper.ZKWatcher;
 import org.apache.yetus.audience.InterfaceAudience;
 
@@ -246,4 +247,9 @@ public long getOldWALsDirSize() {
     }
     return master.getMasterWalManager().getOldWALsDirSize();
   }
+
+  @Override public String getSoftwareVersion() {
+    return VersionInfo.getVersion() + ", r" + VersionInfo.getRevision();
+  }
+
 }

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java

@@ -44,6 +44,7 @@
 import org.apache.hadoop.hbase.regionserver.wal.MetricsWALSource;
 import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
 import org.apache.hadoop.hbase.util.FSUtils;
+import org.apache.hadoop.hbase.util.VersionInfo;
 import org.apache.hadoop.hbase.wal.WALProvider;
 import org.apache.hadoop.hbase.zookeeper.ZKWatcher;
 import org.apache.hadoop.hdfs.DFSHedgedReadMetrics;
@@ -776,6 +777,11 @@ public int getActiveScanners() {
     return regionServer.getRpcServices().getScannersCount();
   }
 
+  @Override
+  public String getSoftwareVersion() {
+    return VersionInfo.getVersion() + ", r" + VersionInfo.getRevision();
+  }
+
   private static final class RegionMetricAggregate {
     private long numStores = 0;
     private long numStoreFiles = 0;

hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java

@@ -33,6 +33,7 @@
 import org.apache.hadoop.hbase.testclassification.MasterTests;
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
+import org.apache.hadoop.hbase.util.VersionInfo;
 import org.apache.zookeeper.KeeperException;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -180,6 +181,8 @@ public void testDefaultMasterMetrics() throws Exception {
     metricsHelper.assertTag("serverName", master.getServerName().toString(), masterSource);
     metricsHelper.assertTag("clusterId", master.getClusterId(), masterSource);
     metricsHelper.assertTag("zookeeperQuorum", master.getZooKeeper().getQuorum(), masterSource);
+    metricsHelper.assertTag("hbaseVersion",
+      VersionInfo.getVersion() + ", r" + VersionInfo.getRevision(), masterSource);
 
     metricsHelper.assertCounter(MetricsMasterSource.SERVER_CRASH_METRIC_PREFIX + "SubmittedCount",
       0, masterSource);

hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetricsWrapper.java

@@ -21,6 +21,7 @@
 import static org.junit.Assert.fail;
 
 import java.io.IOException;
+import org.apache.hadoop.hbase.util.VersionInfo;
 import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.List;
 import org.apache.hadoop.hbase.HBaseClassTestRule;
@@ -86,7 +87,10 @@ public void testInfo() throws IOException {
     assertEquals(master.getServerManager().getOnlineServersList().size(),
       info.getNumRegionServers());
     assertEquals(master.getMasterWalManager().getOldWALsDirSize(), info.getOldWALsDirSize());
+    assertEquals(VersionInfo.getVersion() + ", r" + VersionInfo.getRevision(),
+      info.getSoftwareVersion());
     int regionServerCount = NUM_RS;
+
     assertEquals(regionServerCount, info.getNumRegionServers());
 
     String zkServers = info.getZookeeperQuorum();

hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperStub.java

@@ -786,4 +786,9 @@ public long getAverageRegionSize() {
   public long getRpcFullScanRequestsCount() {
     return 10;
   }
+
+  @Override
+  public String getSoftwareVersion() {
+    return "version";
+  }
 }

hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionServer.java

@@ -80,6 +80,7 @@ public void testWrapperSource() {
     HELPER.assertTag("serverName", "test", serverSource);
     HELPER.assertTag("clusterId", "tClusterId", serverSource);
     HELPER.assertTag("zookeeperQuorum", "zk", serverSource);
+    HELPER.assertTag("hbaseVersion", "version", serverSource);
     HELPER.assertGauge("regionServerStartTime", 100, serverSource);
     HELPER.assertGauge("regionCount", 101, serverSource);
     HELPER.assertGauge("storeCount", 2, serverSource);