cache publishers for commands by both command group key + command key

so that they are unique. This fixes a bug whereby if two Hystrix commands have the same command key, although different group keys, only one of them will be reported.
Netflix · Jan 14, 2019 · e7ff313 · e7ff313
1 parent 809104c
commit e7ff313
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...re/src/main/java/com/netflix/hystrix/strategy/metrics/HystrixMetricsPublisherFactory.java b/...re/src/main/java/com/netflix/hystrix/strategy/metrics/HystrixMetricsPublisherFactory.java
@@ -102,17 +102,18 @@ public static void reset() {
 
     /* package */ HystrixMetricsPublisherCommand getPublisherForCommand(HystrixCommandKey commandKey, HystrixCommandGroupKey commandOwner, HystrixCommandMetrics metrics, HystrixCircuitBreaker circuitBreaker, HystrixCommandProperties properties) {
         // attempt to retrieve from cache first
-        HystrixMetricsPublisherCommand publisher = commandPublishers.get(commandKey.name());
+        String cacheKey = commandOwner.name() + commandKey.name();
+        HystrixMetricsPublisherCommand publisher = commandPublishers.get(cacheKey);
         if (publisher != null) {
             return publisher;
         } else {
             synchronized (this) {
-                HystrixMetricsPublisherCommand existingPublisher = commandPublishers.get(commandKey.name());
+                HystrixMetricsPublisherCommand existingPublisher = commandPublishers.get(cacheKey);
                 if (existingPublisher != null) {
                     return existingPublisher;
                 } else {
                     HystrixMetricsPublisherCommand newPublisher = HystrixPlugins.getInstance().getMetricsPublisher().getMetricsPublisherForCommand(commandKey, commandOwner, metrics, circuitBreaker, properties);
-                    commandPublishers.putIfAbsent(commandKey.name(), newPublisher);
+                    commandPublishers.putIfAbsent(cacheKey, newPublisher);
                     newPublisher.initialize();
                     return newPublisher;
                 }