commit 835eb149aba23b9b122a8f27e304317c77af61ad
author David Pursehouse <dpursehouse@collab.net> Fri Oct 11 21:27:55 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Fri Oct 11 21:27:55 2019 +0900
tree 941323e5d52d96ea960c815bf7ad095b11e52b3d
parent 524975d5655b120edac98e366c96450adb3b4245

SshTraceIT: Use ExtensionRegistry for PerformanceLogger

Change-Id: I417c9861a4baf1ad65d1a47063094dc286de138c

javatests/com/google/gerrit/acceptance/ssh/SshTraceIT.java

diff --git a/javatests/com/google/gerrit/acceptance/ssh/SshTraceIT.java b/javatests/com/google/gerrit/acceptance/ssh/SshTraceIT.java
index 76629d0..ae45d90 100644
--- a/javatests/com/google/gerrit/acceptance/ssh/SshTraceIT.java
+++ b/javatests/com/google/gerrit/acceptance/ssh/SshTraceIT.java
@@ -23,8 +23,6 @@
 import com.google.gerrit.acceptance.ExtensionRegistry;
 import com.google.gerrit.acceptance.ExtensionRegistry.Registration;
 import com.google.gerrit.acceptance.UseSsh;
-import com.google.gerrit.extensions.registration.DynamicSet;
-import com.google.gerrit.extensions.registration.RegistrationHandle;
 import com.google.gerrit.server.logging.LoggingContext;
 import com.google.gerrit.server.logging.Metadata;
 import com.google.gerrit.server.logging.PerformanceLogger;
@@ -35,29 +33,12 @@
 import com.google.inject.Inject;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 @UseSsh
 public class SshTraceIT extends AbstractDaemonTest {
-  @Inject private DynamicSet<PerformanceLogger> performanceLoggers;
   @Inject private ExtensionRegistry extensionRegistry;
 
-  private TestPerformanceLogger testPerformanceLogger;
-  private RegistrationHandle performanceLoggerRegistrationHandle;
-
-  @Before
-  public void setup() {
-    testPerformanceLogger = new TestPerformanceLogger();
-    performanceLoggerRegistrationHandle = performanceLoggers.add("gerrit", testPerformanceLogger);
-  }
-
-  @After
-  public void cleanup() {
-    performanceLoggerRegistrationHandle.remove();
-  }
-
   @Test
   public void sshCallWithoutTrace() throws Exception {
     TraceValidatingProjectCreationValidationListener projectCreationListener =
@@ -114,9 +95,13 @@
 
   @Test
   public void performanceLoggingForSshCall() throws Exception {
-    adminSshSession.exec("gerrit create-project new5");
-    adminSshSession.assertSuccess();
-    assertThat(testPerformanceLogger.logEntries()).isNotEmpty();
+    TestPerformanceLogger testPerformanceLogger = new TestPerformanceLogger();
+    try (Registration registration =
+        extensionRegistry.newRegistration().add(testPerformanceLogger)) {
+      adminSshSession.exec("gerrit create-project new5");
+      adminSshSession.assertSuccess();
+      assertThat(testPerformanceLogger.logEntries()).isNotEmpty();
+    }
   }
 
   private static class TraceValidatingProjectCreationValidationListener