From fe5121b1edf784d5cc57abd9cd8e27f70dea0f4a Mon Sep 17 00:00:00 2001
From: Viktor Seifert <viktor.seifert@iqser.com>
Date: Wed, 15 Mar 2023 18:16:53 +0100
Subject: [PATCH] RED-6250: Switched to new metrics-commons version to not have
 to instantiate a factory (reduces code duplication)

---
 .../redaction-service-server-v1/pom.xml              |  2 +-
 .../redaction/v1/server/MetricsConfiguration.java    | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/redaction-service-v1/redaction-service-server-v1/pom.xml b/redaction-service-v1/redaction-service-server-v1/pom.xml
index 6f115142..41036d0f 100644
--- a/redaction-service-v1/redaction-service-server-v1/pom.xml
+++ b/redaction-service-v1/redaction-service-server-v1/pom.xml
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>com.iqser.red.commons</groupId>
             <artifactId>metric-commons</artifactId>
-            <version>1.6.0</version>
+            <version>1.7.0</version>
         </dependency>
         <!-- other external -->
         <dependency>
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/MetricsConfiguration.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/MetricsConfiguration.java
index 7f626eaa..cf26924c 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/MetricsConfiguration.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/MetricsConfiguration.java
@@ -3,25 +3,19 @@ package com.iqser.red.service.redaction.v1.server;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 
+import com.iqser.gin4.commons.metrics.MetricCommonsConfiguration;
 import com.iqser.gin4.commons.metrics.meters.FunctionTimerFactory;
 import com.iqser.gin4.commons.metrics.meters.FunctionTimerValues;
 
-import io.micrometer.core.instrument.MeterRegistry;
-
 @Configuration
+@Import({MetricCommonsConfiguration.class})
 public class MetricsConfiguration {
 
     private static final String REDACTMANAGER_ANALYZE_PAGEWISE_METRIC_NAME = "redactmanager_analyze.pagewise";
 
 
-    @Bean
-    public FunctionTimerFactory functionTimerFactory(MeterRegistry registry) {
-
-        return new FunctionTimerFactory(registry);
-    }
-
-
     @Bean
     @Qualifier(REDACTMANAGER_ANALYZE_PAGEWISE_METRIC_NAME)
     public FunctionTimerValues redactmanagerAnalyzePagewise(FunctionTimerFactory factory) {