Make minimum change to allow WestWorld atom updates.
This piece of code will later be updated when export the actual logging
code.
BUG: 205122184
Change-Id: I89e0c5b20f951ef1c42753a101bd9458ca7b27e8
Merged-In: I89e0c5b20f951ef1c42753a101bd9458ca7b27e8
diff --git a/java/src/com/android/textclassifier/downloader/TextClassifierDownloadLogger.java b/java/src/com/android/textclassifier/downloader/TextClassifierDownloadLogger.java
index c6951c2..048ba6a 100644
--- a/java/src/com/android/textclassifier/downloader/TextClassifierDownloadLogger.java
+++ b/java/src/com/android/textclassifier/downloader/TextClassifierDownloadLogger.java
@@ -64,10 +64,6 @@
TextClassifierStatsLog
.TEXT_CLASSIFIER_DOWNLOAD_REPORTED__FAILURE_REASON__UNKNOWN_FAILURE_REASON)
.put(
- ModelDownloadException.FAILED_TO_SCHEDULE,
- TextClassifierStatsLog
- .TEXT_CLASSIFIER_DOWNLOAD_REPORTED__FAILURE_REASON__FAILED_TO_SCHEDULE)
- .put(
ModelDownloadException.FAILED_TO_DOWNLOAD_SERVICE_CONN_BROKEN,
TextClassifierStatsLog
.TEXT_CLASSIFIER_DOWNLOAD_REPORTED__FAILURE_REASON__FAILED_TO_DOWNLOAD_SERVICE_CONN_BROKEN)
@@ -91,42 +87,8 @@
ModelDownloadException.FAILED_TO_VALIDATE_MODEL,
TextClassifierStatsLog
.TEXT_CLASSIFIER_DOWNLOAD_REPORTED__FAILURE_REASON__FAILED_TO_VALIDATE_MODEL)
- .put(
- ModelDownloadException.FAILED_TO_MOVE_MODEL,
- TextClassifierStatsLog
- .TEXT_CLASSIFIER_DOWNLOAD_REPORTED__FAILURE_REASON__FAILED_TO_MOVE_MODEL)
- .put(
- ModelDownloadException.WORKER_STOPPED,
- TextClassifierStatsLog
- .TEXT_CLASSIFIER_DOWNLOAD_REPORTED__FAILURE_REASON__WORKER_STOPPED)
.build();
- /** Logs a scheduled download task. */
- public static void downloadSceduled(@ModelTypeDef String modelType, String url) {
- Preconditions.checkArgument(!TextUtils.isEmpty(url), "url cannot be null/empty");
- TextClassifierStatsLog.write(
- TextClassifierStatsLog.TEXT_CLASSIFIER_DOWNLOAD_REPORTED,
- MODEL_TYPE_MAP.getOrDefault(modelType, DEFAULT_MODEL_TYPE),
- DEFAULT_FILE_TYPE,
- DOWNLOAD_STATUS_SCHEDULED,
- url,
- DEFAULT_FAILURE_REASON,
- /* runAttemptCount */ 0);
- if (TcLog.ENABLE_FULL_LOGGING) {
- TcLog.v(
- TAG,
- String.format(
- "Download Reported: modelType=%s, fileType=%d, status=%d, url=%s, "
- + "failureReason=%d, runAttemptCount=%d",
- MODEL_TYPE_MAP.getOrDefault(modelType, DEFAULT_MODEL_TYPE),
- DEFAULT_FILE_TYPE,
- DOWNLOAD_STATUS_SCHEDULED,
- url,
- DEFAULT_FAILURE_REASON,
- /* runAttemptCount */ 0));
- }
- }
-
/** Logs a succeeded download task. */
public static void downloadSucceeded(
@ModelTypeDef String modelType, String url, int runAttemptCount) {
@@ -138,7 +100,10 @@
DOWNLOAD_STATUS_SUCCEEDED,
url,
DEFAULT_FAILURE_REASON,
- runAttemptCount);
+ runAttemptCount,
+ /* downloaderLibErrorCode */ 0,
+ /* downloadDurationMillis */ 0,
+ /* workId */ 0L);
if (TcLog.ENABLE_FULL_LOGGING) {
TcLog.v(
TAG,
@@ -165,7 +130,10 @@
DOWNLOAD_STATUS_FAILED_AND_RETRY,
url,
FAILURE_REASON_MAP.getOrDefault(errorCode, DEFAULT_FAILURE_REASON),
- runAttemptCount);
+ runAttemptCount,
+ /* downloaderLibErrorCode */ 0,
+ /* downloadDurationMillis */ 0,
+ /* workId */ 0L);
if (TcLog.ENABLE_FULL_LOGGING) {
TcLog.v(
TAG,
@@ -181,32 +149,5 @@
}
}
- /** Logs a failed download task which will not be retried. */
- public static void downloadFailedAndAbort(
- @ModelTypeDef String modelType, String url, @ErrorCode int errorCode, int runAttemptCount) {
- Preconditions.checkArgument(!TextUtils.isEmpty(url), "url cannot be null/empty");
- TextClassifierStatsLog.write(
- TextClassifierStatsLog.TEXT_CLASSIFIER_DOWNLOAD_REPORTED,
- MODEL_TYPE_MAP.getOrDefault(modelType, DEFAULT_MODEL_TYPE),
- DEFAULT_FILE_TYPE,
- DOWNLOAD_STATUS_FAILED_AND_ABORT,
- url,
- FAILURE_REASON_MAP.getOrDefault(errorCode, DEFAULT_FAILURE_REASON),
- runAttemptCount);
- if (TcLog.ENABLE_FULL_LOGGING) {
- TcLog.v(
- TAG,
- String.format(
- "Download Reported: modelType=%s, fileType=%d, status=%d, url=%s, "
- + "failureReason=%d, runAttemptCount=%d",
- MODEL_TYPE_MAP.getOrDefault(modelType, DEFAULT_MODEL_TYPE),
- DEFAULT_FILE_TYPE,
- DOWNLOAD_STATUS_FAILED_AND_ABORT,
- url,
- FAILURE_REASON_MAP.getOrDefault(errorCode, DEFAULT_FAILURE_REASON),
- runAttemptCount));
- }
- }
-
private TextClassifierDownloadLogger() {}
}
diff --git a/java/tests/instrumentation/src/com/android/textclassifier/downloader/TextClassifierDownloadLoggerTest.java b/java/tests/instrumentation/src/com/android/textclassifier/downloader/TextClassifierDownloadLoggerTest.java
index d69f53a..f979021 100644
--- a/java/tests/instrumentation/src/com/android/textclassifier/downloader/TextClassifierDownloadLoggerTest.java
+++ b/java/tests/instrumentation/src/com/android/textclassifier/downloader/TextClassifierDownloadLoggerTest.java
@@ -44,17 +44,6 @@
new TextClassifierDownloadLoggerTestRule();
@Test
- public void downloadScheduled() throws Exception {
- TextClassifierDownloadLogger.downloadSceduled(MODEL_TYPE, URL);
-
- TextClassifierDownloadReported atom = Iterables.getOnlyElement(loggerTestRule.getLoggedAtoms());
- assertThat(atom.getDownloadStatus())
- .isEqualTo(TextClassifierDownloadReported.DownloadStatus.SCHEDULED);
- assertThat(atom.getModelType()).isEqualTo(MODEL_TYPE_ATOM);
- assertThat(atom.getUrlSuffix()).isEqualTo(URL);
- }
-
- @Test
public void downloadSucceeded() throws Exception {
TextClassifierDownloadLogger.downloadSucceeded(MODEL_TYPE, URL, RUN_ATTEMPT_COUNT);
@@ -79,18 +68,4 @@
assertThat(atom.getRunAttemptCount()).isEqualTo(RUN_ATTEMPT_COUNT);
assertThat(atom.getFailureReason()).isEqualTo(FAILURE_REASON_ATOM);
}
-
- @Test
- public void downloadFailedAndAbort() throws Exception {
- TextClassifierDownloadLogger.downloadFailedAndAbort(
- MODEL_TYPE, URL, ERROR_CODE, RUN_ATTEMPT_COUNT);
-
- TextClassifierDownloadReported atom = Iterables.getOnlyElement(loggerTestRule.getLoggedAtoms());
- assertThat(atom.getDownloadStatus())
- .isEqualTo(TextClassifierDownloadReported.DownloadStatus.FAILED_AND_ABORT);
- assertThat(atom.getModelType()).isEqualTo(MODEL_TYPE_ATOM);
- assertThat(atom.getUrlSuffix()).isEqualTo(URL);
- assertThat(atom.getRunAttemptCount()).isEqualTo(RUN_ATTEMPT_COUNT);
- assertThat(atom.getFailureReason()).isEqualTo(FAILURE_REASON_ATOM);
- }
}
