Updates FirebaseMlLogEvent ModelOption name to Options to make internal proto. This allows for proper json to proto conversion and in local tests messages now reach the spanner queue.

Author: annzimmer

firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/DataTransportMlEventSender.java

@@ -14,7 +14,6 @@
 
 package com.google.firebase.ml.modeldownloader.internal;
 
-import android.util.Log;
 import androidx.annotation.NonNull;
 import com.google.android.datatransport.Encoding;
 import com.google.android.datatransport.Event;
@@ -49,11 +48,8 @@ public static DataTransportMlEventSender create(TransportFactory transportFactor
   }
 
   public void sendEvent(@NonNull FirebaseMlLogEvent firebaseMlLogEvent) {
-    // Thoughts? Use .send or .schedule - which gives back task of logging progress? Not sure how
-    // strongly we feel about tracking these?
-    Log.e("ANNZ", "stats: " + firebaseMlLogEvent);
+    // TODO Use .send or .schedule - which gives back task of logging progress?
+    //  Not sure how strongly we feel about tracking these? I'm happy to use plain send.
     transport.send(Event.ofData(firebaseMlLogEvent));
-
-    Log.e("ANNZ", "stats: " + Event.ofData(firebaseMlLogEvent));
   }
 }

firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/FirebaseMlLogEvent.java

@@ -272,8 +272,7 @@ public abstract static class Builder {
     }
 
     @NonNull
-    @Encodable.Field(name = "options")
-    public abstract ModelOptions getModelOptions();
+    public abstract ModelOptions getOptions();
 
     /** Builder for {@link ModelDownloadLogEvent}. */
     @AutoValue.Builder
@@ -294,7 +293,7 @@ public abstract static class Builder {
       public abstract Builder setExactDownloadDurationMs(long value);
 
       @NonNull
-      public abstract Builder setModelOptions(@NonNull ModelOptions value);
+      public abstract Builder setOptions(@NonNull ModelOptions value);
 
       @NonNull
       public abstract ModelDownloadLogEvent build();

firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/FirebaseMlLogger.java

@@ -114,7 +114,7 @@ private void logDownloadEvent(
             .setErrorCode(errorCode)
             .setDownloadStatus(status)
             .setDownloadFailureStatus(failureStatusCode)
-            .setModelOptions(optionsProto);
+            .setOptions(optionsProto);
     if (shouldLogRoughDownloadTime) {
       long downloadBeginTimeMs = sharedPreferencesUtil.getModelDownloadBeginTimeMs(customModel);
       if (downloadBeginTimeMs == 0L) {

firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/FirebaseMlLogEventTest.java

@@ -67,7 +67,7 @@ public void testLogRequest_jsonToProto() throws InvalidProtocolBufferException {
                         com.google.firebase.ml.modeldownloader.internal.FirebaseMlLogEvent
                             .ModelDownloadLogEvent.ErrorCode.DOWNLOAD_FAILED)
                     .setRoughDownloadDurationMs(100)
-                    .setModelOptions(
+                    .setOptions(
                         com.google.firebase.ml.modeldownloader.internal.FirebaseMlLogEvent
                             .ModelDownloadLogEvent.ModelOptions.builder()
                             .setModelInfo(

firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/FirebaseMlLoggerTest.java

@@ -124,7 +124,7 @@ public void logDownloadFailureWithReason() {
                     .setEventName(EventName.MODEL_DOWNLOAD)
                     .setModelDownloadLogEvent(
                         ModelDownloadLogEvent.builder()
-                            .setModelOptions(MODEL_OPTIONS)
+                            .setOptions(MODEL_OPTIONS)
                             .setRoughDownloadDurationMs(1000L)
                             .setErrorCode(ErrorCode.DOWNLOAD_FAILED)
                             .setDownloadStatus(DownloadStatus.FAILED)
@@ -149,7 +149,7 @@ public void logDownloadFailureWithReason_getModelDownloadBeginTimeMsNull() {
                     .setEventName(EventName.MODEL_DOWNLOAD)
                     .setModelDownloadLogEvent(
                         ModelDownloadLogEvent.builder()
-                            .setModelOptions(MODEL_OPTIONS)
+                            .setOptions(MODEL_OPTIONS)
                             .setErrorCode(ErrorCode.DOWNLOAD_FAILED)
                             .setDownloadStatus(DownloadStatus.FAILED)
                             .setDownloadFailureStatus(405)
@@ -172,7 +172,7 @@ public void logDownloadEventWithExactDownloadTime() {
                     .setEventName(EventName.MODEL_DOWNLOAD)
                     .setModelDownloadLogEvent(
                         ModelDownloadLogEvent.builder()
-                            .setModelOptions(MODEL_OPTIONS)
+                            .setOptions(MODEL_OPTIONS)
                             .setExactDownloadDurationMs(1500L)
                             .setErrorCode(ErrorCode.NO_ERROR)
                             .setDownloadStatus(DownloadStatus.SUCCEEDED)
@@ -198,7 +198,7 @@ public void logDownloadEventWithExactDownloadTime_getModelDownloadBeginTimeMsNul
                     .setEventName(EventName.MODEL_DOWNLOAD)
                     .setModelDownloadLogEvent(
                         ModelDownloadLogEvent.builder()
-                            .setModelOptions(MODEL_OPTIONS)
+                            .setOptions(MODEL_OPTIONS)
                             .setErrorCode(ErrorCode.NO_ERROR)
                             .setDownloadStatus(DownloadStatus.SUCCEEDED)
                             .build())