[PN-17832] feat: removed unused dimensions

Author: empassaro

src/main/java/it/pagopa/pn/national/registries/constant/ExternalServiceConstant.java

@@ -4,9 +4,7 @@
 
 @Getter
 public enum DimensionName {
-    BATCH_TYPE("BatchType"),
-    SERVICE_NAME("ServiceName"),
-    SERVICE_OPERATION("ServiceOperation");
+    BATCH_TYPE("BatchType");
 
     private final String value;
 

src/main/java/it/pagopa/pn/national/registries/model/metrics/DimensionName.java

@@ -4,9 +4,9 @@
 
 @Getter
 public enum MetricName {
-    EXTERNAL_SERVICE_INVOCATION("EXTERNAL_SERVICE_INVOCATION"),
+    INIPEC_REQUEST_INVOCATION("INIPEC_REQUEST_INVOCATION"),
     BATCH_CLOSURE_DURATION("BATCH_CLOSURE_DURATION"),
-    BATCH_SIZE("BATCH_SIZE"),
+    SENT_BATCH_SIZE("SENT_BATCH_SIZE"),
     BATCH_ERROR("BATCH_RECORD_ERROR");
 
     private final String value;

src/main/java/it/pagopa/pn/national/registries/model/metrics/MetricName.java

@@ -3,7 +3,6 @@
 import it.pagopa.pn.commons.log.dto.metrics.GeneralMetric;
 import it.pagopa.pn.national.registries.client.infocamere.InfoCamereClient;
 import it.pagopa.pn.national.registries.constant.BatchStatus;
-import it.pagopa.pn.national.registries.constant.ExternalServiceConstant;
 import it.pagopa.pn.national.registries.converter.GatewayConverter;
 import it.pagopa.pn.national.registries.converter.InfoCamereConverter;
 import it.pagopa.pn.national.registries.entity.BatchRequest;
@@ -147,21 +146,20 @@ private Mono<Void> execBatchRequest(List<BatchRequest> items, String batchId) {
     }
 
     private static void logBatchRequestMetrics(String batchId, IniPecBatchRequest iniPecBatchRequest) {
-        String logMessage = "IniPEC - Logging metrics : " + MetricName.BATCH_SIZE.getValue() + " - " + MetricName.EXTERNAL_SERVICE_INVOCATION.getValue() + " for batchId: " + batchId + " - called EService and batch size is: " + iniPecBatchRequest.getElencoCf().size();
+        String logMessage = "IniPEC - Logging metrics : " + MetricName.SENT_BATCH_SIZE.getValue() + " - " + MetricName.INIPEC_REQUEST_INVOCATION.getValue() + " for batchId: " + batchId + " - called EService and batch size is: " + iniPecBatchRequest.getElencoCf().size();
         GeneralMetric batchSizeMetric = MetricUtils.generateGeneralMetric(
-                MetricName.BATCH_SIZE,
+                MetricName.SENT_BATCH_SIZE,
                 iniPecBatchRequest.getElencoCf().size(),
                 List.of(
                         MetricUtils.generateDimension(DimensionName.BATCH_TYPE, BatchType.INIPEC_REQUEST.name())
                 )
         );
 
         GeneralMetric invocationsMetric = MetricUtils.generateGeneralMetric(
-                MetricName.EXTERNAL_SERVICE_INVOCATION,
+                MetricName.INIPEC_REQUEST_INVOCATION,
                 1,
                 List.of(
-                        MetricUtils.generateDimension(DimensionName.SERVICE_NAME, ExternalServiceConstant.INIPEC_SERVICE),
-                        MetricUtils.generateDimension(DimensionName.SERVICE_OPERATION, ExternalServiceConstant.INIPEC_REQUEST_API)
+                        MetricUtils.generateDimension(DimensionName.BATCH_TYPE, BatchType.INIPEC_REQUEST.name())
                 )
         );
 

src/main/java/it/pagopa/pn/national/registries/service/IniPecBatchRequestService.java

@@ -25,11 +25,11 @@ void generateDimensionReturnsCorrectDimension() {
     @Test
     void generateGeneralMetricSetsAllFieldsCorrectlyWithoutUnit() {
         List<Dimension> dimensions = List.of(MetricUtils.generateDimension(DimensionName.BATCH_TYPE, "test"));
-        GeneralMetric metric = MetricUtils.generateGeneralMetric(MetricName.BATCH_SIZE, 42, dimensions);
+        GeneralMetric metric = MetricUtils.generateGeneralMetric(MetricName.SENT_BATCH_SIZE, 42, dimensions);
 
         assertEquals("national-registries-inipec", metric.getNamespace());
         assertEquals(1, metric.getMetrics().size());
-        assertEquals(MetricName.BATCH_SIZE.getValue(), metric.getMetrics().getFirst().getName());
+        assertEquals(MetricName.SENT_BATCH_SIZE.getValue(), metric.getMetrics().getFirst().getName());
         assertEquals(42, metric.getMetrics().getFirst().getValue());
         assertEquals(dimensions, metric.getDimensions());
         assertNull(metric.getUnit());
@@ -38,33 +38,33 @@ void generateGeneralMetricSetsAllFieldsCorrectlyWithoutUnit() {
     @Test
     void generateGeneralMetricSetsUnitWhenProvided() {
         List<Dimension> dimensions = List.of(MetricUtils.generateDimension(DimensionName.BATCH_TYPE, "test"));
-        GeneralMetric metric = MetricUtils.generateGeneralMetric(MetricName.BATCH_SIZE, 10, dimensions, MetricUnit.SECONDS);
+        GeneralMetric metric = MetricUtils.generateGeneralMetric(MetricName.SENT_BATCH_SIZE, 10, dimensions, MetricUnit.SECONDS);
 
         assertEquals(MetricUnit.SECONDS.getValue(), metric.getUnit());
     }
 
     @Test
     void generateGeneralMetricsReturnsListWithSingleGeneralMetric() {
         List<Dimension> dimensions = List.of(MetricUtils.generateDimension(DimensionName.BATCH_TYPE, "test"));
-        List<GeneralMetric> metrics = MetricUtils.generateGeneralMetrics(MetricName.BATCH_SIZE, 5, dimensions);
+        List<GeneralMetric> metrics = MetricUtils.generateGeneralMetrics(MetricName.SENT_BATCH_SIZE, 5, dimensions);
 
         assertEquals(1, metrics.size());
-        assertEquals(MetricName.BATCH_SIZE.getValue(), metrics.getFirst().getMetrics().getFirst().getName());
+        assertEquals(MetricName.SENT_BATCH_SIZE.getValue(), metrics.getFirst().getMetrics().getFirst().getName());
         assertNull(metrics.getFirst().getUnit());
     }
 
     @Test
     void generateGeneralMetricsWithUnitReturnsListWithUnitSet() {
         List<Dimension> dimensions = List.of(MetricUtils.generateDimension(DimensionName.BATCH_TYPE, "test"));
-        List<GeneralMetric> metrics = MetricUtils.generateGeneralMetrics(MetricName.BATCH_SIZE, 5, dimensions, MetricUnit.SECONDS);
+        List<GeneralMetric> metrics = MetricUtils.generateGeneralMetrics(MetricName.SENT_BATCH_SIZE, 5, dimensions, MetricUnit.SECONDS);
 
         assertEquals(1, metrics.size());
         assertEquals(MetricUnit.SECONDS.getValue(), metrics.getFirst().getUnit());
     }
 
     @Test
     void generateGeneralMetricWithEmptyDimensionsDoesNotFail() {
-        GeneralMetric metric = MetricUtils.generateGeneralMetric(MetricName.BATCH_SIZE, 1, List.of());
+        GeneralMetric metric = MetricUtils.generateGeneralMetric(MetricName.SENT_BATCH_SIZE, 1, List.of());
         assertNotNull(metric);
         assertTrue(metric.getDimensions().isEmpty());
     }