jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Migrate ToCInteractionFunnel to standard sampling logic ......................................................................
Hygiene: Migrate ToCInteractionFunnel to standard sampling logic Recently some more standardised sampling logic was added to the Funnel class, so that child classes didn't have to reimplement it, which reduces code duplication. Most classes were switched over to this, but ToCInteractionFunnel still uses the old sampling method. It should be migrated to the new version. Bug: T102212 Change-Id: I95fb587d15590147152bc72d9a8f058ee82a095c --- M wikipedia/src/main/java/org/wikipedia/analytics/ToCInteractionFunnel.java 1 file changed, 3 insertions(+), 14 deletions(-) Approvals: Dbrant: Looks good to me, approved Niedzielski: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wikipedia/src/main/java/org/wikipedia/analytics/ToCInteractionFunnel.java b/wikipedia/src/main/java/org/wikipedia/analytics/ToCInteractionFunnel.java index d78f3bb..9d0f7c3 100644 --- a/wikipedia/src/main/java/org/wikipedia/analytics/ToCInteractionFunnel.java +++ b/wikipedia/src/main/java/org/wikipedia/analytics/ToCInteractionFunnel.java @@ -8,6 +8,7 @@ public class ToCInteractionFunnel extends Funnel { private static final String SCHEMA_NAME = "MobileWikiAppToCInteraction"; private static final int REV_ID = 11014396; + private static final int DEFAULT_SAMPLE_RATE = 100; private final String appInstallID; private final Site site; @@ -32,23 +33,11 @@ } protected void log(Object... params) { - final int defaultSampleRate = 100; - //get our sampling rate from remote config int sampleRate = WikipediaApp.getInstance().getRemoteConfig().getConfig() - .optInt("tocLogSampleRate", defaultSampleRate); + .optInt("tocLogSampleRate", DEFAULT_SAMPLE_RATE); + super.log(site, sampleRate, params); - if (sampleRate != 0) { - //take the last 4 hex digits of the uuid, modulo the sampling coefficient. - //if the result is 0, then we're one of the Chosen. - final int uuidSubstrLen = 4; - final int hexBase = 16; - boolean chosen = Integer.parseInt(appInstallID.substring(appInstallID.length() - uuidSubstrLen), hexBase) % sampleRate == 0; - - if (chosen) { - super.log(site, params); - } - } } public void logOpen() { -- To view, visit https://gerrit.wikimedia.org/r/217764 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I95fb587d15590147152bc72d9a8f058ee82a095c Gerrit-PatchSet: 3 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Deskana <dga...@wikimedia.org> Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org> Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org> Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org> Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org> Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits