Get rid of metric name parsing

Author: mqliang

pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java

@@ -19,6 +19,7 @@
 package org.apache.pinot.broker.broker.helix;
 
 import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.util.ArrayList;
@@ -309,12 +310,13 @@ public void start()
         _brokerConf.getProperty(Broker.CONFIG_OF_ENABLE_TABLE_LEVEL_METRICS, Broker.DEFAULT_ENABLE_TABLE_LEVEL_METRICS),
         _brokerConf.getProperty(Broker.CONFIG_OF_ALLOWED_TABLES_FOR_EMITTING_METRICS, Collections.emptyList()));
     _brokerMetrics.initializeGlobalMeters();
-    _brokerMetrics.setValueOfGlobalGauge(BrokerGauge.VERSION, PinotVersion.VERSION_METRIC_NAME, 1);
+    _brokerMetrics.setValueOfGlobalGauge(BrokerGauge.VERSION, PinotVersion.VERSION_METRIC_NAME,
+        1, ImmutableMap.of());
     _brokerMetrics.setValueOfGlobalGauge(BrokerGauge.ZK_JUTE_MAX_BUFFER,
         Integer.getInteger(ZkSystemPropertyKeys.JUTE_MAXBUFFER, 0xfffff));
     _brokerMetrics.setValueOfGlobalGauge(BrokerGauge.ADAPTIVE_SERVER_SELECTOR_TYPE,
         _brokerConf.getProperty(Broker.AdaptiveServerSelector.CONFIG_OF_TYPE,
-            Broker.AdaptiveServerSelector.DEFAULT_TYPE), 1);
+            Broker.AdaptiveServerSelector.DEFAULT_TYPE), 1, ImmutableMap.of());
     BrokerMetrics.register(_brokerMetrics);
     // Set up request handling classes
     _serverRoutingStatsManager = new ServerRoutingStatsManager(_brokerConf, _brokerMetrics);

pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseSingleStageBrokerRequestHandler.java

@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import java.net.URI;
 import java.util.ArrayList;
@@ -65,6 +66,7 @@
 import org.apache.pinot.common.metrics.BrokerMetrics;
 import org.apache.pinot.common.metrics.BrokerQueryPhase;
 import org.apache.pinot.common.metrics.BrokerTimer;
+import org.apache.pinot.common.metrics.MetricAttributeConstants;
 import org.apache.pinot.common.request.BrokerRequest;
 import org.apache.pinot.common.request.DataSource;
 import org.apache.pinot.common.request.Expression;
@@ -862,8 +864,13 @@ protected BrokerResponse doHandleRequest(long requestId, String query, SqlNodeAn
     }
 
     for (int pool : brokerResponse.getPools()) {
+      String poolTag = BrokerMetrics.getTagForPreferredPool(sqlNodeAndOptions.getOptions());
+      String poolId = String.valueOf(pool);
       _brokerMetrics.addMeteredValue(BrokerMeter.POOL_QUERIES, 1,
-          BrokerMetrics.getTagForPreferredPool(sqlNodeAndOptions.getOptions()), String.valueOf(pool));
+          ImmutableList.of(poolTag, poolId),
+          ImmutableMap.of(MetricAttributeConstants.POOL_TAG, poolTag,
+              MetricAttributeConstants.POOL_ID, poolId)
+      );
     }
 
     brokerResponse.setRLSFiltersApplied(rlsFiltersApplied.get());

pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/BalancedInstanceSelector.java

@@ -18,6 +18,8 @@
  */
 package org.apache.pinot.broker.routing.instanceselector;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import java.time.Clock;
 import java.util.HashMap;
 import java.util.List;
@@ -30,6 +32,7 @@
 import org.apache.pinot.broker.routing.adaptiveserverselector.ServerSelectionContext;
 import org.apache.pinot.common.metrics.BrokerMeter;
 import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.common.metrics.MetricAttributeConstants;
 import org.apache.pinot.common.utils.HashUtil;
 
 /// Instance selector to balance the number of segments served by each selected server instance.
@@ -96,8 +99,13 @@ Pair<Map<String, String>, Map<String, String>> select(List<String> segments, int
     }
 
     for (Map.Entry<Integer, Integer> entry : poolToSegmentCount.entrySet()) {
-      _brokerMetrics.addMeteredValue(BrokerMeter.POOL_SEG_QUERIES, entry.getValue(),
-        BrokerMetrics.getTagForPreferredPool(queryOptions), String.valueOf(entry.getKey()));
+      String poolTag = BrokerMetrics.getTagForPreferredPool(queryOptions);
+      String poolID = String.valueOf(entry.getKey());
+      _brokerMetrics.addMeteredValue(
+          BrokerMeter.POOL_SEG_QUERIES, entry.getValue(),
+          ImmutableList.of(poolTag, poolID),
+          ImmutableMap.of(MetricAttributeConstants.POOL_TAG, poolTag, MetricAttributeConstants.POOL_ID, poolID)
+      );
     }
     return Pair.of(segmentToSelectedInstanceMap, optionalSegmentToInstanceMap);
   }

pinot-broker/src/main/java/org/apache/pinot/broker/routing/instanceselector/ReplicaGroupInstanceSelector.java

@@ -18,6 +18,8 @@
  */
 package org.apache.pinot.broker.routing.instanceselector;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import java.time.Clock;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -33,6 +35,7 @@
 import org.apache.pinot.broker.routing.adaptiveserverselector.ServerSelectionContext;
 import org.apache.pinot.common.metrics.BrokerMeter;
 import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.common.metrics.MetricAttributeConstants;
 import org.apache.pinot.common.utils.HashUtil;
 import org.apache.pinot.common.utils.config.QueryOptionsUtils;
 
@@ -146,8 +149,11 @@ private Pair<Map<String, String>, Map<String, String>> selectServers(List<String
       replicaOffset = (replicaOffset + 1) % numReplicaGroups;
     }
     for (Map.Entry<Integer, Integer> entry : poolToSegmentCount.entrySet()) {
+      String poolTag = BrokerMetrics.getTagForPreferredPool(ctx.getQueryOptions());
+      String poolId = String.valueOf(entry.getKey());
       _brokerMetrics.addMeteredValue(BrokerMeter.POOL_SEG_QUERIES, entry.getValue(),
-          BrokerMetrics.getTagForPreferredPool(ctx.getQueryOptions()), String.valueOf(entry.getKey()));
+          ImmutableList.of(poolTag, poolId),
+          ImmutableMap.of(MetricAttributeConstants.POOL_TAG, poolTag, MetricAttributeConstants.POOL_ID, poolId));
     }
     return Pair.of(segmentToSelectedInstanceMap, optionalSegmentToInstanceMap);
   }