Added Intent PURGED events to the collected Intent Event metrics.

Change-Id: Ibe641b91ffe68e8699d6a21a430ea772a7cb7e7a

@@ -69,6 +69,7 @@ public class IntentMetrics implements IntentMetricsService,
     private static final String FEATURE_WITHDRAW_REQUESTED_NAME =
     private static final String FEATURE_WITHDRAW_REQUESTED_NAME =
         "WithdrawRequested";
         "WithdrawRequested";
     private static final String FEATURE_WITHDRAWN_NAME = "Withdrawn";
     private static final String FEATURE_WITHDRAWN_NAME = "Withdrawn";
+    private static final String FEATURE_PURGED_NAME = "Purged";
     //
     //
     // Event metrics:
     // Event metrics:
     //  - Intent Submitted API operation
     //  - Intent Submitted API operation
@@ -76,12 +77,14 @@ public class IntentMetrics implements IntentMetricsService,
     //  - Intent Failed compilation or installation
     //  - Intent Failed compilation or installation
     //  - Intent Withdraw Requested API operation
     //  - Intent Withdraw Requested API operation
     //  - Intent Withdrawn operation completion
     //  - Intent Withdrawn operation completion
+    //  - Intent Purged operation completion
     //
     //
     private EventMetric intentSubmittedEventMetric;
     private EventMetric intentSubmittedEventMetric;
     private EventMetric intentInstalledEventMetric;
     private EventMetric intentInstalledEventMetric;
     private EventMetric intentFailedEventMetric;
     private EventMetric intentFailedEventMetric;
     private EventMetric intentWithdrawRequestedEventMetric;
     private EventMetric intentWithdrawRequestedEventMetric;
     private EventMetric intentWithdrawnEventMetric;
     private EventMetric intentWithdrawnEventMetric;
+    private EventMetric intentPurgedEventMetric;
 
 
     @Activate
     @Activate
     protected void activate() {
     protected void activate() {
@@ -135,6 +138,11 @@ public class IntentMetrics implements IntentMetricsService,
     }
     }
 
 
     @Override
     @Override
+    public EventMetric intentPurgedEventMetric() {
+        return intentPurgedEventMetric;
+    }
+
+    @Override
     public void event(IntentEvent event) {
     public void event(IntentEvent event) {
         synchronized (lastEvents) {
         synchronized (lastEvents) {
             switch (event.type()) {
             switch (event.type()) {
@@ -153,6 +161,9 @@ public class IntentMetrics implements IntentMetricsService,
             case WITHDRAWN:
             case WITHDRAWN:
                 intentWithdrawnEventMetric.eventReceived();
                 intentWithdrawnEventMetric.eventReceived();
                 break;
                 break;
+            case PURGED:
+                intentPurgedEventMetric.eventReceived();
+                break;
             default:
             default:
                 break;
                 break;
             }
             }
@@ -198,12 +209,16 @@ public class IntentMetrics implements IntentMetricsService,
         intentWithdrawnEventMetric =
         intentWithdrawnEventMetric =
             new EventMetric(metricsService, COMPONENT_NAME,
             new EventMetric(metricsService, COMPONENT_NAME,
                             FEATURE_WITHDRAWN_NAME);
                             FEATURE_WITHDRAWN_NAME);
+        intentPurgedEventMetric =
+            new EventMetric(metricsService, COMPONENT_NAME,
+                            FEATURE_PURGED_NAME);
 
 
         intentSubmittedEventMetric.registerMetrics();
         intentSubmittedEventMetric.registerMetrics();
         intentInstalledEventMetric.registerMetrics();
         intentInstalledEventMetric.registerMetrics();
         intentFailedEventMetric.registerMetrics();
         intentFailedEventMetric.registerMetrics();
         intentWithdrawRequestedEventMetric.registerMetrics();
         intentWithdrawRequestedEventMetric.registerMetrics();
         intentWithdrawnEventMetric.registerMetrics();
         intentWithdrawnEventMetric.registerMetrics();
+        intentPurgedEventMetric.registerMetrics();
     }
     }
 
 
     /**
     /**
@@ -215,5 +230,6 @@ public class IntentMetrics implements IntentMetricsService,
         intentFailedEventMetric.removeMetrics();
         intentFailedEventMetric.removeMetrics();
         intentWithdrawRequestedEventMetric.removeMetrics();
         intentWithdrawRequestedEventMetric.removeMetrics();
         intentWithdrawnEventMetric.removeMetrics();
         intentWithdrawnEventMetric.removeMetrics();
+        intentPurgedEventMetric.removeMetrics();
     }
     }
 }
 }

@@ -26,42 +26,49 @@ public interface IntentMetricsService {
     /**
     /**
      * Gets the last saved intent events.
      * Gets the last saved intent events.
      *
      *
-     * @return the last saved intent events.
+     * @return the last saved intent events
      */
      */
     public List<IntentEvent> getEvents();
     public List<IntentEvent> getEvents();
 
 
     /**
     /**
      * Gets the Event Metric for the intent INSTALL_REQ events.
      * Gets the Event Metric for the intent INSTALL_REQ events.
      *
      *
-     * @return the Event Metric for the intent INSTALL_REQ events.
+     * @return the Event Metric for the intent INSTALL_REQ events
      */
      */
     public EventMetric intentSubmittedEventMetric();
     public EventMetric intentSubmittedEventMetric();
 
 
     /**
     /**
      * Gets the Event Metric for the intent INSTALLED events.
      * Gets the Event Metric for the intent INSTALLED events.
      *
      *
-     * @return the Event Metric for the intent INSTALLED events.
+     * @return the Event Metric for the intent INSTALLED events
      */
      */
     public EventMetric intentInstalledEventMetric();
     public EventMetric intentInstalledEventMetric();
 
 
     /**
     /**
      * Gets the Event Metric for the intent FAILED events.
      * Gets the Event Metric for the intent FAILED events.
      *
      *
-     * @return the Event Metric for the intent FAILED events.
+     * @return the Event Metric for the intent FAILED events
      */
      */
     public EventMetric intentFailedEventMetric();
     public EventMetric intentFailedEventMetric();
 
 
     /**
     /**
      * Gets the Event Metric for the intent WITHDRAW_REQ events.
      * Gets the Event Metric for the intent WITHDRAW_REQ events.
      *
      *
-     * @return the Event Metric for the intent WITHDRAW_REQ events.
+     * @return the Event Metric for the intent WITHDRAW_REQ events
      */
      */
     public EventMetric intentWithdrawRequestedEventMetric();
     public EventMetric intentWithdrawRequestedEventMetric();
 
 
     /**
     /**
      * Gets the Event Metric for the intent WITHDRAWN events.
      * Gets the Event Metric for the intent WITHDRAWN events.
      *
      *
-     * @return the Event Metric for the intent WITHDRAWN events.
+     * @return the Event Metric for the intent WITHDRAWN events
      */
      */
     public EventMetric intentWithdrawnEventMetric();
     public EventMetric intentWithdrawnEventMetric();
+
+    /**
+     * Gets the Event Metric for the intent PURGED events.
+     *
+     * @return the Event Metric for the intent PURGED events
+     */
+    public EventMetric intentPurgedEventMetric();
 }
 }

@@ -62,6 +62,8 @@ public class IntentEventsMetricsCommand extends AbstractShellCommand {
                           service.intentWithdrawRequestedEventMetric());
                           service.intentWithdrawRequestedEventMetric());
             result = json(mapper, result, "intentWithdrawn",
             result = json(mapper, result, "intentWithdrawn",
                           service.intentWithdrawnEventMetric());
                           service.intentWithdrawnEventMetric());
+            result = json(mapper, result, "intentPurged",
+                          service.intentPurgedEventMetric());
             print("%s", result);
             print("%s", result);
         } else {
         } else {
             printEventMetric("Submitted",
             printEventMetric("Submitted",
@@ -74,6 +76,8 @@ public class IntentEventsMetricsCommand extends AbstractShellCommand {
                              service.intentWithdrawRequestedEventMetric());
                              service.intentWithdrawRequestedEventMetric());
             printEventMetric("Withdrawn",
             printEventMetric("Withdrawn",
                              service.intentWithdrawnEventMetric());
                              service.intentWithdrawnEventMetric());
+            printEventMetric("Purged",
+                             service.intentPurgedEventMetric());
         }
         }
     }
     }