Skip to content

Fix shadowed prefix variable #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
justinjc merged 1 commit into from
Jan 24, 2023
Merged

Fix shadowed prefix variable #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/jmh/java/com/uber/m3/tally/ScopeImplConcurrent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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());
}
}

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/com/uber/m3/tally/ScopeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down