From fa57ebb7555180e9009fc6129d837794c38f6f5a Mon Sep 17 00:00:00 2001
From: Sathyanarayanan Saravanamuthu <sasarava@microsoft.com>
Date: Tue, 8 Feb 2022 10:06:20 +0530
Subject: [PATCH] Resolving review comments

---
 .../azure/messageBus/ProcessNotification.java    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/messageBus/ProcessNotification.java b/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/messageBus/ProcessNotification.java
index 20a0efee2..07ce2501d 100644
--- a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/messageBus/ProcessNotification.java
+++ b/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/messageBus/ProcessNotification.java
@@ -63,14 +63,6 @@ public class ProcessNotification {
             ConcurrentMap properties = telemetryClient.getContext().getProperties();
             properties.put("correlation-id",correlationId);
             properties.put("data-partition-id", dataPartitionId); 
-
-            RequestTelemetry requestTelemetry = new RequestTelemetry(
-                "SBQueueRequest",
-                new Date(),
-                stopWatch.getTime(),
-                "500",
-                false);
-            requestTelemetry.setId(message.getMessageId());
             
             MDC.setContextMap(mdcContextMap.getContextMap(correlationId, dataPartitionId));
             dpsHeaders.setThreadContext(dataPartitionId, correlationId);
@@ -79,6 +71,14 @@ public class ProcessNotification {
 
             HttpResponse response = notificationHandler.notifySubscriber(notificationContent.getNotificationId(),
                     notificationContent.getData(), notificationContent.getExtractAttributes());
+
+            RequestTelemetry requestTelemetry = new RequestTelemetry(
+                "SBQueueRequest",
+                new Date(),
+                stopWatch.getTime(),
+                "500",
+                false);
+            requestTelemetry.setId(message.getMessageId());                    
                                            
             if (!response.isSuccessCode()) {
                 telemetryClient.trackRequest(requestTelemetry); 
-- 
GitLab