Dbrant has submitted this change and it was merged.
Change subject: Improve log messages for EventLogging.
......................................................................
Improve log messages for EventLogging.
When I'm testing what events are transmitted and to what schemas, it can get
really confusing. This patch tweaks and standardises the log messages recorded
when EventLogging events take place, so that it's easier to see from logcat
what is being transmitted to where.
Change-Id: I03e92aecf4a5a056b65ffa89b01ad8336da34193
---
M wikipedia/src/main/java/org/wikipedia/analytics/EventLoggingEvent.java
M wikipedia/src/main/java/org/wikipedia/analytics/Funnel.java
2 files changed, 10 insertions(+), 9 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
diff --git
a/wikipedia/src/main/java/org/wikipedia/analytics/EventLoggingEvent.java
b/wikipedia/src/main/java/org/wikipedia/analytics/EventLoggingEvent.java
index 3335f8c..7d52a81 100644
--- a/wikipedia/src/main/java/org/wikipedia/analytics/EventLoggingEvent.java
+++ b/wikipedia/src/main/java/org/wikipedia/analytics/EventLoggingEvent.java
@@ -67,19 +67,13 @@
String dataURL = Uri.parse(elUrl)
.buildUpon().query(data.toString())
.build().toString();
- Log.d("Wikipedia", "hitting " + dataURL);
return HttpRequest.get(dataURL).header("User-Agent",
userAgent).code();
- }
-
- @Override
- public void onFinish(Integer result) {
- Log.d("Wikipedia", "result is " + result);
}
@Override
public void onCatch(Throwable caught) {
// Do nothing bad. EL data is ok to lose.
- Log.d("Wikipedia", "Lost EL data: " + data.toString());
+ Log.d(Funnel.ANALYTICS_TAG, "Lost EL data: " + data.toString());
}
}
}
diff --git a/wikipedia/src/main/java/org/wikipedia/analytics/Funnel.java
b/wikipedia/src/main/java/org/wikipedia/analytics/Funnel.java
index e3d0246..4ec1a96 100644
--- a/wikipedia/src/main/java/org/wikipedia/analytics/Funnel.java
+++ b/wikipedia/src/main/java/org/wikipedia/analytics/Funnel.java
@@ -1,6 +1,5 @@
package org.wikipedia.analytics;
-
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import android.util.Log;
@@ -15,6 +14,11 @@
private final String schemaName;
private final int revision;
private final WikipediaApp app;
+
+ /**
+ * The tag used for any analytics-related events sent to the Log.
+ */
+ public static final String ANALYTICS_TAG = "Analytics";
private final SharedPreferences prefs;
protected Funnel(WikipediaApp app, String schemaName, int revision) {
@@ -72,11 +76,14 @@
}
JSONObject eventData = new JSONObject();
+ //Build the string which is logged to debug EventLogging code
+ String logString = this.getClass().getSimpleName() + ": Sending event";
try {
for (int i = 0; i < params.length; i += 2) {
eventData.put(params[i].toString(), params[i + 1]);
- Log.d("Wikipedia", params[i] + " " + params[i + 1]);
+ logString += ", event_" + params[i] + " = " + params[i + 1];
}
+ Log.d(ANALYTICS_TAG, logString);
} catch (JSONException e) {
// This does not happen
throw new RuntimeException(e);
--
To view, visit https://gerrit.wikimedia.org/r/174916
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I03e92aecf4a5a056b65ffa89b01ad8336da34193
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Deskana <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
