Add "documentType" to "documents_processed" metric

2 files changed, 14 insertions, 7 deletions

diff --git a/docproc/src/test/java/com/yahoo/docproc/ProcessingTestCase.java b/docproc/src/test/java/com/yahoo/docproc/ProcessingTestCase.java
index e72b9d991b6..b65327a2077 100644
--- a/docproc/src/test/java/com/yahoo/docproc/ProcessingTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/ProcessingTestCase.java
@@ -13,7 +13,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  * @since 5.1.10
  */
 public class ProcessingTestCase {
diff --git a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java
index 741d10bdc43..c5fb4b75cf3 100644
--- a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java
@@ -2,6 +2,7 @@
 package com.yahoo.docproc;
 
 import com.yahoo.container.StatisticsConfig;
+import com.yahoo.docproc.jdisc.metric.MockMetric;
 import com.yahoo.docproc.jdisc.metric.NullMetric;
 import com.yahoo.document.DataType;
 import com.yahoo.document.DocumentId;
@@ -12,20 +13,23 @@ import com.yahoo.document.DocumentType;
 import com.yahoo.document.DocumentUpdate;
 import com.yahoo.document.datatypes.StringFieldValue;
 import com.yahoo.document.idstring.IdIdString;
+import com.yahoo.jdisc.Metric;
 import com.yahoo.statistics.StatisticsImpl;
 import org.junit.Test;
 
+import java.util.Map;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class SimpleDocumentProcessorTestCase {
 
-    private static DocprocService setupDocprocService(SimpleDocumentProcessor processor) {
-        CallStack stack = new CallStack("default", new StatisticsImpl(new StatisticsConfig(new StatisticsConfig.Builder())), new NullMetric());
+    private static DocprocService setupDocprocService(SimpleDocumentProcessor processor, Metric metric) {
+        CallStack stack = new CallStack("default", new StatisticsImpl(new StatisticsConfig(new StatisticsConfig.Builder())), metric);
         stack.addLast(processor);
         DocprocService service = new DocprocService("default");
         service.setCallStack(stack);
@@ -57,7 +61,8 @@ public class SimpleDocumentProcessorTestCase {
                                      new DocumentUpdate(type, "id:this:foobar::is:an:update"),
                                      new DocumentRemove(new DocumentId("id:this:foobar::is:a:remove")));
 
-        DocprocService service = setupDocprocService(new VerySimpleDocumentProcessor());
+        MockMetric metric = new MockMetric();
+        DocprocService service = setupDocprocService(new VerySimpleDocumentProcessor(), metric);
         service.getExecutor().process(p);
 
         assertEquals(3, p.getDocumentOperations().size());
@@ -66,6 +71,8 @@ public class SimpleDocumentProcessorTestCase {
         assertTrue(p.getDocumentOperations().get(1) instanceof DocumentUpdate);
         assertTrue(p.getDocumentOperations().get(2) instanceof DocumentRemove);
         assertEquals("id:foobar:foobar::12345", p.getDocumentOperations().get(2).getId().toString());
+        assertEquals(Map.of(Map.of("chain", "default", "documentType", "foobar"), 3.0),
+                     metric.metrics().get("documents_processed"));
     }
 
     @Test
@@ -73,7 +80,7 @@ public class SimpleDocumentProcessorTestCase {
         DocumentType type = createTestType();
 
         Processing p = getProcessing(new DocumentPut(type, "id:this:foobar::is:a:document"));
-        DocprocService service = setupDocprocService(new VerySimpleDocumentProcessor());
+        DocprocService service = setupDocprocService(new VerySimpleDocumentProcessor(), new MockMetric());
         service.getExecutor().process(p);
 
         assertEquals(1, p.getDocumentOperations().size());
@@ -89,7 +96,7 @@ public class SimpleDocumentProcessorTestCase {
                                      new DocumentRemove(new DocumentId("id:this:foobar::is:a:remove")),
                                      new DocumentPut(type, "id:this:foobar::is:a:document2"));
 
-        DocprocService service = setupDocprocService(new SimpleDocumentProcessorThrowingOnRemovesAndUpdates());
+        DocprocService service = setupDocprocService(new SimpleDocumentProcessorThrowingOnRemovesAndUpdates(), new MockMetric());
         try {
             service.getExecutor().process(p);
         } catch (RuntimeException re) {