JigMetricsはinitとcloseだけ受け持つようにする

Micrometer直接使うでもそんな冗長じゃない感じなので。

Author: irof

jig-core/src/main/java/org/dddjava/jig/JigExecutor.java

@@ -1,5 +1,6 @@
 package org.dddjava.jig;
 
+import io.micrometer.core.instrument.Metrics;
 import org.dddjava.jig.application.JigDocumentGenerator;
 import org.dddjava.jig.application.metrics.JigMetrics;
 import org.dddjava.jig.domain.model.information.JigRepository;
@@ -25,7 +26,7 @@ public JigExecutor(Configuration configuration) {
      */
     public static List<HandleResult> execute(Configuration configuration, SourceBasePaths sourceBasePaths) {
         try (var __ = JigMetrics.init(configuration)) {
-            return JigMetrics.of("jig.execution.time").measure("total_execution", () ->
+            return Metrics.timer("jig.execution.time", "phase", "total_execution").record(() ->
                     new JigExecutor(configuration).execute(sourceBasePaths));
         }
     }

jig-core/src/main/java/org/dddjava/jig/application/JigDocumentGenerator.java

@@ -1,5 +1,6 @@
 package org.dddjava.jig.application;
 
+import io.micrometer.core.instrument.Metrics;
 import org.dddjava.jig.HandleResult;
 import org.dddjava.jig.adapter.CompositeAdapter;
 import org.dddjava.jig.adapter.diagram.DiagramAdapter;
@@ -8,7 +9,6 @@
 import org.dddjava.jig.adapter.excel.ListAdapter;
 import org.dddjava.jig.adapter.html.*;
 import org.dddjava.jig.adapter.html.dialect.JigDialect;
-import org.dddjava.jig.application.metrics.JigMetrics;
 import org.dddjava.jig.domain.model.documents.documentformat.JigDocument;
 import org.dddjava.jig.domain.model.documents.stationery.JigDiagramOption;
 import org.dddjava.jig.domain.model.documents.stationery.JigDocumentContext;
@@ -68,7 +68,7 @@ public JigDocumentGenerator(JigDocumentContext jigDocumentContext, JigService ji
     }
 
     public void generateIndex(List<HandleResult> results) {
-        JigMetrics.of("jig.document.time").measureVoid("index", () -> {
+        Metrics.timer("jig.document.time", "record", "index").record(() -> {
             IndexView indexView = new IndexView(thymeleafTemplateEngine, diagramOption.graphvizOutputFormat());
             indexView.render(results, outputDirectory);
         });
@@ -106,7 +106,7 @@ private void prepareOutputDirectory() {
     }
 
     HandleResult generateDocument(JigDocument jigDocument, Path outputDirectory, JigRepository jigRepository) {
-        return JigMetrics.of("jig.document.time").measure(jigDocument.name(), () -> {
+        return Metrics.timer("jig.document.time", "phase", jigDocument.name()).record(() -> {
             try {
                 long startTime = System.currentTimeMillis();
 

jig-core/src/main/java/org/dddjava/jig/application/metrics/JigMetrics.java

@@ -15,21 +15,10 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
-import java.util.function.Supplier;
 
 public class JigMetrics {
     private static final Logger logger = LoggerFactory.getLogger(JigMetrics.class);
 
-    private final String metricName;
-
-    private JigMetrics(String metricName) {
-        this.metricName = metricName;
-    }
-
-    public static JigMetrics of(String metricName) {
-        return new JigMetrics(metricName);
-    }
-
     public static Closeable init(Configuration configuration) {
         var registry = Metrics.globalRegistry;
         registry.add(new PrometheusMeterRegistry(PrometheusConfig.DEFAULT));
@@ -86,12 +75,4 @@ public void close() {
             });
         }
     }
-
-    public <T> T measure(String phase, Supplier<T> operation) {
-        return Metrics.timer(metricName, "phase", phase).record(operation);
-    }
-
-    public void measureVoid(String phase, Runnable operation) {
-        Metrics.timer(metricName, "phase", phase).record(operation);
-    }
 }

jig-core/src/main/java/org/dddjava/jig/infrastructure/javaproductreader/DefaultJigRepositoryFactory.java

@@ -1,10 +1,10 @@
 package org.dddjava.jig.infrastructure.javaproductreader;
 
+import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.Timer;
 import org.dddjava.jig.application.GlossaryRepository;
 import org.dddjava.jig.application.JigDataProvider;
 import org.dddjava.jig.application.JigEventRepository;
-import org.dddjava.jig.application.metrics.JigMetrics;
 import org.dddjava.jig.domain.model.data.rdbaccess.MyBatisStatements;
 import org.dddjava.jig.domain.model.data.terms.Glossary;
 import org.dddjava.jig.domain.model.data.types.JigTypeHeader;
@@ -26,6 +26,7 @@
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 
 public class DefaultJigRepositoryFactory {
 
@@ -82,31 +83,29 @@ public JigRepository createJigRepository(SourceBasePaths sourceBasePaths) {
      * プロジェクト情報を読み取る
      */
     private JigRepository analyze(LocalSource sources) {
-        var timer = JigMetrics.of("jig.analysis.time");
-        return timer.measure("code_analysis_total", () -> {
+        var metricName = "jig.analysis.time";
+        return Metrics.timer(metricName, "phase", "code_analysis_total").record(() -> {
             JavaFilePaths javaFilePaths = sources.javaFilePaths();
 
-            timer.measureVoid("package_info_parsing", () ->
+            Metrics.timer(metricName, "phase", "package_info_parsing").record(() ->
                     javaFilePaths.packageInfoPaths().forEach(
                             path -> javaparserReader.loadPackageInfoJavaFile(path, glossaryRepository))
             );
 
-            JavaSourceModel javaSourceModel = timer.measure("java_source_parsing", () ->
+            JavaSourceModel javaSourceModel = Metrics.timer(metricName, "phase", "java_source_parsing").record(() ->
                     javaFilePaths.javaPaths().stream()
                             .map(path -> javaparserReader.parseJavaFile(path, glossaryRepository))
                             .reduce(JavaSourceModel::merge)
-                            .orElseGet(JavaSourceModel::empty)
-            );
+                            .orElseGet(JavaSourceModel::empty));
 
-            Collection<ClassDeclaration> classDeclarations = timer.measure("class_file_parsing", () ->
-                    asmClassSourceReader.readClasses(sources.classFiles())
-            );
+            Collection<ClassDeclaration> classDeclarations = Objects.requireNonNull(
+                    Metrics.timer(metricName, "phase", "class_file_parsing").record(() ->
+                            asmClassSourceReader.readClasses(sources.classFiles())));
 
-            MyBatisStatements myBatisStatements = timer.measure("mybatis_reading", () ->
-                    readMyBatisStatements(sources, classDeclarations)
-            );
+            MyBatisStatements myBatisStatements = Metrics.timer(metricName, "phase", "mybatis_reading").record(() ->
+                    readMyBatisStatements(sources, classDeclarations));
 
-            return timer.measure("jig_repository_creation", () -> {
+            return Metrics.timer(metricName, "phase", "jig_repository_creation").record(() -> {
                 DefaultJigDataProvider defaultJigDataProvider = new DefaultJigDataProvider(javaSourceModel, myBatisStatements);
                 JigTypes jigTypes = JigTypeFactory.createJigTypes(classDeclarations, glossaryRepository.all());
                 return new JigRepository() {