diff --git a/src/main/java/com/uber/cadence/worker/WorkerFactory.java b/src/main/java/com/uber/cadence/worker/WorkerFactory.java index 9fb41d6c7..9a3d7d5c0 100644 --- a/src/main/java/com/uber/cadence/worker/WorkerFactory.java +++ b/src/main/java/com/uber/cadence/worker/WorkerFactory.java @@ -76,6 +76,7 @@ public static WorkerFactory newInstance( "attempted to %s while in %s state. Acceptable States: %s"; private static final Logger log = LoggerFactory.getLogger(WorkerFactory.class); private static final String STICKY_TASK_LIST_PREFIX = "sticky"; + private static final String STICKY_TASK_LIST_METRIC_TAG = "__" + STICKY_TASK_LIST_PREFIX + "__"; private static final String POLL_THREAD_NAME = "Sticky Task Poller"; /** @@ -113,7 +114,7 @@ public WorkerFactory(WorkflowClient workflowClient, WorkerFactoryOptions factory MetricsTag.DOMAIN, workflowClient.getOptions().getDomain(), MetricsTag.TASK_LIST, - getStickyTaskListName())); + STICKY_TASK_LIST_METRIC_TAG)); this.cache = new DeciderCache(this.factoryOptions.getCacheMaximumSize(), stickyScope); dispatcher = new PollDecisionTaskDispatcher(workflowClient.getService()); diff --git a/src/test/java/com/uber/cadence/worker/StickyWorkerTest.java b/src/test/java/com/uber/cadence/worker/StickyWorkerTest.java index 8a2ecbf5e..afc54a7a6 100644 --- a/src/test/java/com/uber/cadence/worker/StickyWorkerTest.java +++ b/src/test/java/com/uber/cadence/worker/StickyWorkerTest.java @@ -74,6 +74,7 @@ public class StickyWorkerTest { private static final boolean useDockerService = Boolean.parseBoolean(System.getenv("USE_DOCKER_SERVICE")); + private static final String STICKY_TASK_LIST_METRIC_TAG = "__sticky__"; @Parameterized.Parameter public boolean useExternalService; @@ -151,7 +152,7 @@ public void whenStickyIsEnabledThenTheWorkflowIsCachedSignals() throws Exception Map tags = new ImmutableMap.Builder(2) .put(MetricsTag.DOMAIN, DOMAIN) - .put(MetricsTag.TASK_LIST, factory.getStickyTaskListName()) + .put(MetricsTag.TASK_LIST, STICKY_TASK_LIST_METRIC_TAG) .build(); Thread.sleep(600); verify(reporter, atLeastOnce()) @@ -265,7 +266,7 @@ public void whenStickyIsEnabledThenTheWorkflowIsCachedActivities() throws Except Map tags = new ImmutableMap.Builder(2) .put(MetricsTag.DOMAIN, DOMAIN) - .put(MetricsTag.TASK_LIST, factory.getStickyTaskListName()) + .put(MetricsTag.TASK_LIST, STICKY_TASK_LIST_METRIC_TAG) .build(); verify(reporter, atLeastOnce()) .reportCounter(eq(MetricsType.STICKY_CACHE_HIT), eq(tags), anyInt()); @@ -314,7 +315,7 @@ public void whenStickyIsEnabledThenTheWorkflowIsCachedChildWorkflows() throws Ex Map tags = new ImmutableMap.Builder(2) .put(MetricsTag.DOMAIN, DOMAIN) - .put(MetricsTag.TASK_LIST, factory.getStickyTaskListName()) + .put(MetricsTag.TASK_LIST, STICKY_TASK_LIST_METRIC_TAG) .build(); verify(reporter, atLeastOnce()) .reportCounter(eq(MetricsType.STICKY_CACHE_HIT), eq(tags), anyInt()); @@ -370,7 +371,7 @@ public void whenStickyIsEnabledThenTheWorkflowIsCachedMutableSideEffect() throws Map tags = new ImmutableMap.Builder(2) .put(MetricsTag.DOMAIN, DOMAIN) - .put(MetricsTag.TASK_LIST, factory.getStickyTaskListName()) + .put(MetricsTag.TASK_LIST, STICKY_TASK_LIST_METRIC_TAG) .build(); verify(reporter, atLeastOnce()) .reportCounter(eq(MetricsType.STICKY_CACHE_HIT), eq(tags), anyInt());