diff --git a/java/google/registry/module/frontend/BUILD b/java/google/registry/module/frontend/BUILD index 89f47715e..368d00306 100644 --- a/java/google/registry/module/frontend/BUILD +++ b/java/google/registry/module/frontend/BUILD @@ -20,6 +20,8 @@ java_library( "//java/google/registry/config", "//java/google/registry/flows", "//java/google/registry/keyring/api", + "//java/google/registry/monitoring/metrics", + "//java/google/registry/monitoring/whitebox", "//java/google/registry/rdap", "//java/google/registry/request", "//java/google/registry/request:modules", diff --git a/java/google/registry/module/frontend/FrontendComponent.java b/java/google/registry/module/frontend/FrontendComponent.java index eb8879580..e5ab087bd 100644 --- a/java/google/registry/module/frontend/FrontendComponent.java +++ b/java/google/registry/module/frontend/FrontendComponent.java @@ -19,6 +19,13 @@ import google.registry.braintree.BraintreeModule; import google.registry.config.ConfigModule; import google.registry.keyring.api.KeyModule; 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.RequestModule; import google.registry.ui.ConsoleConfigModule; @@ -29,14 +36,22 @@ import javax.inject.Singleton; @Singleton @Component( modules = { + AppIdentityCredentialModule.class, BraintreeModule.class, ConfigModule.class, ConsoleConfigModule.class, + FrontendMetricsModule.class, + Jackson2Module.class, KeyModule.class, + ModulesServiceModule.class, + StackdriverModule.class, SystemClockModule.class, + UrlFetchTransportModule.class, + UseAppIdentityCredentialForGoogleApisModule.class, UserServiceModule.class, VoidKeyringModule.class, }) interface FrontendComponent { FrontendRequestComponent startRequest(RequestModule requestModule); + MetricReporter metricReporter(); } diff --git a/java/google/registry/module/frontend/FrontendMetricsModule.java b/java/google/registry/module/frontend/FrontendMetricsModule.java new file mode 100644 index 000000000..311dbd8a2 --- /dev/null +++ b/java/google/registry/module/frontend/FrontendMetricsModule.java @@ -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 {} diff --git a/java/google/registry/module/frontend/FrontendServlet.java b/java/google/registry/module/frontend/FrontendServlet.java index 6cb5385d5..5fdf5ae67 100644 --- a/java/google/registry/module/frontend/FrontendServlet.java +++ b/java/google/registry/module/frontend/FrontendServlet.java @@ -18,11 +18,15 @@ import static java.util.Arrays.asList; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; +import google.registry.monitoring.metrics.MetricReporter; import google.registry.request.RequestHandler; import google.registry.request.RequestModule; +import google.registry.util.FormattingLogger; import java.io.IOException; import java.lang.reflect.Method; import java.security.Security; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -32,6 +36,8 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider; public final class FrontendServlet extends HttpServlet { 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 requestHandler = RequestHandler.create(FrontendRequestComponent.class, FluentIterable @@ -46,6 +52,23 @@ public final class FrontendServlet extends HttpServlet { @Override public void init() { 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 diff --git a/javatests/google/registry/module/frontend/BUILD b/javatests/google/registry/module/frontend/BUILD index 8ed9baf2b..58a09854b 100644 --- a/javatests/google/registry/module/frontend/BUILD +++ b/javatests/google/registry/module/frontend/BUILD @@ -20,6 +20,7 @@ java_library( "//third_party/java/servlet/servlet_api", "//third_party/java/truth", "//java/google/registry/module/frontend", + "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/module/frontend/FrontendServletTest.java b/javatests/google/registry/module/frontend/FrontendServletTest.java index 78d376f21..c901a2c95 100644 --- a/javatests/google/registry/module/frontend/FrontendServletTest.java +++ b/javatests/google/registry/module/frontend/FrontendServletTest.java @@ -18,8 +18,10 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import google.registry.testing.AppEngineRule; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -28,6 +30,10 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class FrontendServletTest { + @Rule + public final AppEngineRule appEngine = + AppEngineRule.builder().withDatastore().withLocalModules().build(); + private final HttpServletRequest req = mock(HttpServletRequest.class); private final HttpServletResponse rsp = mock(HttpServletResponse.class);