From 561e83454fa994b44fd0ec3ed99941b3eab23f44 Mon Sep 17 00:00:00 2001
From: Mike Duff <michael.duff@raytheon.com>
Date: Wed, 23 Jan 2013 14:40:23 -0600
Subject: [PATCH] Issue #1523 - Finalize registry and data delivery stats

Former-commit-id: d691b22ff903b2231e2a04747a8b4f93174ec4e3
---
 .../uf/common/stats/data/StatsEventData.java  | 21 +++++++-------
 .../uf/common/stats/util/UnitUtils.java       |  1 -
 .../base/stats/retrievalProcessStats.xml      | 29 +++++++++++++++++++
 .../base/stats/registryProcessStats.xml       | 14 +++++++++
 4 files changed, 54 insertions(+), 11 deletions(-)
 create mode 100644 edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/utility/edex_static/base/stats/retrievalProcessStats.xml
 create mode 100644 edexOsgi/com.raytheon.uf.edex.registry.ebxml/utility/edex_static/base/stats/registryProcessStats.xml

diff --git a/edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/StatsEventData.java b/edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/StatsEventData.java
index c7351576bd..f33f0be176 100644
--- a/edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/StatsEventData.java
+++ b/edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/StatsEventData.java
@@ -26,17 +26,18 @@ import java.util.Map;
 
 /**
  * Stats Event helper object.
- *
+ * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Nov 8, 2012    728      mpduff      Initial creation
- *
+ * Nov 08, 2012    728     mpduff      Initial creation.
+ * Jan 23, 2013   1523     mpduff      Fix list length.
+ * 
  * </pre>
- *
+ * 
  * @author mpduff
  * @version 1.0
  */
@@ -136,7 +137,7 @@ public class StatsEventData {
 
     /**
      * Get the group list
-     *
+     * 
      * @return
      */
     public String[] getGroups() {
@@ -145,16 +146,16 @@ public class StatsEventData {
 
     /**
      * Get the attribute list
-     *
+     * 
      * @return
      */
     public String[] getAttributes() {
-        return attributeList.toArray(new String[groupList.size()]);
+        return attributeList.toArray(new String[attributeList.size()]);
     }
 
     /**
      * Get the group name from the display name.
-     *
+     * 
      * @param displayName
      * @return
      */
diff --git a/edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/util/UnitUtils.java b/edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/util/UnitUtils.java
index 23b6f368c6..0dbb319678 100644
--- a/edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/util/UnitUtils.java
+++ b/edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/util/UnitUtils.java
@@ -250,7 +250,6 @@ public class UnitUtils implements ISerializableObject {
             break;
         case TIME:
             units = TIME_UNIT_LOOKUP.keySet();
-            // units = TimeConversion.getDataUnits();
             break;
         case COUNT:
             units = new HashSet<String>();
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/utility/edex_static/base/stats/retrievalProcessStats.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/utility/edex_static/base/stats/retrievalProcessStats.xml
new file mode 100644
index 0000000000..2759dde1d3
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/utility/edex_static/base/stats/retrievalProcessStats.xml
@@ -0,0 +1,29 @@
+<statisticsConfig>
+    <!-- Event Type should be fully qualified name of stat event -->
+    <statisticsEvent type="com.raytheon.uf.common.datadelivery.event.retrieval.SubscriptionRetrievalEvent"
+        displayName="Subscription Retrieval" category="Data Delivery">
+        <statisticsGroup name="plugin" displayName="Data Type" />
+        <statisticsGroup name="provider" displayName="Data Provider" />
+        <statisticsGroup name="owner" displayName="Owner" />
+        <statisticsGroup name="network" displayName="Network Route" />
+        <statisticsGroup name="subscriptionType" displayName="Subscription Type" />
+        <statisticsAggregate field="numFailed"
+            displayName="Number of Failed Subscriptions" displayUnit="Count" />
+        <statisticsAggregate field="numComplete"
+            displayName="Number of Completed Subscriptions" displayUnit="Count" />
+    </statisticsEvent>
+    <statisticsEvent type="com.raytheon.uf.common.datadelivery.event.retrieval.DataRetrievalEvent"
+        displayName="Data Retrieval" category="Data Delivery">
+        <statisticsGroup name="plugin" displayName="Data Type" />
+        <statisticsGroup name="provider" displayName="Data Provider" />
+        <statisticsGroup name="owner" displayName="Owner" />
+        <statisticsGroup name="network" displayName="Network Route" />
+        <!-- 
+           Display unit options are bytes, KB, MB, GB
+        -->
+        <statisticsAggregate field="bytes"
+            displayName="Amount of Data Downloaded" displayUnit="MB" />
+        <statisticsAggregate field="numRecords"
+            displayName="Number of Records Downloaded" displayUnit="Count" />
+    </statisticsEvent>
+</statisticsConfig>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/utility/edex_static/base/stats/registryProcessStats.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/utility/edex_static/base/stats/registryProcessStats.xml
new file mode 100644
index 0000000000..7c3ed01ee8
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/utility/edex_static/base/stats/registryProcessStats.xml
@@ -0,0 +1,14 @@
+<statisticsConfig>
+    <!-- Event Type should be fully qualified name of stat event -->
+    <statisticsEvent type="com.raytheon.uf.common.registry.event.RegistryStatisticsEvent"
+        displayName="Registry Statistics" category="Registry">
+        <statisticsGroup name="owner" displayName="Transaction Owner" />
+        <statisticsGroup name="status" displayName="Transaction Status" />
+        <statisticsGroup name="type" displayName="Transaction Type" />
+        <!-- 
+           Display unit options are ms, Seconds, Minutes, Hours
+        -->
+        <statisticsAggregate field="duration"
+            displayName="Total Registry Duration" displayUnit="Minutes" />
+    </statisticsEvent>
+</statisticsConfig>