opendev/gerrit
Code Issues Proposed changes

Merge "TracingHook: Simplify parsing of trace option"

Browse Source
This commit is contained in:
David Ostrovsky
2019-10-11 13:34:14 +00:00
committed by Gerrit Code Review
parent 72fdddf8ab 31056c007d
commit 097fc86bde
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
java/com/google/gerrit/server/git/TracingHook.java
View File

@@ -16,9 +16,6 @@ package com.google.gerrit.server.git;
import static com.google.common.base.Preconditions.checkState;
import com.google.common.collect.Iterables;
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.ListMultimap;
import com.google.gerrit.server.logging.TraceContext;
import java.util.List;
import java.util.Optional;
@@ -79,21 +76,20 @@ public class TracingHook implements ProtocolV2Hook, AutoCloseable {
return Optional.empty();
}
ListMultimap<String, String> serverOptions = LinkedListMultimap.create();
for (String option : serverOptionList) {
int e = option.indexOf('=');
if (e > 0) {
serverOptions.put(option.substring(0, e), option.substring(e + 1));
} else {
serverOptions.put(option, "");
}
Optional<String> traceOption =
serverOptionList.stream().filter(o -> o.startsWith("trace")).findAny();
if (!traceOption.isPresent()) {
return Optional.empty();
}
List<String> traceValues = serverOptions.get("trace");
if (!traceValues.isEmpty()) {
return Optional.of(Iterables.getLast(traceValues));
int e = traceOption.get().indexOf('=');
if (e > 0) {
// trace option was specified with trace ID: "--trace=<trace-ID>"
return Optional.of(traceOption.get().substring(e + 1));
}
return Optional.empty();
// trace option was specified without trace ID: "--trace",
// return an empty string so that a trace ID is generated
return Optional.of("");
}
}