[CARMEL-7391] Backport Collect and expose metrics in HiveExternalCatalog to monitor the performance of HiveMetastore (apache#110)

Author: colinmjj

core/src/main/scala/org/apache/spark/metrics/source/StaticSources.scala

@@ -104,6 +104,7 @@ object HiveCatalogMetrics extends Source {
       "databaseExists" ::
       "listDatabases" ::
       "tableExists" ::
+      "getTablesByName" ::
       "getTableOption" ::
       "createTable" ::
       "dropTable" ::
@@ -118,7 +119,8 @@ object HiveCatalogMetrics extends Source {
       "getPartitions" ::
       "getPartitionsByFilter" ::
       "listTables" ::
-      "listTables" ::
+      "getTablesByPattern" ::
+      "getTablesByType" ::
       "loadPartition" ::
       "loadTable" ::
       "loadDynamicPartitions" ::
@@ -127,15 +129,28 @@ object HiveCatalogMetrics extends Source {
       "renameFunction" ::
       "alterFunction" ::
       "getFunctionOption" ::
-      "listFunctions" :: Nil
-
-  private lazy val hiveCallCountMetrics =
+      "listFunctions" ::
+      "createRole" ::
+      "dropRole" ::
+      "listRoleNames" ::
+      "grantRole" ::
+      "revokeRole" ::
+      "listRoles" ::
+      "getPrivilegeGrants" ::
+      "listPrivileges" ::
+      "grantPrivileges" ::
+      "revokePrivileges" ::
+      "getPrincipalsInRole" ::
+      "getRoleGrantsForPrincipal" ::
+      Nil
+
+  private val hiveCallCountMetrics =
     hiveCatalogCalls.map { call =>
       val name = call + "Count"
       name -> metricRegistry.counter(name)
     }.toMap
 
-  private lazy val hiveCallDurationMetrics =
+  private val hiveCallDurationMetrics =
     hiveCatalogCalls.map { call =>
       val name = call + "Duration"
       name -> metricRegistry.histogram(name)

sql/hive/src/main/scala/org/apache/spark/sql/hive/client/HiveClientImpl.scala

@@ -1055,7 +1055,7 @@ private[hive] class HiveClientImpl(
 
   override def listFunctions(db: String, pattern: String): Seq[String] = withHiveState( {
     shim.listFunctions(client, db, pattern)
-  }, "getFunctionOption")
+  }, "listFunctions")
 
   override def createRole(role: CatalogPrincipal, grantorName: String): Boolean = withHiveState( {
     msClient.create_role(new Role(role.name, 0, grantorName))
@@ -1094,7 +1094,7 @@ private[hive] class HiveClientImpl(
 
   override def getPrivilegeGrants(privilegeObject: CatalogPrivilegeObject,
       user: String,
-      groupNames: Seq[String]): Seq[CatalogPrivilegeGrant] = withHiveState {
+      groupNames: Seq[String]): Seq[CatalogPrivilegeGrant] = withHiveState ({
     val ret = msClient.get_privilege_set(
       toHivePrivilegeObject(privilegeObject), user, groupNames.asJava)
 
@@ -1132,7 +1132,7 @@ private[hive] class HiveClientImpl(
     }
 
     userPrivilegeGrants ++ rolePrivilegeGrants ++ groupPrivilegeGrants
-  }
+  }, "getPrivilegeGrants")
 
   override def listPrivileges(
       principal: Option[CatalogPrincipal],