analytics logging

Author: sonalgoyal

common/client/src/main/java/zingg/common/client/Client.java

@@ -185,7 +185,7 @@ else if (options.get(ClientOptions.CONF).value.endsWith("env")) {
 			client = getClient(arguments, options);
 			client.init();
 			client.execute();
-			//client.postMetrics();
+			client.postMetrics();
 			LOG.warn("Zingg processing has completed");				
 		} 
 		catch(ZinggClientException e) {

common/core/src/main/java/zingg/common/core/executor/ZinggBase.java

@@ -97,7 +97,7 @@ public void postMetrics() {
         //Analytics.trackEnvProp(Metric.USER_HOME, collectMetrics); 
         Analytics.trackDomain(Metric.DOMAIN, collectMetrics);
         Analytics.track(Metric.ZINGG_VERSION, "0.4.0", collectMetrics);
-        //Analytics.postEvent(zinggOptions.getValue(), collectMetrics);
+        Analytics.postEvent(zinggOptions.getValue(), collectMetrics);
 	}
 
     public IArguments getArgs() {

common/core/src/main/java/zingg/common/core/util/Analytics.java

@@ -62,43 +62,47 @@ public static void track(String metricName, double metricValue, boolean collectM
 		track(metricName, String.valueOf(metricValue), collectMetrics);
 	}
 
-	public static void trackDomain(String metricName, boolean collectMetrics){
+	public static String getDomain(){
+
 		try {
-			track(metricName, InetAddress.getLocalHost().getHostName(), collectMetrics);
+			return InetAddress.getLocalHost().getHostName();
 		} catch (UnknownHostException e) {
-			track(metricName, "CouldntGetHost", collectMetrics);
+			return "CouldntGetHost";
 		}
+
 	}
+	public static void trackDomain(String metricName, boolean collectMetrics){
+		track(metricName, getDomain(), collectMetrics);
+	}
+
+	
 
 	public static void postEvent(String phase, boolean collectMetrics) {
-		if (collectMetrics != false) {
-			return;
-		}
+		
 		ObjectMapper mapper = new ObjectMapper();
 		ObjectNode rootNode = mapper.createObjectNode();
 
-		rootNode.put("client_id", "555");
+		rootNode.put("client_id", getDomain());
 
 		ObjectNode eventNode = mapper.createObjectNode();
 		eventNode.put("name", phase);
 
-		ObjectNode paramNode = mapper.createObjectNode();
-		for (Map.Entry<String, String> entry : metrics.entrySet()) {
-			paramNode.put(entry.getKey(), entry.getValue());
+		if (collectMetrics != false) {
+			ObjectNode paramNode = mapper.createObjectNode();
+			for (Map.Entry<String, String> entry : metrics.entrySet()) {
+				paramNode.put(entry.getKey(), entry.getValue());
+			}
+			eventNode.set("params", paramNode); 
+
+			ArrayNode eventList;
+			eventList = mapper.createArrayNode();
+			eventList.add(eventNode);
+			rootNode.set("events", eventList);
 		}
-		eventNode.set("params", paramNode); 
-
-		ArrayNode eventList;
-		eventList = mapper.createArrayNode();
-		eventList.add(eventNode);
-		rootNode.set("events", eventList);
-<<<<<<< Updated upstream
-		LOG.warn("event is " + rootNode.toString());
-=======
+		
 		String metricEvent = rootNode.toString();
-		LOG.debug(metricEvent);
->>>>>>> Stashed changes
-		Analytics.sendEvents(rootNode.toString());
+		LOG.warn("event is " + metricEvent);
+		Analytics.sendEvents(metricEvent);
 	}
 
 	private static void sendEvents(String param) {

log4j2.properties

@@ -47,3 +47,5 @@ logger.breeze.name = breeze
 logger.breeze.level = warn
 logger.zingg.name = zingg
 logger.zingg.level = info
+logger.zingg_analytics.name = zingg.common.core.util.Analytics
+logger.zingg_analytics.level = off