[SELC-5326] fix: Added telemetry for all send email methods

pagopa · Aug 1, 2024 · 15010e6 · 15010e6
1 parent 676cecb
commit 15010e6
Show file tree

Hide file tree

Showing 7 changed files with 278 additions and 129 deletions.
diff --git a/...-functions/src/main/java/it/pagopa/selfcare/onboarding/functions/OnboardingFunctions.java b/...-functions/src/main/java/it/pagopa/selfcare/onboarding/functions/OnboardingFunctions.java
@@ -189,31 +189,31 @@ public void saveToken(@DurableActivityTrigger(name = "onboardingString") String
     @FunctionName(SEND_MAIL_REGISTRATION_FOR_CONTRACT)
     public void sendMailRegistrationForContract(@DurableActivityTrigger(name = "onboardingString") String onboardingWorkflowString, final ExecutionContext context) {
         context.getLogger().info(String.format(FORMAT_LOGGER_ONBOARDING_STRING, SEND_MAIL_REGISTRATION_FOR_CONTRACT, onboardingWorkflowString));
-        service.sendMailRegistrationForContract(readOnboardingWorkflowValue(objectMapper, onboardingWorkflowString));
+        service.sendMailRegistrationForContract(context, readOnboardingWorkflowValue(objectMapper, onboardingWorkflowString));
     }
 
     @FunctionName(SEND_MAIL_REGISTRATION_FOR_CONTRACT_WHEN_APPROVE_ACTIVITY)
     public void sendMailRegistrationForContractWhenApprove(@DurableActivityTrigger(name = "onboardingString") String onboardingWorkflowString, final ExecutionContext context) {
         context.getLogger().info(String.format(FORMAT_LOGGER_ONBOARDING_STRING, SEND_MAIL_REGISTRATION_FOR_CONTRACT_WHEN_APPROVE_ACTIVITY, onboardingWorkflowString));
-        service.sendMailRegistrationForContractWhenApprove(readOnboardingWorkflowValue(objectMapper, onboardingWorkflowString));
+        service.sendMailRegistrationForContractWhenApprove(context, readOnboardingWorkflowValue(objectMapper, onboardingWorkflowString));
     }
 
     @FunctionName(SEND_MAIL_REGISTRATION_REQUEST_ACTIVITY)
     public void sendMailRegistration(@DurableActivityTrigger(name = "onboardingString") String onboardingString, final ExecutionContext context) {
         context.getLogger().info(String.format(FORMAT_LOGGER_ONBOARDING_STRING, SEND_MAIL_REGISTRATION_REQUEST_ACTIVITY, onboardingString));
-        service.sendMailRegistration(readOnboardingValue(objectMapper, onboardingString));
+        service.sendMailRegistration(context, readOnboardingValue(objectMapper, onboardingString));
     }
 
     @FunctionName(SEND_MAIL_REGISTRATION_APPROVE_ACTIVITY)
     public void sendMailRegistrationApprove(@DurableActivityTrigger(name = "onboardingString") String onboardingString, final ExecutionContext context) {
         context.getLogger().info(String.format(FORMAT_LOGGER_ONBOARDING_STRING, SEND_MAIL_REGISTRATION_APPROVE_ACTIVITY, onboardingString));
-        service.sendMailRegistrationApprove(readOnboardingValue(objectMapper, onboardingString));
+        service.sendMailRegistrationApprove(context, readOnboardingValue(objectMapper, onboardingString));
     }
 
     @FunctionName(SEND_MAIL_ONBOARDING_APPROVE_ACTIVITY)
     public void sendMailOnboardingApprove(@DurableActivityTrigger(name = "onboardingString") String onboardingString, final ExecutionContext context) {
         context.getLogger().info(String.format(FORMAT_LOGGER_ONBOARDING_STRING, SEND_MAIL_ONBOARDING_APPROVE_ACTIVITY, onboardingString));
-        service.sendMailOnboardingApprove(readOnboardingValue(objectMapper, onboardingString));
+        service.sendMailOnboardingApprove(context, readOnboardingValue(objectMapper, onboardingString));
     }
 
     @FunctionName(CREATE_INSTITUTION_ACTIVITY)
@@ -274,11 +274,11 @@ public String createDelegationForAggregation(@DurableActivityTrigger(name = "onb
      * After that, It sends a message on topics through the event bus
      */
     @FunctionName("TestSendEmail")
-    public HttpResponseMessage sendTestEmail(
+    public void sendTestEmail(
             @HttpTrigger(name = "req", methods = {HttpMethod.POST}, authLevel = AuthorizationLevel.FUNCTION) HttpRequestMessage<Optional<String>> request,
             final ExecutionContext context) {
         context.getLogger().info("TestSendEmail trigger processed a request");
         completionService.sendTestEmail(context);
-        return request.createResponseBuilder(HttpStatus.OK).build();
+        request.createResponseBuilder(HttpStatus.OK).build();
     }
 }
diff --git a/...nctions/src/main/java/it/pagopa/selfcare/onboarding/service/CompletionServiceDefault.java b/...nctions/src/main/java/it/pagopa/selfcare/onboarding/service/CompletionServiceDefault.java
@@ -43,6 +43,7 @@
 import static it.pagopa.selfcare.onboarding.common.WorkflowType.CONFIRMATION_AGGREGATE;
 import static it.pagopa.selfcare.onboarding.service.NotificationEventServiceDefault.*;
 import static it.pagopa.selfcare.onboarding.service.OnboardingService.USERS_FIELD_LIST;
+import static it.pagopa.selfcare.onboarding.utils.Utils.TelemetryConstants.*;
 import static jakarta.ws.rs.core.Response.Status.Family.SUCCESSFUL;
 
 @ApplicationScoped
@@ -70,12 +71,6 @@ public class CompletionServiceDefault implements CompletionService {
     @Inject
     org.openapi.quarkus.party_registry_proxy_json.api.InstitutionApi institutionRegistryProxyApi;
 
-    private static final String EVENT_SEND_COMPLETION_FN_FAILURE = "EventsSendCompletionEmail_failures";
-    private static final String EVENT_SEND_COMPLETION_FN_SUCCESS = "EventsSendCompletionEmail_success";
-    private static final String EVENT_SEND_REJECTION_FN_FAILURE = "EventsSendRejectionEmail_failures";
-    private static final String EVENT_SEND_REJECTION_FN_SUCCESS = "EventsSendRejectionEmail_success";
-    private static final String EVENT_SEND_COMPLETION_AGGREGATE_FN_SUCCESS = "EventsSendCompletionAggregateEmail_success";
-    private static final String EVENT_SEND_COMPLETION_AGGREGATE_FN_FAILURE = "EventsSendCompletionAggregateEmail_failures";
     private final InstitutionMapper institutionMapper;
     private final OnboardingRepository onboardingRepository;
     private final TokenRepository tokenRepository;

diff --git a/...tions/src/main/java/it/pagopa/selfcare/onboarding/service/NotificationServiceDefault.java b/...tions/src/main/java/it/pagopa/selfcare/onboarding/service/NotificationServiceDefault.java
@@ -30,7 +30,6 @@
 public class NotificationServiceDefault implements NotificationService {
 
     private static final Logger log = LoggerFactory.getLogger(NotificationServiceDefault.class);
-
     public static final String PAGOPA_LOGO_FILENAME = "pagopa-logo.png";
     private final MailTemplatePlaceholdersConfig templatePlaceholdersConfig;
     private final MailTemplatePathConfig templatePathConfig;
@@ -40,7 +39,6 @@ public class NotificationServiceDefault implements NotificationService {
     private final String senderMail;
     private final Boolean destinationMailTest;
     private final String destinationMailTestAddress;
-
     private final String notificationAdminMail;
     private final Mailer mailer;