opendev/gerrit
Code Issues Proposed changes

Merge "AsyncReceiveCommits: add metric for total push latency"

Browse Source
This commit is contained in:
Patrick Hiesel 2019-03-14 15:41:24 +00:00 committed by Gerrit Code Review
commit 5782cd6350
2 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/metrics.txt
View File

@ -23,10 +23,12 @@ that ultimately timed out
=== Pushes === Pushes
* `receivecommits/changes`: histogram of number of changes processed * `receivecommits/changes`: histogram of number of changes processed
in a single upload, split up by update type (new change created, in a single upload, split up by update type (change created/updated,
existing changed updated, change autoclosed). change autoclosed).
* `receivecommits/latency`: latency per change for processing a push, * `receivecommits/latency`: latency per change for processing a push,
split up by update type (create+replace, and autoclose) split up by update type (create+replace, and autoclose)
* `receivecommits/push_latency`: total latency for processing a push,
split up by update type (create+replace, autoclose, normal)
* `receivecommits/timeout`: number of timeouts during push processing. * `receivecommits/timeout`: number of timeouts during push processing.
=== Process === Process

59
java/com/google/gerrit/server/git/receive/AsyncReceiveCommits.java
View File

@ -175,29 +175,45 @@ public class AsyncReceiveCommits implements PreReceiveHook {
} }
} }
private enum PushType {
CREATE_REPLACE,
NORMAL,
AUTOCLOSE,
};
@Singleton @Singleton
private static class Metrics { private static class Metrics {
private final Histogram1<ResultChangeIds.Key> changes; private final Histogram1<PushType> changes;
private final Timer1<String> latencyPerChange; private final Timer1<PushType> latencyPerChange;
private final Timer1<PushType> latencyPerPush;
private final Counter0 timeouts; private final Counter0 timeouts;
@Inject @Inject
Metrics(MetricMaker metricMaker) { Metrics(MetricMaker metricMaker) {
changes = changes =
metricMaker.newHistogram( metricMaker.newHistogram(
"receivecommits/changes", "receivecommits/changes_per_push",
new Description("number of changes uploaded in a single push.").setCumulative(), new Description("number of changes uploaded in a single push.").setCumulative(),
Field.ofEnum( Field.ofEnum(PushType.class, "type", "type of push (create/replace, autoclose)"));
ResultChangeIds.Key.class,
"type",
"type of update (replace, create, autoclose)"));
latencyPerChange = latencyPerChange =
metricMaker.newTimer( metricMaker.newTimer(
"receivecommits/latency", "receivecommits/latency_per_push_per_change",
new Description("average delay per updated change") new Description(
"Processing delay per push divided by the number of changes in said push. "
+ "(Only includes pushes which contain changes.)")
.setUnit(Units.MILLISECONDS) .setUnit(Units.MILLISECONDS)
.setCumulative(), .setCumulative(),
Field.ofString("type", "type of update (create/replace, autoclose)")); Field.ofEnum(PushType.class, "type", "type of push (create/replace, autoclose)"));
latencyPerPush =
metricMaker.newTimer(
"receivecommits/latency_per_push",
new Description("processing delay for a processing single push")
.setUnit(Units.MILLISECONDS)
.setCumulative(),
Field.ofEnum(
PushType.class, "type", "type of push (create/replace, autoclose, normal)"));
timeouts = timeouts =
metricMaker.newCounter( metricMaker.newCounter(
@ -342,24 +358,29 @@ public class AsyncReceiveCommits implements PreReceiveHook {
long deltaNanos = System.nanoTime() - startNanos; long deltaNanos = System.nanoTime() - startNanos;
int totalChanges = 0; int totalChanges = 0;
PushType pushType;
if (resultChangeIds.isMagicPush()) { if (resultChangeIds.isMagicPush()) {
pushType = PushType.CREATE_REPLACE;
List<Change.Id> created = resultChangeIds.get(ResultChangeIds.Key.CREATED); List<Change.Id> created = resultChangeIds.get(ResultChangeIds.Key.CREATED);
metrics.changes.record(ResultChangeIds.Key.CREATED, created.size());
List<Change.Id> replaced = resultChangeIds.get(ResultChangeIds.Key.REPLACED); List<Change.Id> replaced = resultChangeIds.get(ResultChangeIds.Key.REPLACED);
metrics.changes.record(ResultChangeIds.Key.REPLACED, replaced.size()); metrics.changes.record(pushType, created.size() + replaced.size());
totalChanges += replaced.size() + created.size(); totalChanges = replaced.size() + created.size();
} else { } else {
List<Change.Id> autoclosed = resultChangeIds.get(ResultChangeIds.Key.AUTOCLOSED); List<Change.Id> autoclosed = resultChangeIds.get(ResultChangeIds.Key.AUTOCLOSED);
metrics.changes.record(ResultChangeIds.Key.AUTOCLOSED, autoclosed.size()); if (!autoclosed.isEmpty()) {
totalChanges += autoclosed.size(); pushType = PushType.AUTOCLOSE;
metrics.changes.record(pushType, autoclosed.size());
totalChanges = autoclosed.size();
} else {
pushType = PushType.NORMAL;
}
} }
if (totalChanges > 0) { if (totalChanges > 0) {
metrics.latencyPerChange.record( metrics.latencyPerChange.record(pushType, deltaNanos / totalChanges, NANOSECONDS);
resultChangeIds.isMagicPush() ? "CREATE_REPLACE" : ResultChangeIds.Key.AUTOCLOSED.name(),
deltaNanos / totalChanges,
NANOSECONDS);
} }
metrics.latencyPerPush.record(pushType, deltaNanos, NANOSECONDS);
} }
/** Returns the Change.Ids that were processed in onPreReceive */ /** Returns the Change.Ids that were processed in onPreReceive */