commit eb67d035725ce2848873437196d57d6f8f9dd201
author Edwin Kempin <ekempin@google.com> Fri Jun 14 09:58:27 2019 +0200
committer Edwin Kempin <ekempin@google.com> Fri Jun 14 12:32:44 2019 +0200
tree 26b726e4942263893ae2702ef7b7687b8e454960
parent 0ce6a487b2c01ebe624cecdda3d7b1946bec5372

Ensure that groups are always logged when request is traced

IdentifiedUser already logs the groups when they are computed for the
first time, but for some requests (e.g. git push) this happens before
the trace context is opened and hence the trace doesn't contain the
groups. To ensure that groups are always logged when a request is
traced, explicitly log the groups from within the trace context.

Also change the log level of the log statement in ReceiveCommits that
logs the calling user from finest to fine to be consistent with all the
other debug logs in this class.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I96f9a8e8e51ea6e1d993e201bf7b2994fae342b6

java/com/google/gerrit/httpd/restapi/RestApiServlet.java

diff --git a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
index efdf5ba..45e4749 100644
--- a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
+++ b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
@@ -310,7 +310,10 @@
           logger.atFinest().log(
               "Received REST request: %s %s (parameters: %s)",
               req.getMethod(), req.getRequestURI(), getParameterNames(req));
-          logger.atFinest().log("Calling user: %s", globals.currentUser.get().getLoggableName());
+          logger.atFinest().log(
+              "Calling user: %s (groups = %s)",
+              globals.currentUser.get().getLoggableName(),
+              globals.currentUser.get().getEffectiveGroups().getKnownGroups());
 
           if (isCorsPreflight(req)) {
             doCorsPreflight(req, res);

java/com/google/gerrit/server/git/receive/ReceiveCommits.java

diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
index 98ed97a..f69e364 100644
--- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
+++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
@@ -545,7 +545,9 @@
   // Process as many commands as possible, but may leave some commands in state NOT_ATTEMPTED.
   private void processCommandsUnsafe(
       Collection<ReceiveCommand> commands, MultiProgressMonitor progress) {
-    logger.atFinest().log("Calling user: %s", user.getLoggableName());
+    logger.atFine().log(
+        "Calling user: %s (groups = %s)",
+        user.getLoggableName(), user.getEffectiveGroups().getKnownGroups());
 
     if (!projectState.getProject().getState().permitsWrite()) {
       for (ReceiveCommand cmd : commands) {