opendev/gerrit
Code Issues Proposed changes

SshTraceIT: Use ExtensionRegistry for PerformanceLogger

Browse Source 
Change-Id: I417c9861a4baf1ad65d1a47063094dc286de138c
This commit is contained in:
David Pursehouse
2019-10-11 21:27:55 +09:00
parent 524975d565
commit 835eb149ab
1 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
javatests/com/google/gerrit/acceptance/ssh/SshTraceIT.java
View File

@@ -23,8 +23,6 @@ import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.ExtensionRegistry; import com.google.gerrit.acceptance.ExtensionRegistry;
import com.google.gerrit.acceptance.ExtensionRegistry.Registration; import com.google.gerrit.acceptance.ExtensionRegistry.Registration;
import com.google.gerrit.acceptance.UseSsh; 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.LoggingContext;
import com.google.gerrit.server.logging.Metadata; import com.google.gerrit.server.logging.Metadata;
import com.google.gerrit.server.logging.PerformanceLogger; import com.google.gerrit.server.logging.PerformanceLogger;
@@ -35,29 +33,12 @@ import com.google.gerrit.server.validators.ValidationException;
import com.google.inject.Inject; import com.google.inject.Inject;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.junit.After;
import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@UseSsh @UseSsh
public class SshTraceIT extends AbstractDaemonTest { public class SshTraceIT extends AbstractDaemonTest {
@Inject private DynamicSet<PerformanceLogger> performanceLoggers;
@Inject private ExtensionRegistry extensionRegistry; @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 @Test
public void sshCallWithoutTrace() throws Exception { public void sshCallWithoutTrace() throws Exception {
TraceValidatingProjectCreationValidationListener projectCreationListener = TraceValidatingProjectCreationValidationListener projectCreationListener =
@@ -114,10 +95,14 @@ public class SshTraceIT extends AbstractDaemonTest {
@Test @Test
public void performanceLoggingForSshCall() throws Exception { public void performanceLoggingForSshCall() throws Exception {
TestPerformanceLogger testPerformanceLogger = new TestPerformanceLogger();
try (Registration registration =
extensionRegistry.newRegistration().add(testPerformanceLogger)) {
adminSshSession.exec("gerrit create-project new5"); adminSshSession.exec("gerrit create-project new5");
adminSshSession.assertSuccess(); adminSshSession.assertSuccess();
assertThat(testPerformanceLogger.logEntries()).isNotEmpty(); assertThat(testPerformanceLogger.logEntries()).isNotEmpty();
} }
}
private static class TraceValidatingProjectCreationValidationListener private static class TraceValidatingProjectCreationValidationListener
implements ProjectCreationValidationListener { implements ProjectCreationValidationListener {