differentiate LB metrics between ZK and xDS flows

linkedin · Jul 28, 2023 · 7c3074f · 7c3074f
1 parent 08723de
commit 7c3074f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,9 @@ and what APIs have changed, if applicable.
 
 ## [Unreleased]
 
+## [29.44.0] - 2023-07-28
+- differentiate LB metrics between ZK and xDS 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.44.0...master
+[29.44.0]: https://github.com/linkedin/rest.li/compare/v29.43.10...v29.44.0
 [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
@@ -129,17 +129,17 @@ public void onServicePropertiesRemoval(LoadBalancerStateItem<ServiceProperties>
 
       private String getClusterInfoJmxName(String clusterName)
       {
-        return String.format("%s-ClusterInfo", clusterName);
+        return String.format("%s-%s-ClusterInfo", _prefix, clusterName);
       }
 
       private String getServicePropertiesJmxName(String serviceName)
       {
-        return String.format("%s-ServiceProperties", serviceName);
+        return String.format("%s-%s-ServiceProperties", _prefix, serviceName);
       }
 
       private String getLoadBalancerStrategyJmxName(String serviceName, String scheme)
       {
-        return serviceName + "-" + scheme + "-LoadBalancerStrategy";
+        return String.format("%s-%s-%s-LoadBalancerStrategy", _prefix, serviceName, scheme);
       }
     });
   }

diff --git a/d2/src/test/java/com/linkedin/d2/jmx/D2ClientJmxManagerTest.java b/d2/src/test/java/com/linkedin/d2/jmx/D2ClientJmxManagerTest.java
@@ -117,7 +117,7 @@ public void testSetSimpleLBStateListenerUpdateServiceProperties()
     _simpleLoadBalancerStateListenerCaptor.getValue().onServicePropertiesUpdate(_servicePropertiesLBState);
     Assert.assertEquals(
         _registerObjectNameCaptor.getValue(),
-        "S_Foo-ServiceProperties"
+        "Foo-S_Foo-ServiceProperties"
     );
     Assert.assertEquals(
         _servicePropertiesArgumentCaptor.getValue(),
@@ -137,7 +137,7 @@ public void testSetSimpleLBStateListenerUpdateClusterInfo()
     _simpleLoadBalancerStateListenerCaptor.getValue().onClusterInfoUpdate(_clusterInfoItem);
     Assert.assertEquals(
         _registerObjectNameCaptor.getValue(),
-        "C_Foo-ClusterInfo"
+        "Foo-C_Foo-ClusterInfo"
     );
     Assert.assertEquals(
         _clusterInfoArgumentCaptor.getValue(),
@@ -159,7 +159,7 @@ public void testSetSimpleLBStateListenerRemoveClusterInfo()
     _simpleLoadBalancerStateListenerCaptor.getValue().onClusterInfoRemoval(_clusterInfoItem);
     Assert.assertEquals(
         _unregisteredObjectNameCaptor.getValue(),
-        _clusterInfoItem.getClusterPropertiesItem().getProperty().getClusterName() + "-ClusterInfo");
+        "Foo-" + _clusterInfoItem.getClusterPropertiesItem().getProperty().getClusterName() + "-ClusterInfo");
   }
 
   @Test
@@ -176,6 +176,6 @@ public void testSetSimpleLBStateListenerRemoveServiceProperties()
     _simpleLoadBalancerStateListenerCaptor.getValue().onServicePropertiesRemoval(_servicePropertiesLBState);
     Assert.assertEquals(
         _unregisteredObjectNameCaptor.getValue(),
-        _servicePropertiesLBState.getProperty().getServiceName() + "-ServiceProperties");
+        "Foo-" + _servicePropertiesLBState.getProperty().getServiceName() + "-ServiceProperties");
   }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=29.43.10
+version=29.44.0
 group=com.linkedin.pegasus
 org.gradle.configureondemand=true
 org.gradle.parallel=true