From b77ebd1df952705b916e17806ba2d3de5d40d8e7 Mon Sep 17 00:00:00 2001
From: jart <jart@google.com>
Date: Tue, 6 Sep 2016 17:09:40 -0700
Subject: [PATCH] Don't use modules to instantiate classes

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=132380251
---
 java/google/registry/dns/DnsMetrics.java      | 19 ++++++-----
 .../module/backend/BackendComponent.java      |  1 -
 .../module/backend/BackendMetricsModule.java  | 34 -------------------
 3 files changed, 10 insertions(+), 44 deletions(-)
 delete mode 100644 java/google/registry/module/backend/BackendMetricsModule.java

diff --git a/java/google/registry/dns/DnsMetrics.java b/java/google/registry/dns/DnsMetrics.java
index 93c75fa30..31fc698cf 100644
--- a/java/google/registry/dns/DnsMetrics.java
+++ b/java/google/registry/dns/DnsMetrics.java
@@ -18,17 +18,20 @@ import com.google.common.collect.ImmutableSet;
 import google.registry.monitoring.metrics.IncrementableMetric;
 import google.registry.monitoring.metrics.LabelDescriptor;
 import google.registry.monitoring.metrics.MetricRegistryImpl;
+import javax.inject.Inject;
 
-/**
- * DNS instrumentation.
- */
+/** DNS instrumentation. */
 public class DnsMetrics {
 
+  /** Disposition of a publish request. */
+  public enum Status { ACCEPTED, REJECTED }
+
   private static final ImmutableSet<LabelDescriptor> LABEL_DESCRIPTORS =
       ImmutableSet.of(
           LabelDescriptor.create("tld", "TLD"),
           LabelDescriptor.create(
               "status", "Whether the publish request was accepted or rejected."));
+
   private static final IncrementableMetric publishDomainRequests =
       MetricRegistryImpl.getDefault()
           .newIncrementableMetric(
@@ -36,6 +39,7 @@ public class DnsMetrics {
               "count of publishDomain requests",
               "count",
               LABEL_DESCRIPTORS);
+
   private static final IncrementableMetric publishHostRequests =
       MetricRegistryImpl.getDefault()
           .newIncrementableMetric(
@@ -44,6 +48,9 @@ public class DnsMetrics {
               "count",
               LABEL_DESCRIPTORS);
 
+  @Inject
+  DnsMetrics() {}
+
   /**
    * Increment a monotonic counter that tracks calls to {@link
    * google.registry.dns.writer.DnsWriter#publishDomain(String)}, per TLD.
@@ -59,10 +66,4 @@ public class DnsMetrics {
   public void incrementPublishHostRequests(String tld, Status status) {
     publishHostRequests.increment(tld, status.name());
   }
-
-  /** Enum to encode the disposition of a publish request. */
-  public enum Status {
-    ACCEPTED,
-    REJECTED
-  }
 }
diff --git a/java/google/registry/module/backend/BackendComponent.java b/java/google/registry/module/backend/BackendComponent.java
index 18335ed70..c971db980 100644
--- a/java/google/registry/module/backend/BackendComponent.java
+++ b/java/google/registry/module/backend/BackendComponent.java
@@ -47,7 +47,6 @@ import javax.inject.Singleton;
 @Component(
     modules = {
         AppIdentityCredentialModule.class,
-        BackendMetricsModule.class,
         BigqueryModule.class,
         ConfigModule.class,
         DatastoreServiceModule.class,
diff --git a/java/google/registry/module/backend/BackendMetricsModule.java b/java/google/registry/module/backend/BackendMetricsModule.java
deleted file mode 100644
index adc64ccc8..000000000
--- a/java/google/registry/module/backend/BackendMetricsModule.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// 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.backend;
-
-import dagger.Module;
-import dagger.Provides;
-import google.registry.dns.DnsMetrics;
-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 BackendMetricsModule {
-
-  @Provides
-  @Singleton
-  static DnsMetrics provideDnsMetrics() {
-    return new DnsMetrics();
-  }
-}