From ceed9529876526e2c30383891bea92cba1a53e58 Mon Sep 17 00:00:00 2001
From: Cristian Velazquez <cdvr@uber.com>
Date: Fri, 20 Jan 2023 17:31:34 +0000
Subject: [PATCH] Fix shadowed prefix variable

---
 core/src/jmh/java/com/uber/m3/tally/ScopeImplConcurrent.java | 4 ++--
 core/src/main/java/com/uber/m3/tally/ScopeImpl.java          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/jmh/java/com/uber/m3/tally/ScopeImplConcurrent.java b/core/src/jmh/java/com/uber/m3/tally/ScopeImplConcurrent.java
index 9022950..46b671a 100644
--- a/core/src/jmh/java/com/uber/m3/tally/ScopeImplConcurrent.java
+++ b/core/src/jmh/java/com/uber/m3/tally/ScopeImplConcurrent.java
@@ -21,7 +21,7 @@ public void hotkeyLockContention(Blackhole bh, BenchmarkState state) {
         for (int i = 0; i < 10000; i++) {
 
             for (String key : KEYS) {
-                Scope scope = state.scope.computeSubscopeIfAbsent(key, common);
+                Scope scope = state.scope.computeSubscopeIfAbsent("prefix", key, common);
                 assert scope != null;
                 bh.consume(scope);
             }
@@ -41,7 +41,7 @@ public void setup() {
                             .reportEvery(Duration.MAX_VALUE);
 
             for (String key : KEYS) {
-                scope.computeSubscopeIfAbsent(key, new ImmutableMap.Builder<String, String>().build());
+                scope.computeSubscopeIfAbsent("prefix", key, new ImmutableMap.Builder<String, String>().build());
             }
         }
 
diff --git a/core/src/main/java/com/uber/m3/tally/ScopeImpl.java b/core/src/main/java/com/uber/m3/tally/ScopeImpl.java
index 6c35e38..25157fd 100644
--- a/core/src/main/java/com/uber/m3/tally/ScopeImpl.java
+++ b/core/src/main/java/com/uber/m3/tally/ScopeImpl.java
@@ -281,11 +281,11 @@ private Scope subScopeHelper(String prefix, Map<String, String> tags) {
 
         String key = keyForPrefixedStringMap(prefix, mergedTags);
 
-        return computeSubscopeIfAbsent(key, mergedTags);
+        return computeSubscopeIfAbsent(prefix, key, mergedTags);
     }
 
     // This method must only be called on unit tests or benchmarks
-    protected Scope computeSubscopeIfAbsent(String key, ImmutableMap<String, String> mergedTags) {
+    protected Scope computeSubscopeIfAbsent(String prefix, String key, ImmutableMap<String, String> mergedTags) {
         Scope scope = registry.subscopes.get(key);
         if (scope != null) {
             return scope;