Differentiate LB metrics between ZK and xDS read flows

linkedin · Jul 28, 2023 · 828b52a · 828b52a
1 parent 08723de
commit 828b52a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,9 @@ and what APIs have changed, if applicable.
 
 ## [Unreleased]
 
+## [29.43.11] - 2023-07-28
+- differentiate LB metrics between ZK and xDS read flows.
+
 ## [29.43.10] - 2023-07-24
 - set log level of dual read mode changes to info.
 
@@ -5509,7 +5512,8 @@ patch operations can re-use these classes for generating patch messages.
 
 ## [0.14.1]
 
-[Unreleased]: https://github.com/linkedin/rest.li/compare/v29.43.10...master
+[Unreleased]: https://github.com/linkedin/rest.li/compare/v29.43.11...master
+[29.43.11]: https://github.com/linkedin/rest.li/compare/v29.43.10...v29.43.11
 [29.43.10]: https://github.com/linkedin/rest.li/compare/v29.43.9...v29.43.10
 [29.43.9]: https://github.com/linkedin/rest.li/compare/v29.43.8...v29.43.9
 [29.43.8]: https://github.com/linkedin/rest.li/compare/v29.43.7...v29.43.8

diff --git a/d2/src/main/java/com/linkedin/d2/jmx/D2ClientJmxManager.java b/d2/src/main/java/com/linkedin/d2/jmx/D2ClientJmxManager.java
@@ -127,19 +127,23 @@ public void onServicePropertiesRemoval(LoadBalancerStateItem<ServiceProperties>
         }
       }
 
+      private String getPrefixForLBJmxNames() {
+        return _prefix.contains("-xDS") ? String.format("%s-", _prefix) : "";
+      }
+
       private String getClusterInfoJmxName(String clusterName)
       {
-        return String.format("%s-ClusterInfo", clusterName);
+        return String.format("%s%s-ClusterInfo", getPrefixForLBJmxNames(), clusterName);
       }
 
       private String getServicePropertiesJmxName(String serviceName)
       {
-        return String.format("%s-ServiceProperties", serviceName);
+        return String.format("%s%s-ServiceProperties", getPrefixForLBJmxNames(), serviceName);
       }
 
       private String getLoadBalancerStrategyJmxName(String serviceName, String scheme)
       {
-        return serviceName + "-" + scheme + "-LoadBalancerStrategy";
+        return String.format("%s%s-%s-LoadBalancerStrategy", getPrefixForLBJmxNames(), serviceName, scheme);
       }
     });
   }

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=29.43.10
+version=29.43.11
 group=com.linkedin.pegasus
 org.gradle.configureondemand=true
 org.gradle.parallel=true