Skip to content

Commit d7ff4a9

Browse files
Vladimir Kotalahornace
authored andcommitted
use tags for metrics and use dotted naming
1 parent 5389f55 commit d7ff4a9

File tree

2 files changed

+24
-12
lines changed

2 files changed

+24
-12
lines changed

opengrok-indexer/src/main/java/org/opengrok/indexer/authorization/AuthorizationFramework.java

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,27 @@ public final class AuthorizationFramework extends PluginFramework<IAuthorization
5555

5656
private static final Logger LOGGER = LoggerFactory.getLogger(AuthorizationFramework.class);
5757

58-
private final Counter authStackReloadCounter = Metrics.getRegistry().counter("authorization_stack_reload");
59-
private final Counter authCacheHits = Metrics.getRegistry().counter("authorization_cache_hits");
60-
private final Counter authCacheMisses = Metrics.getRegistry().counter("authorization_cache_misses");
61-
private final Counter authSessionsInvalidated = Metrics.getRegistry().counter("authorization_sessions_invalidated");
62-
63-
private final Timer authTimer = Metrics.getRegistry().timer("authorization");
64-
private final Timer authPositiveTimer = Metrics.getRegistry().timer("authorization_positive");
65-
private final Timer authNegativeTimer = Metrics.getRegistry().timer("authorization_negative");
58+
private final Counter authStackReloadCounter = Metrics.getRegistry().
59+
counter("authorization.stack.reload");
60+
private final Counter authCacheHits = Counter.builder("authorization.cache").
61+
description("authorization cache hits").
62+
tag("what", "hits").
63+
register(Metrics.getRegistry());
64+
private final Counter authCacheMisses = Counter.builder("authorization.cache").
65+
description("authorization cache misses").
66+
tag("what", "misses").
67+
register(Metrics.getRegistry());
68+
private final Counter authSessionsInvalidated = Metrics.getRegistry().
69+
counter("authorization.sessions.invalidated");
70+
71+
private final Timer authTimerPositive = Timer.builder("authorization.latency").
72+
description("authorization latency").
73+
tag("outcome", "positive").
74+
register(Metrics.getRegistry());
75+
private final Timer authTimerNegative = Timer.builder("authorization.latency").
76+
description("authorization latency").
77+
tag("outcome", "negative").
78+
register(Metrics.getRegistry());
6679

6780
/**
6881
* Stack of available plugins/stacks in the order of the execution.
@@ -537,11 +550,10 @@ private boolean checkAll(HttpServletRequest request, String cache, Nameable enti
537550
}
538551

539552
// Update the timers.
540-
authTimer.record(duration);
541553
if (overallDecision) {
542-
authPositiveTimer.record(duration);
554+
authTimerPositive.record(duration);
543555
} else {
544-
authNegativeTimer.record(duration);
556+
authTimerNegative.record(duration);
545557
}
546558

547559
m.put(entity.getName(), overallDecision);

opengrok-indexer/src/test/java/org/opengrok/indexer/authorization/AuthorizationFrameworkReloadTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public void run() {
146146
}
147147

148148
// Double check that at least one reload() was done.
149-
long reloads = (long) Metrics.getRegistry().counter("authorization_stack_reload").count();
149+
long reloads = (long) Metrics.getRegistry().counter("authorization.stack.reload").count();
150150
assertTrue(reloads > 0);
151151
}
152152

0 commit comments

Comments
 (0)