[TTS] Write initial Tap-features to Ranker.

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRankerLoggerImpl.java

Index: chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRankerLoggerImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRankerLoggerImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRankerLoggerImpl.java
index f56846a9e1520392f10e63580250c007eebfb28f..075671525b54919d783121707f637d064118a1b3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRankerLoggerImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRankerLoggerImpl.java
@@ -6,16 +6,81 @@ package org.chromium.chrome.browser.contextualsearch;
 
 import org.chromium.base.Log;
 
+import java.net.URL;
+
 /**
  * Implements the UMA logging for Ranker that's used for Contextual Search Tap Suppression.
  */
 public class ContextualSearchRankerLoggerImpl implements ContextualSearchRankerLogger {
     private static final String TAG = "ContextualSearch";
 
+    // The current version of the Ranker model that we use for Contextual Search.
+    private static final int CONTEXTUAL_SEARCH_RANKER_MODEL_VERSION = 0;
+
+    // Pointer to the native instance of this class.
+    private long mNativePointer;
+
+    // The URL of the base page to log with Ranker.
+    private URL mBasePageUrl;
+
+    public ContextualSearchRankerLoggerImpl() {
+        if (isEnabled()) {
+            mNativePointer = nativeInit();
+            if (mBasePageUrl != null) {

[Theresa, 2017/05/12 01:02:25]

Won't mBasePageUrl will always be null in the constructor?

[Donn Denman, 2017/05/12 23:08:55]

You're right, we can remove this section.  Done.

+                nativeSetUkmServiceAndUrls(
+                        mNativePointer, mBasePageUrl.toString(), getContextualSearchRankerUrl());
+            }
+        }
+    }
+
+    /**
+     * This method should be called to clean up storage when an instance of this class is
+     * no longer in use.  The nativeDestroy will call the destructor on the native instance.
+     */
+    void destroy() {
+        if (isEnabled()) {
+            assert mNativePointer != 0;
+            writeLogAndReset();
+            nativeDestroy(mNativePointer);
+            mNativePointer = 0;
+        }
+    }
+
+    @Override
+    public void setBasePageUrl(URL basePageUrl) {
+        if (isEnabled()) {
+            mBasePageUrl = basePageUrl;
+            if (mBasePageUrl != null) {

[Donn Denman, 2017/05/12 23:08:55]

I noticed that this is null for URIs that are not proper URLs, like
chrome://flags.  Updated this class to separately track whether the setup has
been done, and whether we can actually log (which is false for these URIs that
are not URLs).

+                nativeSetUkmServiceAndUrls(
+                        mNativePointer, mBasePageUrl.toString(), getContextualSearchRankerUrl());
+            }
+        }
+    }
+
     @Override
     public void log(Feature feature, Object value) {
-        // TODO(donnd): log to an actual persistent proto ASAP!
-        Log.v(TAG, "log %s with value %s", feature.toString(), value);
+        if (!isEnabled()) {
+            Log.v(TAG, "Ranker data %s: %s", feature, value);
+            return;
+        }
+
+        if (value instanceof String) {
+            nativeLogString(mNativePointer, feature.toString(), value.toString());

[Roger McFarlane (Chromium), 2017/05/12 15:43:26]

Do we have go ahead to do string logging like this?

Maybe hold off on this particular bit of functionality until we've identified a
specific use case and gotten privacy's sign-off.

[Donn Denman, 2017/05/12 23:08:55]

Good point!

Removed all string logging from this class and its associated native class.

+        } else if (value instanceof Boolean) {
+            nativeLogLong(mNativePointer, feature.toString(), ((boolean) value ? 1 : 0));
+        } else if (value instanceof Integer) {
+            Integer i = (int) value;
+            nativeLogLong(mNativePointer, feature.toString(), Long.valueOf(i));
+        } else if (value instanceof Long) {
+            nativeLogLong(mNativePointer, feature.toString(), (long) value);
+        } else if (value instanceof Character) {
+            nativeLogLong(
+                    mNativePointer, feature.toString(), Character.getNumericValue((char) value));
+        } else {
+            Log.w(TAG,
+                    "Could not log feature to Ranker: " + feature.toString() + " of class "
+                            + value.getClass());
+        }
     }
 
     @Override
@@ -25,6 +90,30 @@ public class ContextualSearchRankerLoggerImpl implements ContextualSearchRankerL
 
     @Override
     public void writeLogAndReset() {
-        Log.v(TAG, "Reset!\n");
+        if (isEnabled()) nativeWriteLogAndReset(mNativePointer);
+    }
+
+    // Whether actually writing data is enabled.  If not, we may do nothing or print.
+    private boolean isEnabled() {
+        return ContextualSearchFieldTrial.isRankerLoggingEnabled();
+    }
+
+    // Gets the URL to use for the current Ranker model.
+    private String getContextualSearchRankerUrl() {
+        return "org.chromium.chrome.browser.contextualsearch.v"
+                + CONTEXTUAL_SEARCH_RANKER_MODEL_VERSION;
     }
+
+    // ============================================================================================
+    // Native methods.
+    // ============================================================================================
+    private native long nativeInit();
+    private native void nativeDestroy(long nativeContextualSearchRankerLoggerImpl);
+    private native void nativeLogLong(
+            long nativeContextualSearchRankerLoggerImpl, String featureString, long value);
+    private native void nativeLogString(
+            long nativeContextualSearchRankerLoggerImpl, String featureString, String value);
+    private native void nativeSetUkmServiceAndUrls(
+            long nativeContextualSearchRankerLoggerImpl, String basePageUrl, String modelUrl);
+    private native void nativeWriteLogAndReset(long nativeContextualSearchRankerLoggerImpl);
 }