Fix event action tracking

jordeu · jordeu · commit 767667363a9d · 2014-07-11T12:20:34.000+02:00
diff --git a/org.gitools.ui.app/src/main/java/org/gitools/ui/app/welcome/WelcomeEditor.java b/org.gitools.ui.app/src/main/java/org/gitools/ui/app/welcome/WelcomeEditor.java
@@ -143,15 +143,27 @@ public void run(IProgressMonitor monitor) {
                 }
             });
 
+            // Track event
+            String baseName = FilenameUtils.getBaseName(href);
+            Application.get().trackEvent("datasets", "save", baseName);
+
         }
 
 
     }
 
     @Override
     protected void performLoad(String href) {
+
         CommandLoadFile loadFile = new CommandLoadFile(href);
+
+        // Execute
         JobThread.execute(Application.get(), loadFile);
+
+        // Track event
+        String baseName = FilenameUtils.getBaseName(href);
+        Application.get().trackEvent("datasets", "load", baseName);
+
     }
 
     @Override
diff --git a/org.gitools.ui.core/src/main/java/org/gitools/ui/core/Application.java b/org.gitools.ui.core/src/main/java/org/gitools/ui/core/Application.java
@@ -26,9 +26,11 @@
 import com.alee.managers.notification.NotificationManager;
 import com.alee.managers.notification.NotificationOption;
 import com.alee.managers.notification.WebNotificationPopup;
+import com.brsanthu.googleanalytics.AwtRequestParameterDiscoverer;
 import com.brsanthu.googleanalytics.EventHit;
 import com.brsanthu.googleanalytics.ExceptionHit;
 import com.brsanthu.googleanalytics.GoogleAnalytics;
+import com.brsanthu.googleanalytics.GoogleAnalyticsConfig;
 import org.gitools.resource.SemanticVersion;
 import org.gitools.ui.core.components.StatusBar;
 import org.gitools.ui.core.components.editor.AbstractEditor;
@@ -72,6 +74,9 @@ public class Application extends JFrame implements IApplicationTracking {
         }
 
         appVersion = new SemanticVersion(settings.getProperty("version"));
+
+        GoogleAnalyticsConfig config = new GoogleAnalyticsConfig();
+        config.setRequestParameterDiscoverer(new AwtRequestParameterDiscoverer());
         analytics = new GoogleAnalytics(appTracking, appName, appVersion.toString());
         analytics.getDefaultRequest().clientId(Settings.get().getUuid());
     }
diff --git a/org.gitools.ui.core/src/main/java/org/gitools/ui/core/actions/AbstractAction.java b/org.gitools.ui.core/src/main/java/org/gitools/ui/core/actions/AbstractAction.java
@@ -65,13 +65,12 @@ public AbstractAction(String name) {
     protected void track(String category, String label) {
 
         if (actionName == null) {
-            getClass().getSimpleName().replace("Action", "");
+            actionName = getClass().getSimpleName().replace("Action", "");
         }
 
         Application.get().trackEvent(category, actionName, label);
     }
 
-
     public void setParentWindow(Window parentWindow) {
         this.parentWindow = parentWindow;
     }
diff --git a/pom.xml b/pom.xml
@@ -237,7 +237,7 @@
             <dependency>
                 <groupId>com.brsanthu</groupId>
                 <artifactId>google-analytics-java</artifactId>
-                <version>1.0.4</version>
+                <version>1.1.1</version>
             </dependency>
 
             <dependency>

Original file line number	Diff line number	Diff line change
`@@ -143,15 +143,27 @@ public void run(IProgressMonitor monitor) {`
`143`	`143`	`}`
`144`	`144`	`});`
`145`	`145`
	`146`	`+ // Track event`
	`147`	`+ String baseName = FilenameUtils.getBaseName(href);`
	`148`	`+ Application.get().trackEvent("datasets", "save", baseName);`
	`149`	`+`
`146`	`150`	`}`
`147`	`151`
`148`	`152`
`149`	`153`	`}`
`150`	`154`
`151`	`155`	`@Override`
`152`	`156`	`protected void performLoad(String href) {`
	`157`	`+`
`153`	`158`	`CommandLoadFile loadFile = new CommandLoadFile(href);`
	`159`	`+`
	`160`	`+ // Execute`
`154`	`161`	`JobThread.execute(Application.get(), loadFile);`
	`162`	`+`
	`163`	`+ // Track event`
	`164`	`+ String baseName = FilenameUtils.getBaseName(href);`
	`165`	`+ Application.get().trackEvent("datasets", "load", baseName);`
	`166`	`+`
`155`	`167`	`}`
`156`	`168`
`157`	`169`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -65,13 +65,12 @@ public AbstractAction(String name) {`
`65`	`65`	`protected void track(String category, String label) {`
`66`	`66`
`67`	`67`	`if (actionName == null) {`
`68`		`- getClass().getSimpleName().replace("Action", "");`
	`68`	`+ actionName = getClass().getSimpleName().replace("Action", "");`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`Application.get().trackEvent(category, actionName, label);`
`72`	`72`	`}`
`73`	`73`
`74`		`-`
`75`	`74`	`public void setParentWindow(Window parentWindow) {`
`76`	`75`	`this.parentWindow = parentWindow;`
`77`	`76`	`}`