#3231: Move metricRegistry to AnetObjectEngine

NCI-Agency · Nov 18, 2020 · a105402 · a105402
1 parent dbf4874
commit a105402
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/main/java/mil/dds/anet/AnetObjectEngine.java b/src/main/java/mil/dds/anet/AnetObjectEngine.java
@@ -69,6 +69,7 @@ public class AnetObjectEngine {
   private final AuthorizationGroupDao authorizationGroupDao;
   private final NoteDao noteDao;
   private final JobHistoryDao jobHistoryDao;
+  private final MetricRegistry metricRegistry;
   private ThreadLocal<Map<String, Object>> context;
 
   ISearcher searcher;
@@ -82,7 +83,6 @@ public AnetObjectEngine(String dbUrl, Application<?> application, MetricRegistry
     this.dbUrl = dbUrl;
     injector = InjectorLookup.getInjector(application).get();
     personDao = injector.getInstance(PersonDao.class);
-    personDao.setMetricRegistry(metricRegistry);
     taskDao = injector.getInstance(TaskDao.class);
     locationDao = injector.getInstance(LocationDao.class);
     orgDao = injector.getInstance(OrganizationDao.class);
@@ -99,6 +99,7 @@ public AnetObjectEngine(String dbUrl, Application<?> application, MetricRegistry
     authorizationGroupDao = injector.getInstance(AuthorizationGroupDao.class);
     noteDao = injector.getInstance(NoteDao.class);
     jobHistoryDao = injector.getInstance(JobHistoryDao.class);
+    this.metricRegistry = metricRegistry;
     searcher = Searcher.getSearcher(DaoUtils.getDbType(dbUrl), injector);
     instance = this;
   }
@@ -179,6 +180,10 @@ public EmailDao getEmailDao() {
     return emailDao;
   }
 
+  public MetricRegistry getMetricRegistry() {
+    return metricRegistry;
+  }
+
   public ISearcher getSearcher() {
     return searcher;
   }

diff --git a/src/main/java/mil/dds/anet/database/PersonDao.java b/src/main/java/mil/dds/anet/database/PersonDao.java
@@ -62,7 +62,6 @@ public class PersonDao extends AnetBaseDao<Person, PersonSearchQuery> {
   private static final int ACTIVITY_LOG_LIMIT = 100;
 
   private Cache<String, Person> domainUsersCache;
-  private MetricRegistry metricRegistry;
 
   public PersonDao() {
     try {
@@ -79,14 +78,6 @@ public PersonDao() {
     }
   }
 
-  public MetricRegistry getMetricRegistry() {
-    return metricRegistry;
-  }
-
-  public void setMetricRegistry(MetricRegistry metricRegistry) {
-    this.metricRegistry = metricRegistry;
-  }
-
   public Cache<String, Person> getDomainUsersCache() {
     return domainUsersCache;
   }
@@ -263,6 +254,7 @@ private Person getFromCache(String domainUsername) {
       return null;
     }
     final Person person = domainUsersCache.get(domainUsername);
+    final MetricRegistry metricRegistry = AnetObjectEngine.getInstance().getMetricRegistry();
     if (metricRegistry != null) {
       metricRegistry.counter(MetricRegistry.name(DOMAIN_USERS_CACHE, "LoadCount")).inc();
       if (person == null) {