Feature/tech bingq3.3 (#581)

* PN-13378: enabled EnableKeyRotation

* Bug/pn 10717 (#573)

* PN-10717: Introduced retry strategy into state machine calls.

* PN-10717: Fixed statemachine retry strategy property names

* PN-10717: changed value of PnEcPECMaxMessageSizeMB to 30

* PN-10717: fixed UoM of SpringCodecMaxInMemorySize

---------

Co-authored-by: michelescara <michele.scaramuzzino@gmail.com>
Co-authored-by: damiano.lozzi <damiano.lozzi@dgsspa.com>
Co-authored-by: Mario Ottone <mario.ottone@dgsspa.com>

* Hotfix/pn 11619 (#574)

* PN-11619: PaId correction

* PN-11619: comparison test added

* PN-11619: fixed typo in yml

---------

Co-authored-by: ElenaPagnacco <116713610+ElenaPagnacco@users.noreply.github.com>
Co-authored-by: michelescara <michele.scaramuzzino@gmail.com>

* Hotfix/pn 12231 (#575)

* PN-12231: Fixed gestioneRetryPecScheduler interrupting when receiving empty value from filterRequestPec() method.

* PN-12231: Added fix to other channels

---------

Co-authored-by: michelescara <michele.scaramuzzino@gmail.com>

* PN-13231 remove hardcoded account (#576)

* Feature/pn 9104 (#572)

* PN-9104: Completed red phase.

Added metric dimensions parser and configuration.
Added new metrics in CloudWatchMetricPublisherConfiguration.
Fixed executeAndPublishResponseTime() method to handle both valued and void monos.

* PN-9104: Completed green phase.

Finalized MetricsDimensionConfiguration.

* PN-9104: Fixed dimension wrong casting.

* PN-9104: addressed sonarcloud issues

* feature/PN-9104 fix merge

---------

Co-authored-by: michelescara <michele.scaramuzzino@gmail.com>
Co-authored-by: damiano.lozzi <damiano.lozzi@dgsspa.com>

* PN-9104-bis fix microservice-dev-cfg.json (#577)

* PN-10717: Fixed error mapping in CallMacchinaStati. (#578)

Added junit tests.

* PN-12231: Fixed errore handling in gestioneRetryEmail. (#579)

* PN-12231: Fixed errore handling in gestioneRetryEmail.
Added handling of empty return in processOnlyBodyRetry method.

* PN-12231: Added missing log.

* Feature/pn 12231 bis (#580)

* PN-12231: Fixed errore handling in gestioneRetryEmail.
Added handling of empty return in processOnlyBodyRetry method.

* PN-12231: Added missing log.

* PN-12231: Fixed error handling in gestioneRetry schedulers.

* PN-12231: Fixed @DirtiesContext annotation.
Moved cleanup logic in @beforeeach method.

---------

Co-authored-by: mottone <mottone@email.it>
Co-authored-by: Marco Iannaccone <marco.iannaccone@pagopa.it>
Co-authored-by: michelescara <michele.scaramuzzino@gmail.com>
Co-authored-by: damiano.lozzi <damiano.lozzi@dgsspa.com>
Co-authored-by: Mario Ottone <mario.ottone@dgsspa.com>
Co-authored-by: ElenaPagnacco <116713610+ElenaPagnacco@users.noreply.github.com>
Co-authored-by: michelescara <79908782+michelescara@users.noreply.github.com>

Author: 7 people

docs/openapi/external/consolidatore-v1.yml

@@ -484,7 +484,7 @@ components:
       required:
         - requestId
         - requestSenderId
-        - requestPAId
+        - requestPaId
         - clientRequestTimeStamp
         - eventType
         - productType

pom.xml

@@ -343,6 +343,20 @@
             <version>2.1.3</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.12.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>mockwebserver</artifactId>
+            <version>4.12.0</version>
+            <scope>test</scope>
+        </dependency>
+
         <!--prova generators-->
 
     </dependencies>

scripts/aws/cfn/microservice-dev-cfg.json

@@ -48,6 +48,7 @@
     "PnECPaperPAIdToRaster": "15376371009",
     "PnECPaperPAIdOverride": "15376371009",
     "SQSMaxBatchSubscribedMsgs": "20",
+    "PnEcPecMetricsSchema": "Pn-EC-Pec-MetricsSchema",
     "SQSCartaceoMaxBatchSubscribedMsgs": "10"
   }
 }

scripts/aws/cfn/microservice.yml

@@ -70,6 +70,10 @@ Parameters:
     Type: String
     Description: 'Secret ID for Identity Pec'
 
+  PnEcPecMetricsSchema:
+    Type: String
+    Description: 'Name of the AWS parameter that contains the schema for the metric dimensions of pec services'
+
 #  Version:
 #    Type: String
 #    Description: 'keep track of used projects commitIds'
@@ -1046,7 +1050,8 @@ Resources:
         ContainerEnvEntry79: !Sub 'PnEcQueueNameTrackerStatoSERCQ=${PnEcQueueNameTrackerStatoSERCQ}'
         ContainerEnvEntry80: !Sub 'PnEcQueueNameTrackerErroriSERCQ=${PnEcQueueNameTrackerErroriSERCQ}'
         ContainerEnvEntry81: !Sub 'SQSMaxBatchSubscribedMsgs=${SQSMaxBatchSubscribedMsgs}'
-        ContainerEnvEntry82: !Sub 'SQSCartaceoMaxBatchSubscribedMsgs=${SQSCartaceoMaxBatchSubscribedMsgs}'
+        ContainerEnvEntry82: !Sub 'PnEcPecMetricsSchema=${PnEcPecMetricsSchema}'
+        ContainerEnvEntry83: !Sub 'SQSCartaceoMaxBatchSubscribedMsgs=${SQSCartaceoMaxBatchSubscribedMsgs}'
         ContainerSecret1: !Sub 'ConsolidatoreClientApiKey=arn:aws:secretsmanager:${AWS::Region}:${AWS::AccountId}:secret:pn-EC-Secrets:ConsolidatoreClientApiKey:AWSCURRENT:'
         MicroServiceSecretPrefix: pn-EC-Secrets
         MappedPaths: '/external-channels/*,/external-channel/*,/consolidatore-ingress/*'
@@ -1507,7 +1512,7 @@ Resources:
             - !Ref PnEcAlarmArnDLQueueTrackerStatoSERCQ
             - !Ref PnEcAlarmArnQueueTrackerErroriSERCQ
             - !Ref PnEcAlarmArnDLQueueTrackerErroriSERCQ
-            - !Ref PnEcAlarmArnEventsDLQueuePnCoreTargetEventBus            
+            - !Ref PnEcAlarmArnEventsDLQueuePnCoreTargetEventBus
         DynamoDBTableNames:
           !Join
           - ','

scripts/aws/cfn/storage.yml

@@ -59,6 +59,7 @@ Resources:
       Description: A symmetric encryption KMS key AES-256-GCM
       KeySpec: SYMMETRIC_DEFAULT
       KeyUsage: ENCRYPT_DECRYPT
+      EnableKeyRotation: true
       KeyPolicy:
         Version: 2012-10-17
         Statement:

src/main/java/it/pagopa/pn/ec/EcApplication.java

@@ -67,6 +67,9 @@
 //SQS
 @PropertySource("classpath:sqs/sqs.properties")
 
+//STATE MACHINE
+@PropertySource("classpath:statemachine/statemachine.properties")
+
 //NAMIRIAL
 @PropertySource("classpath:namirial/namirial.properties")
 

src/main/java/it/pagopa/pn/ec/cartaceo/service/CartaceoService.java

@@ -283,6 +283,9 @@ void gestioneRetryCartaceoScheduler() {
                 .flatMap(cartaceoPresaInCaricoInfoSqsMessageWrapper -> gestioneRetryCartaceo(cartaceoPresaInCaricoInfoSqsMessageWrapper.getMessageContent(),
                         cartaceoPresaInCaricoInfoSqsMessageWrapper.getMessage()))
                 .map(MonoResultWrapper::new)
+                .doOnError(throwable -> log.error(GENERIC_ERROR, throwable))
+                // Restituiamo una DeleteMessageResponse vuota per non bloccare lo scaricamento dalla coda
+                .onErrorResume(throwable -> Mono.just(new MonoResultWrapper<>(DeleteMessageResponse.builder().build())))
                 .defaultIfEmpty(new MonoResultWrapper<>(null))
                 .repeat()
                 .takeWhile(MonoResultWrapper::isNotEmpty)
@@ -642,4 +645,4 @@ public Mono<SendMessageResponse> sendNotificationOnBatchQueue(PresaInCaricoInfo
         return sqsService.send(cartaceoSqsQueueName.batchName(), presaInCaricoInfo);
     }
 
-}
+}

src/main/java/it/pagopa/pn/ec/commons/configuration/aws/cloudwatch/CloudWatchMetricPublisherConfiguration.java

@@ -2,19 +2,18 @@
 
 import it.pagopa.pn.ec.commons.exception.cloudwatch.CloudWatchResourceNotFoundException;
 import it.pagopa.pn.ec.commons.model.pojo.cloudwatch.CloudWatchMetricsPublisherWrapper;
+import it.pagopa.pn.library.pec.configurationproperties.PnPecMetricNames;
 import lombok.CustomLog;
-import org.slf4j.event.Level;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import software.amazon.awssdk.metrics.*;
-import software.amazon.awssdk.metrics.publishers.cloudwatch.CloudWatchMetricPublisher;
-import software.amazon.awssdk.metrics.publishers.cloudwatch.internal.CloudWatchMetricLogger;
 import software.amazon.awssdk.services.cloudwatch.CloudWatchAsyncClient;
 
 import javax.annotation.PostConstruct;
 import java.time.Duration;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -32,22 +31,21 @@ public class CloudWatchMetricPublisherConfiguration {
     private int maximumCallsPerUpload;
     @Value("${cloudwatch.upload-frequency-millis:#{null}}")
     private int uploadFrequencyMillis;
-    @Value("${library.pec.cloudwatch.metric.response-time.mark-message-as-read}")
-    private String markMessageAsReadResponseTimeMetric;
-    @Value("${library.pec.cloudwatch.metric.response-time.delete-message}")
-    private String deleteMessageResponseTimeMetric;
     private final CloudWatchAsyncClient cloudWatchAsyncClient;
     private final Map<String, CloudWatchMetricsPublisherWrapper> cloudWatchMetricPublishers = new HashMap<>();
     private final Map<String, SdkMetric<?>> cloudWatchSdkMetrics = new HashMap<>();
+    private final PnPecMetricNames pnPecMetricNames;
 
     /**
      * Instantiates a new CloudWatchMetricPublisherConfiguration.
      *
      * @param cloudWatchAsyncClient the cloud watch async client
+     * @param pnPecMetricNames the names of the CloudWatch metrics
      */
     @Autowired
-    public CloudWatchMetricPublisherConfiguration(CloudWatchAsyncClient cloudWatchAsyncClient) {
+    public CloudWatchMetricPublisherConfiguration(CloudWatchAsyncClient cloudWatchAsyncClient, PnPecMetricNames pnPecMetricNames) {
         this.cloudWatchAsyncClient = cloudWatchAsyncClient;
+        this.pnPecMetricNames = pnPecMetricNames;
     }
 
     /**
@@ -56,8 +54,8 @@ public CloudWatchMetricPublisherConfiguration(CloudWatchAsyncClient cloudWatchAs
     @PostConstruct
     private void init() {
         log.debug("Initializing CloudWatchMetricPublisher configurations.");
-        initCloudWatchMetricPublishers();
         initCloudWatchSdkMetrics();
+        initCloudWatchMetricPublishers();
    }
 
     /**
@@ -98,16 +96,18 @@ public SdkMetric<?> getSdkMetricByMetricName(String metricName) {
      * If maximumCallsPerUpload and uploadFrequencyMillis fields are null, CloudWatchMetricPublisher class will use its default values.
      */
     private void initCloudWatchMetricPublishers() {
-        cloudWatchMetricPublishers.put(arubaPecNamespace, new CloudWatchMetricsPublisherWrapper(arubaPecNamespace, maximumCallsPerUpload, Duration.ofMillis(uploadFrequencyMillis), cloudWatchAsyncClient));
-        cloudWatchMetricPublishers.put(namirialPecNamespace, new CloudWatchMetricsPublisherWrapper(namirialPecNamespace, maximumCallsPerUpload, Duration.ofMillis(uploadFrequencyMillis), cloudWatchAsyncClient));
+        SdkMetric<String> payloadSizeRangeDimension = (SdkMetric<String>) cloudWatchSdkMetrics.get(pnPecMetricNames.getPayloadSizeRange());
+        SdkMetric<String> messageCountRangeDimension = (SdkMetric<String>) cloudWatchSdkMetrics.get(pnPecMetricNames.getMessageCountRange());
+        List<SdkMetric<String>> dimensions = List.of(payloadSizeRangeDimension, messageCountRangeDimension);
+        cloudWatchMetricPublishers.put(arubaPecNamespace, new CloudWatchMetricsPublisherWrapper(arubaPecNamespace, maximumCallsPerUpload, Duration.ofMillis(uploadFrequencyMillis), cloudWatchAsyncClient, dimensions));
+        cloudWatchMetricPublishers.put(namirialPecNamespace, new CloudWatchMetricsPublisherWrapper(namirialPecNamespace, maximumCallsPerUpload, Duration.ofMillis(uploadFrequencyMillis), cloudWatchAsyncClient, dimensions));
     }
 
     /**
      * Init method to initialize SdkMetrics
      */
     private void initCloudWatchSdkMetrics() {
-        cloudWatchSdkMetrics.put(markMessageAsReadResponseTimeMetric, SdkMetric.create(markMessageAsReadResponseTimeMetric, Long.class, MetricLevel.INFO, MetricCategory.HTTP_CLIENT));
-        cloudWatchSdkMetrics.put(deleteMessageResponseTimeMetric, SdkMetric.create(deleteMessageResponseTimeMetric, Long.class, MetricLevel.INFO, MetricCategory.HTTP_CLIENT));
+        pnPecMetricNames.getAllMetrics().forEach(metricName -> cloudWatchSdkMetrics.put(metricName, SdkMetric.create(metricName, Long.class, MetricLevel.INFO, MetricCategory.HTTP_CLIENT)));
     }
 
 }

src/main/java/it/pagopa/pn/ec/commons/configuration/http/JettyHttpClientConf.java

@@ -76,7 +76,7 @@ private Request enhance(Request request, Map<String, String> mdcContextMap) {
                 })
                 .onRequestFailure((theRequest, throwable) -> {
                     MDCUtils.enrichWithMDC(theRequest, mdcContextMap);
-                    log.error("Request failure : {} , {}", throwable, throwable.getMessage());
+                    log.debug("Request failure : {} , {}", throwable, throwable.getMessage());
                 });
 
 

src/main/java/it/pagopa/pn/ec/commons/configurationproperties/sm/StateMachineRetryStrategyProperties.java

@@ -0,0 +1,8 @@
+package it.pagopa.pn.ec.commons.configurationproperties.sm;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "pn.ec.statemachine.retry.strategy")
+public record StateMachineRetryStrategyProperties(Long maxAttempts, Long minBackoff) {
+}
+