From e16a50599c34d8b022472018a48856935d697b57 Mon Sep 17 00:00:00 2001
From: Paladox none <thomasmulhall410@yahoo.com>
Date: Wed, 28 Mar 2018 14:39:53 +0000
Subject: [PATCH 01/11] Fix groups to prevent javascript errors with url

If you used the singleusergroup plugin, it would create
a group for the individual account. It won't include the url in the rest
api as you should not be able to view this group from the ui.

So when going to /admin/groups/1,members it would hide the group.

I am fixing this by doing "return;" which means it won't continue
to execute and get the url. As the url will throw an error as it would be undefined.

Bug: Issue 8644
Change-Id: I16feae0992e4976c48cc2faa0e471a3123414a9b
(cherry picked from commit dd9b6cab2b790b7ae54c70027b99ee5a9a8bd896)
---
 .../admin/gr-group-members/gr-group-members.html  | 11 ++++++++---
 .../admin/gr-group-members/gr-group-members.js    |  2 ++
 .../gr-group-members/gr-group-members_test.html   | 15 +++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.html b/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.html
index a76904e5f4..a1a5e4e493 100644
--- a/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.html
+++ b/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.html
@@ -156,10 +156,15 @@ limitations under the License.
                 <template is="dom-repeat" items="[[_includedGroups]]">
                   <tr>
                     <td class="nameColumn">
-                      <a href$="[[_computeGroupUrl(item.url)]]"
-                          rel="noopener">
+                      <template is="dom-if" if="[[item.url]]">
+                        <a href$="[[_computeGroupUrl(item.url)]]"
+                            rel="noopener">
+                          [[item.name]]
+                        </a>
+                      </template>
+                      <template is="dom-if" if="[[!item.url]]">
                         [[item.name]]
-                      </a>
+                      </template>
                     </td>
                     <td>[[item.description]]</td>
                     <td class="deleteColumn">
diff --git a/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.js b/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.js
index 14ffa8b123..1ef358573e 100644
--- a/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.js
+++ b/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.js
@@ -116,6 +116,8 @@
     },
 
     _computeGroupUrl(url) {
+      if (!url) { return; }
+
       const r = new RegExp(URL_REGEX, 'i');
       if (r.test(url)) {
         return url;
diff --git a/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members_test.html b/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members_test.html
index 9d7a797579..170390bfcd 100644
--- a/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members_test.html
+++ b/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members_test.html
@@ -320,5 +320,20 @@ limitations under the License.
       assert.equal(element._itemId, 'testId3');
       assert.equal(element._itemName, 'testName3');
     });
+
+    test('_computeGroupUrl', () => {
+      assert.isUndefined(element._computeGroupUrl(undefined));
+
+      assert.isUndefined(element._computeGroupUrl(false));
+
+      let url = '#/admin/groups/uuid-529b3c2605bb1029c8146f9de4a91c776fe64498';
+      assert.equal(element._computeGroupUrl(url),
+          'https://test/site/admin/groups/' +
+          'uuid-529b3c2605bb1029c8146f9de4a91c776fe64498');
+
+      url = 'https://gerrit.local/admin/groups/' +
+          'uuid-529b3c2605bb1029c8146f9de4a91c776fe64498';
+      assert.equal(element._computeGroupUrl(url), url);
+    });
   });
 </script>

From e1b6b3db95e3859ac6b5f8350753257b1393ea49 Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Mon, 25 Mar 2019 15:35:18 +0100
Subject: [PATCH 02/11] RestApiException: Fix Javadoc

Change-Id: I63f5de3d78aac5a709fa353984fe6e4c9f3a15e8
---
 java/com/google/gerrit/extensions/restapi/RestApiException.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/com/google/gerrit/extensions/restapi/RestApiException.java b/java/com/google/gerrit/extensions/restapi/RestApiException.java
index 28398a412c..b09723e8df 100644
--- a/java/com/google/gerrit/extensions/restapi/RestApiException.java
+++ b/java/com/google/gerrit/extensions/restapi/RestApiException.java
@@ -14,7 +14,7 @@
 
 package com.google.gerrit.extensions.restapi;
 
-/** Root exception type for JSON API failures. */
+/** Root exception type for REST API failures. */
 public class RestApiException extends Exception {
   private static final long serialVersionUID = 1L;
   private CacheControl caching = CacheControl.NONE;

From 1a08ef5892087be89a25dbdf526338466da296f2 Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Mon, 25 Mar 2019 16:07:32 +0100
Subject: [PATCH 03/11] ExternalIdNotes: Only log 'reading external ID note
 map' when actually doing so

Change-Id: Ifbd1939bfc59b4830519c665f2a8a1c41087989c
---
 .../server/account/externalids/ExternalIdNotes.java      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/java/com/google/gerrit/server/account/externalids/ExternalIdNotes.java b/java/com/google/gerrit/server/account/externalids/ExternalIdNotes.java
index 76e7f81ad7..41d02f507b 100644
--- a/java/com/google/gerrit/server/account/externalids/ExternalIdNotes.java
+++ b/java/com/google/gerrit/server/account/externalids/ExternalIdNotes.java
@@ -656,9 +656,12 @@ public class ExternalIdNotes extends VersionedMetaData {
 
   @Override
   protected void onLoad() throws IOException, ConfigInvalidException {
-    logger.atFine().log("Reading external ID note map");
-
-    noteMap = revision != null ? NoteMap.read(reader, revision) : NoteMap.newEmptyMap();
+    if (revision != null) {
+      logger.atFine().log("Reading external ID note map");
+      noteMap = NoteMap.read(reader, revision);
+    } else {
+      noteMap = NoteMap.newEmptyMap();
+    }
 
     if (afterReadRevision != null) {
       afterReadRevision.run();

From 0a0575b52eb81992f244fd0095a5168144e2f871 Mon Sep 17 00:00:00 2001
From: Robert Coleman <robert@robertjcoleman.com>
Date: Tue, 26 Mar 2019 00:18:27 -0700
Subject: [PATCH 04/11] Fixing Linux Kernel URL in Why Code Review Doc

Removing the trailing forward slash of the Linux Kernel URL that is
in the Code Review section of the "Why Code Review?" document.

Change-Id: I4e3c463787080b44f418c19184a4bb2a08f2d8ff
---
 Documentation/intro-rockstar.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/intro-rockstar.txt b/Documentation/intro-rockstar.txt
index b60a91fc73..0b679502a6 100644
--- a/Documentation/intro-rockstar.txt
+++ b/Documentation/intro-rockstar.txt
@@ -60,7 +60,7 @@ older (imperfect) revision is not lost. It can be found via the `git reflog`.
 At least two well-known open source projects insist on these practices:
 
 * link:http://git-scm.com/[Git]
-* link:http://www.kernel.org/category/about.html/[Linux Kernel]
+* link:http://www.kernel.org/category/about.html[Linux Kernel]
 
 However, contributors to these projects don’t refine and polish their changes
 in private until they’re perfect. Instead, polishing code is part of a review

From 58c07cff52941939a0f8f74168ef8738688d51ee Mon Sep 17 00:00:00 2001
From: Jonathan Nieder <jrn@google.com>
Date: Tue, 26 Mar 2019 18:52:22 -0700
Subject: [PATCH 05/11] Correct URL of change message requests in docs

The collection of change messages is attached to a "messages" path
component, not "message".

Change-Id: Iedb6313aca3c670998c1d11ba078c5a12c0cfcea
---
 Documentation/rest-api-changes.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation/rest-api-changes.txt b/Documentation/rest-api-changes.txt
index d500480a89..c5d6e5026f 100644
--- a/Documentation/rest-api-changes.txt
+++ b/Documentation/rest-api-changes.txt
@@ -2454,7 +2454,7 @@ As response a list of link:#change-message-info[ChangeMessageInfo] entities is r
 Retrieves a change message including link:#detailed-accounts[detailed account information].
 
 --
-'GET /changes/link:#change-id[\{change-id\}]/message/link:#change-message-id[\{change-message-id\}]'
+'GET /changes/link:#change-id[\{change-id\}]/messages/link:#change-message-id[\{change-message-id\}]'
 --
 
 As response a link:#change-message-info[ChangeMessageInfo] entity is returned.
@@ -2483,8 +2483,8 @@ As response a link:#change-message-info[ChangeMessageInfo] entity is returned.
 [[delete-change-message]]
 === Delete Change Message
 --
-'DELETE /changes/link:#change-id[\{change-id\}]/message/link:#change-message-id[\{change-message-id\}]' +
-'POST /changes/link:#change-id[\{change-id\}]//message/link:#change-message-id[\{change-message-id\}]/delete'
+'DELETE /changes/link:#change-id[\{change-id\}]/messages/link:#change-message-id[\{change-message-id\}]' +
+'POST /changes/link:#change-id[\{change-id\}]/messages/link:#change-message-id[\{change-message-id\}]/delete'
 --
 
 Deletes a change message by replacing the change message with a new message,
@@ -2500,14 +2500,14 @@ To delete a change message, send a DELETE request:
 
 .Request
 ----
-  DELETE /changes/myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940/message/aaee04dcb46bafc8be24d8aa70b3b1beb7df5780 HTTP/1.0
+  DELETE /changes/myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940/messages/aaee04dcb46bafc8be24d8aa70b3b1beb7df5780 HTTP/1.0
 ----
 
 To provide a reason for the deletion, use a POST request:
 
 .Request
 ----
-  POST /changes/myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940/message/aaee04dcb46bafc8be24d8aa70b3b1beb7df5780/delete HTTP/1.0
+  POST /changes/myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940/messages/aaee04dcb46bafc8be24d8aa70b3b1beb7df5780/delete HTTP/1.0
   Content-Type: application/json; charset=UTF-8
 
   {

From 76ce13e37ba5ff8c3763ee4a81e36cedcd36a74a Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Tue, 26 Mar 2019 11:52:43 +0100
Subject: [PATCH 06/11] TestAccount: Add implementation of toString

Change-Id: Ife09db9569cc6b8e1a3e453f6c416f205380aaa4
---
 java/com/google/gerrit/acceptance/TestAccount.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/java/com/google/gerrit/acceptance/TestAccount.java b/java/com/google/gerrit/acceptance/TestAccount.java
index 5ce44ffda2..ac197bdb8a 100644
--- a/java/com/google/gerrit/acceptance/TestAccount.java
+++ b/java/com/google/gerrit/acceptance/TestAccount.java
@@ -16,6 +16,7 @@ package com.google.gerrit.acceptance;
 
 import static java.util.stream.Collectors.toList;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.net.InetAddresses;
 import com.google.gerrit.mail.Address;
 import com.google.gerrit.reviewdb.client.Account;
@@ -71,4 +72,9 @@ public class TestAccount {
   public Account.Id getId() {
     return id;
   }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this).add("id", id).add("username", username).toString();
+  }
 }

From b17dc99a5f2bd254719684dd4dbdad24cae3954c Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Tue, 26 Mar 2019 13:52:19 +0100
Subject: [PATCH 07/11] TraceContext: Support fourth format parameter

Change-Id: I9bf46888455667e57f65d225450862ef660c4617
---
 .../gerrit/server/logging/TraceContext.java   | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/java/com/google/gerrit/server/logging/TraceContext.java b/java/com/google/gerrit/server/logging/TraceContext.java
index ded34d03e8..5c0406ddd1 100644
--- a/java/com/google/gerrit/server/logging/TraceContext.java
+++ b/java/com/google/gerrit/server/logging/TraceContext.java
@@ -206,6 +206,23 @@ public class TraceContext implements AutoCloseable {
     return new TraceTimer(format, arg1, arg2, arg3);
   }
 
+  /**
+   * Opens a new timer that logs the time for an operation if request tracing is enabled.
+   *
+   * <p>If request tracing is not enabled this is a no-op.
+   *
+   * @param format the message format string
+   * @param arg1 first argument for the message
+   * @param arg2 second argument for the message
+   * @param arg3 third argument for the message
+   * @param arg4 fourth argument for the message
+   * @return the trace timer
+   */
+  public static TraceTimer newTimer(
+      String format, Object arg1, Object arg2, Object arg3, Object arg4) {
+    return new TraceTimer(format, arg1, arg2, arg3, arg4);
+  }
+
   public static class TraceTimer implements AutoCloseable {
     private static final FluentLogger logger = FluentLogger.forEnclosingClass();
 
@@ -229,6 +246,16 @@ public class TraceContext implements AutoCloseable {
       this(elapsedMs -> logger.atFine().log(format + " (%d ms)", arg1, arg2, arg3, elapsedMs));
     }
 
+    private TraceTimer(
+        String format,
+        @Nullable Object arg1,
+        @Nullable Object arg2,
+        @Nullable Object arg3,
+        @Nullable Object arg4) {
+      this(
+          elapsedMs -> logger.atFine().log(format + " (%d ms)", arg1, arg2, arg3, arg4, elapsedMs));
+    }
+
     private TraceTimer(Consumer<Long> logFn) {
       this.logFn = logFn;
       this.stopwatch = Stopwatch.createStarted();

From 5d19b8dd63e39fcd6cee411b059cbc458b972286 Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Tue, 26 Mar 2019 13:53:41 +0100
Subject: [PATCH 08/11] VersionedMetaData: Convert debug log of read/save file
 to trace timers

Change-Id: I45bff04c0ef979007a8ff65ef8035d84480e972d
---
 .../server/git/meta/VersionedMetaData.java    | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/java/com/google/gerrit/server/git/meta/VersionedMetaData.java b/java/com/google/gerrit/server/git/meta/VersionedMetaData.java
index 8b14177b96..2e79a1a47c 100644
--- a/java/com/google/gerrit/server/git/meta/VersionedMetaData.java
+++ b/java/com/google/gerrit/server/git/meta/VersionedMetaData.java
@@ -17,10 +17,11 @@ package com.google.gerrit.server.git.meta;
 import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.common.base.MoreObjects;
-import com.google.common.flogger.FluentLogger;
 import com.google.gerrit.common.Nullable;
 import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.server.git.LockFailureException;
+import com.google.gerrit.server.logging.TraceContext;
+import com.google.gerrit.server.logging.TraceContext.TraceTimer;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
@@ -64,8 +65,6 @@ import org.eclipse.jgit.util.RawParseUtils;
  * read from the repository, or format an update that can later be written back to the repository.
  */
 public abstract class VersionedMetaData {
-  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
-
   /**
    * Path information that does not hold references to any repository data structures, allowing the
    * application to retain this object for long periods of time.
@@ -492,10 +491,11 @@ public abstract class VersionedMetaData {
       return new byte[] {};
     }
 
-    logger.atFine().log(
-        "Read file '%s' from ref '%s' of project '%s' from revision '%s'",
-        fileName, getRefName(), projectName, revision.name());
-    try (TreeWalk tw = TreeWalk.forPath(reader, fileName, revision.getTree())) {
+    try (TraceTimer timer =
+            TraceContext.newTimer(
+                "Read file '%s' from ref '%s' of project '%s' from revision '%s'",
+                fileName, getRefName(), projectName, revision.name());
+        TreeWalk tw = TreeWalk.forPath(reader, fileName, revision.getTree())) {
       if (tw != null) {
         ObjectLoader obj = reader.open(tw.getObjectId(0), Constants.OBJ_BLOB);
         return obj.getCachedBytes(Integer.MAX_VALUE);
@@ -567,22 +567,24 @@ public abstract class VersionedMetaData {
   }
 
   protected void saveFile(String fileName, byte[] raw) throws IOException {
-    logger.atFine().log(
-        "Save file '%s' in ref '%s' of project '%s'", fileName, getRefName(), projectName);
-    DirCacheEditor editor = newTree.editor();
-    if (raw != null && 0 < raw.length) {
-      final ObjectId blobId = inserter.insert(Constants.OBJ_BLOB, raw);
-      editor.add(
-          new PathEdit(fileName) {
-            @Override
-            public void apply(DirCacheEntry ent) {
-              ent.setFileMode(FileMode.REGULAR_FILE);
-              ent.setObjectId(blobId);
-            }
-          });
-    } else {
-      editor.add(new DeletePath(fileName));
+    try (TraceTimer timer =
+        TraceContext.newTimer(
+            "Save file '%s' in ref '%s' of project '%s'", fileName, getRefName(), projectName)) {
+      DirCacheEditor editor = newTree.editor();
+      if (raw != null && 0 < raw.length) {
+        final ObjectId blobId = inserter.insert(Constants.OBJ_BLOB, raw);
+        editor.add(
+            new PathEdit(fileName) {
+              @Override
+              public void apply(DirCacheEntry ent) {
+                ent.setFileMode(FileMode.REGULAR_FILE);
+                ent.setObjectId(blobId);
+              }
+            });
+      } else {
+        editor.add(new DeletePath(fileName));
+      }
+      editor.finish();
     }
-    editor.finish();
   }
 }

From 68af5df38b8f1cc21ba5daa0453e06b2d15d9f11 Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Wed, 27 Mar 2019 09:48:12 +0100
Subject: [PATCH 09/11] GroupsUpdate: Rename update... methods to evict...

Change-Id: I896a07ad8f1959444eb16ea207addf11d9076e25
---
 java/com/google/gerrit/server/group/db/GroupsUpdate.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/com/google/gerrit/server/group/db/GroupsUpdate.java b/java/com/google/gerrit/server/group/db/GroupsUpdate.java
index 82a1bf4b98..7cc66ea566 100644
--- a/java/com/google/gerrit/server/group/db/GroupsUpdate.java
+++ b/java/com/google/gerrit/server/group/db/GroupsUpdate.java
@@ -180,7 +180,7 @@ public class GroupsUpdate {
       InternalGroupCreation groupCreation, InternalGroupUpdate groupUpdate)
       throws OrmDuplicateKeyException, IOException, ConfigInvalidException {
     InternalGroup createdGroup = createGroupInNoteDbWithRetry(groupCreation, groupUpdate);
-    updateCachesOnGroupCreation(createdGroup);
+    evictCachesOnGroupCreation(createdGroup);
     dispatchAuditEventsOnGroupCreation(createdGroup);
     return createdGroup;
   }
@@ -205,7 +205,7 @@ public class GroupsUpdate {
 
     UpdateResult result = updateGroupInNoteDbWithRetry(groupUuid, groupUpdate);
     updateNameInProjectConfigsIfNecessary(result);
-    updateCachesOnGroupUpdate(result);
+    evictCachesOnGroupUpdate(result);
     dispatchAuditEventsOnGroupUpdate(result, updatedOn.get());
   }
 
@@ -345,7 +345,7 @@ public class GroupsUpdate {
         allUsersName, batchRefUpdate, currentUser != null ? currentUser.state() : null);
   }
 
-  private void updateCachesOnGroupCreation(InternalGroup createdGroup) throws IOException {
+  private void evictCachesOnGroupCreation(InternalGroup createdGroup) throws IOException {
     // By UUID is used for the index and hence should be evicted before refreshing the index.
     groupCache.evict(createdGroup.getGroupUUID());
     indexer.get().index(createdGroup.getGroupUUID());
@@ -357,7 +357,7 @@ public class GroupsUpdate {
     createdGroup.getSubgroups().forEach(groupIncludeCache::evictParentGroupsOf);
   }
 
-  private void updateCachesOnGroupUpdate(UpdateResult result) throws IOException {
+  private void evictCachesOnGroupUpdate(UpdateResult result) throws IOException {
     // By UUID is used for the index and hence should be evicted before refreshing the index.
     groupCache.evict(result.getGroupUuid());
     indexer.get().index(result.getGroupUuid());

From 7ae6665da0e1474e7342b505198e221fc15bc84a Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Mon, 25 Mar 2019 16:28:06 +0100
Subject: [PATCH 10/11] GroupsUpdate: Add debug log on cache eviction for group
 creation/update

The GroupCacheImpl already logs when groups are evicted from the ID,
UUID, and name caches. Add logs which will show the context of the
cache evictions, i.e. when the group has been created or updated.

Change-Id: I1e799f6015e0b4d6c250a452cae909cc6cf5b040
---
 java/com/google/gerrit/server/group/db/GroupsUpdate.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/java/com/google/gerrit/server/group/db/GroupsUpdate.java b/java/com/google/gerrit/server/group/db/GroupsUpdate.java
index 7cc66ea566..76a134be7a 100644
--- a/java/com/google/gerrit/server/group/db/GroupsUpdate.java
+++ b/java/com/google/gerrit/server/group/db/GroupsUpdate.java
@@ -19,6 +19,7 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+import com.google.common.flogger.FluentLogger;
 import com.google.gerrit.common.Nullable;
 import com.google.gerrit.common.errors.NoSuchGroupException;
 import com.google.gerrit.reviewdb.client.Account;
@@ -84,6 +85,8 @@ public class GroupsUpdate {
     GroupsUpdate create(@Nullable IdentifiedUser currentUser);
   }
 
+  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
   private final GitRepositoryManager repoManager;
   private final AllUsersName allUsersName;
   private final GroupCache groupCache;
@@ -346,6 +349,7 @@ public class GroupsUpdate {
   }
 
   private void evictCachesOnGroupCreation(InternalGroup createdGroup) throws IOException {
+    logger.atFine().log("evict caches on creation of group %s", createdGroup.getGroupUUID());
     // By UUID is used for the index and hence should be evicted before refreshing the index.
     groupCache.evict(createdGroup.getGroupUUID());
     indexer.get().index(createdGroup.getGroupUUID());
@@ -358,6 +362,7 @@ public class GroupsUpdate {
   }
 
   private void evictCachesOnGroupUpdate(UpdateResult result) throws IOException {
+    logger.atFine().log("evict caches on update of group %s", result.getGroupUuid());
     // By UUID is used for the index and hence should be evicted before refreshing the index.
     groupCache.evict(result.getGroupUuid());
     indexer.get().index(result.getGroupUuid());

From dc9e7bfc5af22f61c56c87d15a7e1a9755485437 Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Wed, 27 Mar 2019 10:00:33 +0100
Subject: [PATCH 11/11] GroupsUpdate: Add trace timer on group creation/update
 operations

Change-Id: If4f109f83b7b40a4915957f3794ab44bb4b0560d
---
 .../gerrit/server/group/db/GroupsUpdate.java  | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/java/com/google/gerrit/server/group/db/GroupsUpdate.java b/java/com/google/gerrit/server/group/db/GroupsUpdate.java
index 76a134be7a..ad3813a612 100644
--- a/java/com/google/gerrit/server/group/db/GroupsUpdate.java
+++ b/java/com/google/gerrit/server/group/db/GroupsUpdate.java
@@ -40,6 +40,8 @@ import com.google.gerrit.server.git.meta.MetaDataUpdate;
 import com.google.gerrit.server.group.GroupAuditService;
 import com.google.gerrit.server.group.InternalGroup;
 import com.google.gerrit.server.index.group.GroupIndexer;
+import com.google.gerrit.server.logging.TraceContext;
+import com.google.gerrit.server.logging.TraceContext.TraceTimer;
 import com.google.gerrit.server.update.RefUpdateUtil;
 import com.google.gerrit.server.update.RetryHelper;
 import com.google.gerrit.server.util.time.TimeUtil;
@@ -182,10 +184,14 @@ public class GroupsUpdate {
   public InternalGroup createGroup(
       InternalGroupCreation groupCreation, InternalGroupUpdate groupUpdate)
       throws OrmDuplicateKeyException, IOException, ConfigInvalidException {
-    InternalGroup createdGroup = createGroupInNoteDbWithRetry(groupCreation, groupUpdate);
-    evictCachesOnGroupCreation(createdGroup);
-    dispatchAuditEventsOnGroupCreation(createdGroup);
-    return createdGroup;
+    try (TraceTimer timer =
+        TraceContext.newTimer(
+            "Creating group '%s'", groupUpdate.getName().orElseGet(groupCreation::getNameKey))) {
+      InternalGroup createdGroup = createGroupInNoteDbWithRetry(groupCreation, groupUpdate);
+      evictCachesOnGroupCreation(createdGroup);
+      dispatchAuditEventsOnGroupCreation(createdGroup);
+      return createdGroup;
+    }
   }
 
   /**
@@ -200,16 +206,18 @@ public class GroupsUpdate {
    */
   public void updateGroup(AccountGroup.UUID groupUuid, InternalGroupUpdate groupUpdate)
       throws OrmDuplicateKeyException, IOException, NoSuchGroupException, ConfigInvalidException {
-    Optional<Timestamp> updatedOn = groupUpdate.getUpdatedOn();
-    if (!updatedOn.isPresent()) {
-      updatedOn = Optional.of(TimeUtil.nowTs());
-      groupUpdate = groupUpdate.toBuilder().setUpdatedOn(updatedOn.get()).build();
-    }
+    try (TraceTimer timer = TraceContext.newTimer("Updating group %s", groupUuid)) {
+      Optional<Timestamp> updatedOn = groupUpdate.getUpdatedOn();
+      if (!updatedOn.isPresent()) {
+        updatedOn = Optional.of(TimeUtil.nowTs());
+        groupUpdate = groupUpdate.toBuilder().setUpdatedOn(updatedOn.get()).build();
+      }
 
-    UpdateResult result = updateGroupInNoteDbWithRetry(groupUuid, groupUpdate);
-    updateNameInProjectConfigsIfNecessary(result);
-    evictCachesOnGroupUpdate(result);
-    dispatchAuditEventsOnGroupUpdate(result, updatedOn.get());
+      UpdateResult result = updateGroupInNoteDbWithRetry(groupUuid, groupUpdate);
+      updateNameInProjectConfigsIfNecessary(result);
+      evictCachesOnGroupUpdate(result);
+      dispatchAuditEventsOnGroupUpdate(result, updatedOn.get());
+    }
   }
 
   private InternalGroup createGroupInNoteDbWithRetry(