change addFile() duration reporting to use listener

Author: vladak

opengrok-indexer/src/main/java/org/opengrok/indexer/index/DefaultIndexChangedListener.java

@@ -24,7 +24,10 @@
 package org.opengrok.indexer.index;
 
 import org.opengrok.indexer.logger.LoggerFactory;
+import org.opengrok.indexer.util.Statistics;
 
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -39,11 +42,16 @@ public class DefaultIndexChangedListener implements IndexChangedListener {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DefaultIndexChangedListener.class);
 
+    private final Map<String, Statistics> statMap = new ConcurrentHashMap<>();
+
     @Override
     public void fileAdd(String path, String analyzer) {
         if (LOGGER.isLoggable(Level.FINE)) {
             LOGGER.log(Level.FINE, "Add: ''{0}'' ({1})", new Object[]{path, analyzer});
         }
+        if (LOGGER.isLoggable(Level.FINEST)) {
+            statMap.put(path, new Statistics());
+        }
     }
 
     @Override
@@ -53,6 +61,16 @@ public void fileRemove(String path) {
 
     @Override
     public void fileAdded(String path, String analyzer) {
+        if (LOGGER.isLoggable(Level.FINEST)) {
+            Statistics stat = statMap.get(path);
+            if (stat != null) {
+                stat.report(LOGGER, Level.FINEST, String.format("Added: '%s' (%s)", path, analyzer),
+                        "indexer.file.add.latency");
+                statMap.remove(path, stat);
+                return;
+            }
+        }
+
         if (LOGGER.isLoggable(Level.FINER)) {
             LOGGER.log(Level.FINER, "Added: ''{0}'' ({1})", new Object[]{path, analyzer});
         }

opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java

@@ -1772,7 +1772,6 @@ private void indexParallel(String dir, IndexDownArgs args) {
                     int tries = 0;
                     Ctags pctags = null;
                     boolean ret;
-                    Statistics stats = new Statistics();
                     while (true) {
                         try {
                             if (alreadyClosedCounter.get() > 0) {
@@ -1810,8 +1809,6 @@ private void indexParallel(String dir, IndexDownArgs args) {
                         }
 
                         progress.increment();
-                        stats.report(LOGGER, Level.FINEST,
-                                String.format("file '%s' %s", x.file, ret ? "indexed" : "failed indexing"));
                         return ret;
                     }
                 }))).get();