E2-1606 implement defined counters in SDK (#267)

* remove one unneeded import

* revert to master for build

* remove instance

* added counters

* move onStartResponse counter and other slight changes

* add test for sendAllCounts

Author: gg4race

AndroidSDKCore/src/main/java/com/leanplum/ActionContext.java

@@ -369,6 +369,7 @@ public void runActionNamed(String name) {
         createActionContextForMessageId(messageAction.toString(), args, messageId, name, false);
       }
     }
+    Leanplum.countAggregator().incrementCount("runActionNamed");
   }
 
   /**
@@ -526,6 +527,7 @@ public void runTrackedActionNamed(String name) {
     } catch (Throwable t) {
       Util.handleException(t);
     }
+    Leanplum.countAggregator().incrementCount("runTrackedActionNamed");
   }
 
   /**

AndroidSDKCore/src/main/java/com/leanplum/Leanplum.java

@@ -108,6 +108,8 @@ public class Leanplum {
 
   private static Runnable pushStartCallback;
 
+  private static CountAggregator countAggregator = new CountAggregator();
+
   private Leanplum() {
   }
 
@@ -264,6 +266,7 @@ public static void trackAllAppScreens() {
    */
   public static void setVariantDebugInfoEnabled(boolean variantDebugInfoEnabled) {
     LeanplumInternal.setIsVariantDebugInfoEnabled(variantDebugInfoEnabled);
+    countAggregator.incrementCount("setVariantDebugInfoEnabled");
   }
 
   /**
@@ -362,6 +365,7 @@ public static void syncResources() {
     } catch (Throwable t) {
       Util.handleException(t);
     }
+    countAggregator.incrementCount("syncResources");
   }
 
   /**
@@ -377,6 +381,7 @@ public static void syncResourcesAsync() {
     } catch (Throwable t) {
       Util.handleException(t);
     }
+    countAggregator.incrementCount("syncResources");
   }
 
   /**
@@ -398,6 +403,7 @@ public static void syncResources(
     } catch (Throwable t) {
       Util.handleException(t);
     }
+    countAggregator.incrementCount("syncResourcePaths");
   }
 
   /**
@@ -419,6 +425,7 @@ public static void syncResourcesAsync(
     } catch (Throwable t) {
       Util.handleException(t);
     }
+    countAggregator.incrementCount("syncResourcePaths");
   }
 
   /**
@@ -593,6 +600,7 @@ protected Void doInBackground(Void... params) {
     } catch (Throwable t) {
       Util.handleException(t);
     }
+    countAggregator.incrementCount("start");
   }
 
   /**
@@ -760,6 +768,7 @@ private static void handleStartResponse(final JSONObject response) {
       @Override
       protected Void doInBackground(Void... params) {
         boolean success = Request.isResponseSuccess(response);
+        Leanplum.countAggregator().incrementCount("onStartResponse");
         if (!success) {
           try {
             LeanplumInternal.setHasStarted(true);
@@ -833,7 +842,7 @@ protected Void doInBackground(Void... params) {
             }
 
             Set<String> enabledCounters = parseSdkCounters(response);
-            CountAggregator.INSTANCE.setEnabledCounters(enabledCounters);
+            countAggregator.setEnabledCounters(enabledCounters);
             Set<String> enabledFeatureFlags = parseFeatureFlags(response);
             FeatureFlagManager.INSTANCE.setEnabledFeatureFlags((enabledFeatureFlags));
             parseVariantDebugInfo(response);
@@ -1396,6 +1405,7 @@ private static void defineAction(String name, int kind, ActionArgs args,
     } catch (Throwable t) {
       Util.handleException(t);
     }
+    Leanplum.countAggregator().incrementCount("defineAction");
   }
 
   /**
@@ -1590,6 +1600,7 @@ private static void setTrafficSourceInfoInternal(HashMap<String, Object> params)
   public static void track(final String event, double value, String info,
       Map<String, ?> params) {
     LeanplumInternal.track(event, value, info, params, null);
+    countAggregator.incrementCount("track");
   }
 
   /**
@@ -1825,6 +1836,7 @@ public void run() {
     } catch (Throwable t) {
       Util.handleException(t);
     }
+    countAggregator.incrementCount("advanceTo");
   }
 
   /**
@@ -2027,6 +2039,7 @@ public void error(Exception e) {
     } catch (Throwable t) {
       Util.handleException(t);
     }
+    countAggregator.incrementCount("forceContentUpdate");
   }
 
   /**
@@ -2179,6 +2192,7 @@ private static void parseVariantDebugInfo(JSONObject response) {
    */
   public static void clearUserContent() {
     VarCache.clearUserContent();
+    countAggregator.incrementCount("clearUserContent");
   }
 
   @VisibleForTesting
@@ -2198,12 +2212,16 @@ public static Set<String> parseFeatureFlags(JSONObject response) {
   }
 
   private static Set<String> toSet(JSONArray array) {
-      Set<String> set = new HashSet<>();
-      if (array != null) {
-        for (int i = 0; i < array.length(); i++) {
-          set.add(array.optString(i));
-        }
+    Set<String> set = new HashSet<>();
+    if (array != null) {
+      for (int i = 0; i < array.length(); i++) {
+        set.add(array.optString(i));
       }
-      return set;
     }
+    return set;
+  }
+
+  public static CountAggregator countAggregator() {
+    return countAggregator;
+  }
 }

AndroidSDKCore/src/main/java/com/leanplum/LeanplumInbox.java

@@ -435,6 +435,7 @@ private List<LeanplumInboxMessage> allMessages(List<LeanplumInboxMessage> messag
     } catch (Throwable t) {
       Util.handleException(t);
     }
+    Leanplum.countAggregator().incrementCount("allMessages");
     return messages;
   }
 

AndroidSDKCore/src/main/java/com/leanplum/callbacks/RegisterDeviceCallback.java

@@ -21,6 +21,8 @@
 
 package com.leanplum.callbacks;
 
+import com.leanplum.Leanplum;
+
 /**
  * Callback that gets run when the device needs to be registered.
  *
@@ -45,10 +47,10 @@ public void run() {
 
   public void setResponseHandler(EmailCallback callback) {
     this.callback = callback;
+    Leanplum.countAggregator().incrementCount("initWithCallback");
   }
 
-  public void run() {
-    this.onResponse(callback);
+  public void run() { this.onResponse(callback);
   }
 
   public abstract void onResponse(EmailCallback callback);

AndroidSDKCore/src/main/java/com/leanplum/internal/ActionArg.java

@@ -24,6 +24,7 @@
 import android.text.TextUtils;
 
 import java.io.InputStream;
+import com.leanplum.Leanplum;
 
 /**
  * Represents an argument for a message or action.
@@ -46,6 +47,7 @@ private static <T> ActionArg<T> argNamed(String name, T defaultValue, String kin
     arg.name = name;
     arg.kind = kind;
     arg.defaultValue = defaultValue;
+    Leanplum.countAggregator().incrementCount("argNamed");
     return arg;
   }
 

AndroidSDKCore/src/main/java/com/leanplum/internal/ActionManager.java

@@ -450,6 +450,7 @@ public void recordMessageTrigger(String messageId) {
     int occurrences = getMessageTriggerOccurrences(messageId);
     occurrences++;
     saveMessageTriggerOccurrences(occurrences, messageId);
+    Leanplum.countAggregator().incrementCount("recordMessageTrigger");
   }
 
   /**

AndroidSDKCore/src/main/java/com/leanplum/internal/CountAggregator.java

@@ -9,16 +9,9 @@
 import java.util.Set;
 
 public class CountAggregator {
-    public static final CountAggregator INSTANCE = new CountAggregator();
-
     private Set<String> enabledCounters = new HashSet<>();
     private final Map<String, Integer> counts = new HashMap<>();
 
-    @VisibleForTesting
-    CountAggregator() {
-        super();
-    }
-
     public void setEnabledCounters(Set<String> enabledCounters) {
         this.enabledCounters = enabledCounters;
     }

AndroidSDKCore/src/main/java/com/leanplum/internal/FeatureFlagManager.java

@@ -2,6 +2,8 @@
 
 import android.support.annotation.VisibleForTesting;
 
+import com.leanplum.Leanplum;
+
 import java.util.HashSet;
 import java.util.Set;
 
@@ -20,6 +22,7 @@ public void setEnabledFeatureFlags(Set<String> enabledFeatureFlags) {
     }
 
     public Boolean isFeatureFlagEnabled(String featureFlagName) {
+        Leanplum.countAggregator().incrementCount("isFeatureFlagEnabled");
         return this.enabledFeatureFlags.contains(featureFlagName);
     }
 }

AndroidSDKCore/src/main/java/com/leanplum/internal/FileManager.java

@@ -130,6 +130,7 @@ public void error(Exception e) {
         }
       }
     }
+    Leanplum.countAggregator().incrementCount("maybeDownloadFile");
     return DownloadFileResult.NONE;
   }
 

AndroidSDKCore/src/main/java/com/leanplum/internal/LeanplumEventCallbackManager.java

@@ -23,6 +23,8 @@
 import android.os.AsyncTask;
 import android.support.annotation.NonNull;
 
+import com.leanplum.Leanplum;
+
 import org.json.JSONObject;
 
 import java.util.HashMap;
@@ -56,6 +58,7 @@ void addCallbacks(Request request, Request.ResponseCallback responseCallback,
     }
 
     eventCallbacks.put(request, new LeanplumEventCallbacks(responseCallback, errorCallback));
+    Leanplum.countAggregator().incrementCount("addEventCallbackAt");
   }
 
   /**
@@ -95,6 +98,7 @@ protected Void doInBackground(Void... params) {
         iterator.remove();
       }
     }
+    Leanplum.countAggregator().incrementCount("invokeErrorCallbacksOnResponses");
   }
 
   /**
@@ -136,6 +140,7 @@ protected Void doInBackground(Void... params) {
         iterator.remove();
       }
     }
+    Leanplum.countAggregator().incrementCount("invokeSuccessCallbacksOnResponses");
   }
 
   private static class LeanplumEventCallbacks {