diff --git a/java/google/registry/monitoring/metrics/MetricReporter.java b/java/google/registry/monitoring/metrics/MetricReporter.java index 6d45e8f33..df414a3cc 100644 --- a/java/google/registry/monitoring/metrics/MetricReporter.java +++ b/java/google/registry/monitoring/metrics/MetricReporter.java @@ -30,8 +30,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.logging.Level; import java.util.logging.Logger; -import javax.inject.Inject; -import javax.inject.Named; /** * Engine to write metrics to a {@link MetricWriter} on a regular periodic basis. @@ -57,11 +55,8 @@ public class MetricReporter extends AbstractScheduledService { * @param writeInterval time period between metric writes, in seconds. * @param threadFactory factory to use when creating background threads. */ - @Inject public MetricReporter( - MetricWriter metricWriter, - @Named("metricsWriteInterval") long writeInterval, - @Named("metricsBackgroundThreadFactory") ThreadFactory threadFactory) { + MetricWriter metricWriter, long writeInterval, ThreadFactory threadFactory) { this( metricWriter, writeInterval, diff --git a/java/google/registry/monitoring/whitebox/StackdriverModule.java b/java/google/registry/monitoring/whitebox/StackdriverModule.java index 4fc2ef199..78e84e8f4 100644 --- a/java/google/registry/monitoring/whitebox/StackdriverModule.java +++ b/java/google/registry/monitoring/whitebox/StackdriverModule.java @@ -27,11 +27,10 @@ import com.google.common.collect.ImmutableMap; import dagger.Module; import dagger.Provides; import google.registry.config.RegistryConfig.Config; +import google.registry.monitoring.metrics.MetricReporter; import google.registry.monitoring.metrics.MetricWriter; import google.registry.monitoring.metrics.stackdriver.StackdriverWriter; import java.util.Set; -import java.util.concurrent.ThreadFactory; -import javax.inject.Named; import org.joda.time.Duration; /** Dagger module for Google Stackdriver service connection objects. */ @@ -85,15 +84,9 @@ public final class StackdriverModule { } @Provides - @Named("metricsBackgroundThreadFactory") - static ThreadFactory provideThreadFactory() { - return ThreadManager.backgroundThreadFactory(); - } - - @Provides - @Named("metricsWriteInterval") - static long provideMetricsWriteInterval( - @Config("metricsWriteInterval") Duration metricsWriteInterval) { - return metricsWriteInterval.getStandardSeconds(); + static MetricReporter provideMetricReporter( + MetricWriter metricWriter, @Config("metricsWriteInterval") Duration writeInterval) { + return new MetricReporter( + metricWriter, writeInterval.getStandardSeconds(), ThreadManager.backgroundThreadFactory()); } }