From 328432d887a4a4946aa8ed4392df324e0054b579 Mon Sep 17 00:00:00 2001
From: Chenjie Yu <cjyu@google.com>
Date: Wed, 24 Oct 2018 16:18:09 -0700
Subject: [PATCH] make testdrive log message less verbose

1. Use custom TestDriveFormatter for log output.
It should be easy to fine tune it from here.
2. Fine tune logging level

Now the output looks like this:

./out/host/linux-x86/bin/statsd_testdrive 10
WARNING: An illegal reflective access operation has occurred
WARNING: Illegal reflective access by com.google.protobuf.Utf8$UnsafeProcessor (file:/android2/master/out/host/linux-x86/framework/statsd_testdrive.jar) to field java.nio.Buffer.address
WARNING: Please consider reporting this to the maintainers of com.google.protobuf.Utf8$UnsafeProcessor
WARNING: Use --illegal-access=warn to enable warnings of further illegal reflective access operations
WARNING: All illegal access operations will be denied in a future release
Pushed the following config to statsd:
id: 12345
event_metric {
  id: 1111
  what: 1234567
}
atom_matcher {
  id: 1234567
  simple_atom_matcher {
    atom_id: 10
  }
}

......

hash_strings_in_metric_report: false

Now please play with the device to trigger the event. All events should be dumped after 1 min ...
Success!
Got following metric data dump:
metric_id: 1111
event_metrics {
  data {

.....

        state: RELEASE
      }
    }
  }
}

Test: manual test
Change-Id: I9fcb09bbd1663f0eae85d428ed45a3b139f62782
---
 .../android/statsd/testdrive/TestDrive.java   | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/cmds/statsd/tools/statsd-testdrive/src/com/android/statsd/testdrive/TestDrive.java b/cmds/statsd/tools/statsd-testdrive/src/com/android/statsd/testdrive/TestDrive.java
index ae3e5a1b1dfa1..cc4e386bfdf0a 100644
--- a/cmds/statsd/tools/statsd-testdrive/src/com/android/statsd/testdrive/TestDrive.java
+++ b/cmds/statsd/tools/statsd-testdrive/src/com/android/statsd/testdrive/TestDrive.java
@@ -31,7 +31,10 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Formatter;
 import java.util.logging.Level;
+import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
 public class TestDrive {
@@ -68,6 +71,12 @@ public class TestDrive {
         mIsPushedAtom = atomId < PULL_ATOM_START;
 
         TestDrive testDrive = new TestDrive();
+        TestDriveFormatter formatter = new TestDriveFormatter();
+        ConsoleHandler handler = new ConsoleHandler();
+        handler.setFormatter(formatter);
+        logger.addHandler(handler);
+        logger.setUseParentHandlers(false);
+
         try {
             StatsdConfig config = testDrive.createConfig(atomId);
             if (config == null) {
@@ -79,7 +88,8 @@ public class TestDrive {
             logger.info(config.toString());
             if (mIsPushedAtom) {
                 logger.info(
-                        "Now please play with the device to trigger the event. All events should be dumped after 1 min ...");
+                        "Now please play with the device to trigger the event. All events should "
+                                + "be dumped after 1 min ...");
                 Thread.sleep(60_000);
             } else {
                 // wait for 2 min
@@ -140,7 +150,7 @@ public class TestDrive {
 
         // Check result
         if (process.waitFor() == 0) {
-            logger.info("Success!");
+            logger.fine("Success!");
         } else {
             // Abnormal termination: Log command parameters and output and throw ExecutionException
             logger.log(Level.SEVERE, out.toString());
@@ -235,8 +245,8 @@ public class TestDrive {
         ConfigMetricsReport report = reportList.getReports(reportList.getReportsCount() - 1);
         // Really should be only one metric.
         if (report.getMetricsCount() != 1) {
-            logger.log(Level.SEVERE, "Only one report metric expected, got "
-                    + report.getMetricsCount());
+            logger.log(Level.SEVERE,
+                    "Only one report metric expected, got " + report.getMetricsCount());
             return;
         }
 
@@ -283,4 +293,10 @@ public class TestDrive {
                     + "allowed_log_source: \"AID_BLUETOOTH\"\n"
                     + "\n"
                     + "hash_strings_in_metric_report: false";
+
+    public static class TestDriveFormatter extends Formatter {
+        public String format(LogRecord record) {
+            return record.getMessage() + "\n";
+        }
+    }
 }