mirror of
https://github.com/google/nomulus.git
synced 2025-05-13 16:07:15 +02:00
Wire in MetricsReporter to FrontendServlet
This work is identical to the work done for BackendServlet in [] ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=132100448
This commit is contained in:
parent
c75ab37dab
commit
180240ae04
6 changed files with 72 additions and 0 deletions
|
@ -20,6 +20,8 @@ java_library(
|
||||||
"//java/google/registry/config",
|
"//java/google/registry/config",
|
||||||
"//java/google/registry/flows",
|
"//java/google/registry/flows",
|
||||||
"//java/google/registry/keyring/api",
|
"//java/google/registry/keyring/api",
|
||||||
|
"//java/google/registry/monitoring/metrics",
|
||||||
|
"//java/google/registry/monitoring/whitebox",
|
||||||
"//java/google/registry/rdap",
|
"//java/google/registry/rdap",
|
||||||
"//java/google/registry/request",
|
"//java/google/registry/request",
|
||||||
"//java/google/registry/request:modules",
|
"//java/google/registry/request:modules",
|
||||||
|
|
|
@ -19,6 +19,13 @@ import google.registry.braintree.BraintreeModule;
|
||||||
import google.registry.config.ConfigModule;
|
import google.registry.config.ConfigModule;
|
||||||
import google.registry.keyring.api.KeyModule;
|
import google.registry.keyring.api.KeyModule;
|
||||||
import google.registry.keyring.api.VoidKeyringModule;
|
import google.registry.keyring.api.VoidKeyringModule;
|
||||||
|
import google.registry.monitoring.metrics.MetricReporter;
|
||||||
|
import google.registry.monitoring.whitebox.StackdriverModule;
|
||||||
|
import google.registry.request.Modules.AppIdentityCredentialModule;
|
||||||
|
import google.registry.request.Modules.Jackson2Module;
|
||||||
|
import google.registry.request.Modules.ModulesServiceModule;
|
||||||
|
import google.registry.request.Modules.UrlFetchTransportModule;
|
||||||
|
import google.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModule;
|
||||||
import google.registry.request.Modules.UserServiceModule;
|
import google.registry.request.Modules.UserServiceModule;
|
||||||
import google.registry.request.RequestModule;
|
import google.registry.request.RequestModule;
|
||||||
import google.registry.ui.ConsoleConfigModule;
|
import google.registry.ui.ConsoleConfigModule;
|
||||||
|
@ -29,14 +36,22 @@ import javax.inject.Singleton;
|
||||||
@Singleton
|
@Singleton
|
||||||
@Component(
|
@Component(
|
||||||
modules = {
|
modules = {
|
||||||
|
AppIdentityCredentialModule.class,
|
||||||
BraintreeModule.class,
|
BraintreeModule.class,
|
||||||
ConfigModule.class,
|
ConfigModule.class,
|
||||||
ConsoleConfigModule.class,
|
ConsoleConfigModule.class,
|
||||||
|
FrontendMetricsModule.class,
|
||||||
|
Jackson2Module.class,
|
||||||
KeyModule.class,
|
KeyModule.class,
|
||||||
|
ModulesServiceModule.class,
|
||||||
|
StackdriverModule.class,
|
||||||
SystemClockModule.class,
|
SystemClockModule.class,
|
||||||
|
UrlFetchTransportModule.class,
|
||||||
|
UseAppIdentityCredentialForGoogleApisModule.class,
|
||||||
UserServiceModule.class,
|
UserServiceModule.class,
|
||||||
VoidKeyringModule.class,
|
VoidKeyringModule.class,
|
||||||
})
|
})
|
||||||
interface FrontendComponent {
|
interface FrontendComponent {
|
||||||
FrontendRequestComponent startRequest(RequestModule requestModule);
|
FrontendRequestComponent startRequest(RequestModule requestModule);
|
||||||
|
MetricReporter metricReporter();
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
// Copyright 2016 The Domain Registry Authors. All Rights Reserved.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package google.registry.module.frontend;
|
||||||
|
|
||||||
|
import dagger.Module;
|
||||||
|
import javax.inject.Singleton;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Dagger module for injecting metrics. All metrics should have {@link Singleton} scope to avoid
|
||||||
|
* being recreated per-request, as the metrics generally track cumulative values.
|
||||||
|
*/
|
||||||
|
@Module
|
||||||
|
public class FrontendMetricsModule {}
|
|
@ -18,11 +18,15 @@ import static java.util.Arrays.asList;
|
||||||
|
|
||||||
import com.google.common.base.Function;
|
import com.google.common.base.Function;
|
||||||
import com.google.common.collect.FluentIterable;
|
import com.google.common.collect.FluentIterable;
|
||||||
|
import google.registry.monitoring.metrics.MetricReporter;
|
||||||
import google.registry.request.RequestHandler;
|
import google.registry.request.RequestHandler;
|
||||||
import google.registry.request.RequestModule;
|
import google.registry.request.RequestModule;
|
||||||
|
import google.registry.util.FormattingLogger;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.security.Security;
|
import java.security.Security;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.concurrent.TimeoutException;
|
||||||
import javax.servlet.http.HttpServlet;
|
import javax.servlet.http.HttpServlet;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
@ -32,6 +36,8 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider;
|
||||||
public final class FrontendServlet extends HttpServlet {
|
public final class FrontendServlet extends HttpServlet {
|
||||||
|
|
||||||
private static final FrontendComponent component = DaggerFrontendComponent.create();
|
private static final FrontendComponent component = DaggerFrontendComponent.create();
|
||||||
|
private static final MetricReporter metricReporter = component.metricReporter();
|
||||||
|
private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass();
|
||||||
|
|
||||||
private static final RequestHandler<FrontendRequestComponent> requestHandler =
|
private static final RequestHandler<FrontendRequestComponent> requestHandler =
|
||||||
RequestHandler.create(FrontendRequestComponent.class, FluentIterable
|
RequestHandler.create(FrontendRequestComponent.class, FluentIterable
|
||||||
|
@ -46,6 +52,23 @@ public final class FrontendServlet extends HttpServlet {
|
||||||
@Override
|
@Override
|
||||||
public void init() {
|
public void init() {
|
||||||
Security.addProvider(new BouncyCastleProvider());
|
Security.addProvider(new BouncyCastleProvider());
|
||||||
|
|
||||||
|
try {
|
||||||
|
metricReporter.startAsync().awaitRunning(10, TimeUnit.SECONDS);
|
||||||
|
logger.info("Started up MetricReporter");
|
||||||
|
} catch (TimeoutException timeoutException) {
|
||||||
|
logger.severefmt("Failed to initialize MetricReporter: %s", timeoutException);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void destroy() {
|
||||||
|
try {
|
||||||
|
metricReporter.stopAsync().awaitTerminated(10, TimeUnit.SECONDS);
|
||||||
|
logger.info("Shut down MetricReporter");
|
||||||
|
} catch (TimeoutException timeoutException) {
|
||||||
|
logger.severefmt("Failed to stop MetricReporter: %s", timeoutException);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -20,6 +20,7 @@ java_library(
|
||||||
"//third_party/java/servlet/servlet_api",
|
"//third_party/java/servlet/servlet_api",
|
||||||
"//third_party/java/truth",
|
"//third_party/java/truth",
|
||||||
"//java/google/registry/module/frontend",
|
"//java/google/registry/module/frontend",
|
||||||
|
"//javatests/google/registry/testing",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -18,8 +18,10 @@ import static org.mockito.Mockito.mock;
|
||||||
import static org.mockito.Mockito.verify;
|
import static org.mockito.Mockito.verify;
|
||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import google.registry.testing.AppEngineRule;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
import org.junit.Rule;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.junit.runners.JUnit4;
|
import org.junit.runners.JUnit4;
|
||||||
|
@ -28,6 +30,10 @@ import org.junit.runners.JUnit4;
|
||||||
@RunWith(JUnit4.class)
|
@RunWith(JUnit4.class)
|
||||||
public class FrontendServletTest {
|
public class FrontendServletTest {
|
||||||
|
|
||||||
|
@Rule
|
||||||
|
public final AppEngineRule appEngine =
|
||||||
|
AppEngineRule.builder().withDatastore().withLocalModules().build();
|
||||||
|
|
||||||
private final HttpServletRequest req = mock(HttpServletRequest.class);
|
private final HttpServletRequest req = mock(HttpServletRequest.class);
|
||||||
private final HttpServletResponse rsp = mock(HttpServletResponse.class);
|
private final HttpServletResponse rsp = mock(HttpServletResponse.class);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue