[Hotfix] Add more log to telemetry client (#416)

pagopa · Jul 23, 2024 · 527e506 · 527e506
1 parent 6d43cc2
commit 527e506
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.../src/main/java/it/pagopa/selfcare/onboarding/service/NotificationEventServiceDefault.java b/.../src/main/java/it/pagopa/selfcare/onboarding/service/NotificationEventServiceDefault.java
@@ -37,6 +37,7 @@ public class NotificationEventServiceDefault implements NotificationEventService
 
     public static final String EVENT_ONBOARDING_FN_NAME = "ONBOARDING-FN";
     public static final String EVENT_ONBOARDING_INSTTITUTION_FN_FAILURE = "EventsOnboardingInstitution_failures";
+    public static final String EVENT_ONBOARDING_INSTTITUTION_FN_ERROR = "EventsOnboardingInstitution_error";
     public static final String EVENT_ONBOARDING_INSTTITUTION_FN_SUCCESS = "EventsOnboardingInstitution_success";
     public static final String OPERATION_NAME = "ONBOARDING-FN";
     private final TelemetryClient telemetryClient;
@@ -98,7 +99,7 @@ public void send(ExecutionContext context, Onboarding onboarding, QueueEvent que
                 prepareAndSendNotification(context, product, consumerConfig, onboarding, token.orElse(null), institution, queueEvent);
             }
         } catch (Exception e) {
-            telemetryClient.trackEvent(EVENT_ONBOARDING_FN_NAME, onboardingEventMap(onboarding),  Map.of(EVENT_ONBOARDING_INSTTITUTION_FN_FAILURE, 1D));
+            telemetryClient.trackEvent(EVENT_ONBOARDING_FN_NAME, onboardingEventMap(onboarding),  Map.of(EVENT_ONBOARDING_INSTTITUTION_FN_ERROR, 1D));
             throw new NotificationException(String.format("Impossible to send notification for onboarding with ID %s", onboarding.getId()), e);
         }
     }
@@ -120,9 +121,9 @@ private void sendNotification(ExecutionContext context, String topic, Notificati
 
         try {
             eventHubRestClient.sendMessage(topic, message);
-            telemetryClient.trackEvent(EVENT_ONBOARDING_FN_NAME, notificationEventMap(notificationToSend),  Map.of(EVENT_ONBOARDING_INSTTITUTION_FN_SUCCESS, 1D));
+            telemetryClient.trackEvent(EVENT_ONBOARDING_FN_NAME, notificationEventMap(notificationToSend, topic),  Map.of(EVENT_ONBOARDING_INSTTITUTION_FN_SUCCESS, 1D));
         } catch (Exception e) {
-            telemetryClient.trackEvent(EVENT_ONBOARDING_FN_NAME, notificationEventMap(notificationToSend),  Map.of(EVENT_ONBOARDING_INSTTITUTION_FN_FAILURE, 1D));
+            telemetryClient.trackEvent(EVENT_ONBOARDING_FN_NAME, notificationEventMap(notificationToSend, topic),  Map.of(EVENT_ONBOARDING_INSTTITUTION_FN_FAILURE, 1D));
             throw new NotificationException(e.getMessage());
         }
     }
@@ -144,8 +145,9 @@ public static Map<String, String> onboardingEventMap(Onboarding onboarding) {
         return propertiesMap;
     }
 
-    public static Map<String, String> notificationEventMap(NotificationToSend notificationToSend) {
+    public static Map<String, String> notificationEventMap(NotificationToSend notificationToSend, String topic) {
         Map<String, String> propertiesMap = new HashMap<>();
+        Optional.ofNullable(topic).ifPresent(value -> propertiesMap.put("topic", value));
         Optional.ofNullable(notificationToSend.getId()).ifPresent(value -> propertiesMap.put("id", value));
         Optional.ofNullable(notificationToSend.getInternalIstitutionID()).ifPresent(value -> propertiesMap.put("internalIstitutionID", value));
         Optional.ofNullable(notificationToSend.getInstitutionId()).ifPresent(value -> propertiesMap.put("institutionId", value));

diff --git a/.../test/java/it/pagopa/selfcare/onboarding/service/NotificationEventServiceDefaultTest.java b/.../test/java/it/pagopa/selfcare/onboarding/service/NotificationEventServiceDefaultTest.java
@@ -214,7 +214,7 @@ void notificationEventMapTest() {
         billing.setPublicService(false);
         notificationToSend.setBilling(billing);
 
-        Map<String, String> properties = NotificationEventServiceDefault.notificationEventMap(notificationToSend);
+        Map<String, String> properties = NotificationEventServiceDefault.notificationEventMap(notificationToSend, "topic");
         assertNotNull(properties);
         assertEquals(properties.get("id"), "id");
         assertEquals(properties.get("internalIstitutionID"), "internal");
@@ -261,7 +261,7 @@ void notificationEventMapRootParentTest() {
         billing.setTaxCodeInvoicing("456");
         notificationToSend.setBilling(billing);
 
-        Map<String, String> properties = NotificationEventServiceDefault.notificationEventMap(notificationToSend);
+        Map<String, String> properties = NotificationEventServiceDefault.notificationEventMap(notificationToSend, "topic");
         assertNotNull(properties);
         assertEquals(properties.get("id"), "id");
         assertEquals(properties.get("internalIstitutionID"), "internal");