chore: simplify log (#19)

Co-authored-by: xiaoweii <[email protected]>

Author: zhu-xiaowei

README.md

@@ -20,7 +20,7 @@ Add the following dependency to your `app` module's `build.gradle` file.
 
 ```groovy
 dependencies {
-    implementation 'software.aws.solution:clickstream:0.4.1'
+    implementation 'software.aws.solution:clickstream:0.4.4'
 }
 ```
 

clickstream/src/main/java/software/aws/solution/clickstream/AutoEventSubmitter.java

@@ -23,8 +23,6 @@
 import com.amazonaws.logging.Log;
 import com.amazonaws.logging.LogFactory;
 
-import java.util.Locale;
-
 /**
  * Submits all the recorded event periodically.
  */
@@ -40,7 +38,6 @@ final class AutoEventSubmitter {
         this.handler = new Handler(handlerThread.getLooper());
         this.autoFlushInterval = autoFlushInterval;
         this.submitRunnable = () -> {
-            LOG.debug(String.format(Locale.US, "Auto submitting events after %d seconds", autoFlushInterval));
             Amplify.Analytics.flushEvents();
             handler.postDelayed(this.submitRunnable, autoFlushInterval);
         };

clickstream/src/main/java/software/aws/solution/clickstream/client/EventRecorder.java

@@ -125,10 +125,9 @@ int processEvents() {
         try (Cursor cursor = dbUtil.queryAllEvents()) {
             if (!cursor.moveToFirst()) {
                 // if the cursor is empty there is nothing to do.
-                LOG.info("No events available to submit.");
                 return totalEventNumber;
             }
-
+            LOG.debug("Start flushing events");
             int submissions = 0;
             do {
                 final String[] event = this.getBatchOfEvents(cursor);
@@ -147,14 +146,14 @@ int processEvents() {
                     int deleteSize = dbUtil.deleteBatchEvents(lastId);
                     submissions++;
                     totalEventNumber += deleteSize;
-                    LOG.info("deleted event number: " + deleteSize);
+                    LOG.debug("Send event number: " + deleteSize);
                 } catch (final IllegalArgumentException exc) {
                     LOG.error(
                         String.format(Locale.US, "Failed to delete last event: %d with %s", lastId, exc.getMessage()));
                 }
                 // if the submissions time
                 if (submissions >= DEFAULT_MAX_SUBMISSIONS_ALLOWED) {
-                    LOG.info("reached maxSubmissions: " + DEFAULT_MAX_SUBMISSIONS_ALLOWED);
+                    LOG.debug("Reached maxSubmissions: " + DEFAULT_MAX_SUBMISSIONS_ALLOWED);
                     break;
                 }
             } while (cursor.moveToNext());

clickstream/src/test/java/software/aws/solution/clickstream/EventRecorderTest.java

@@ -299,7 +299,6 @@ public void testProcessNoneEvent() throws Exception {
         setRequestPath(COLLECT_SUCCESS);
         assertEquals(0, dbUtil.getTotalNumber());
         int totalEventNumber = (int) ReflectUtil.invokeMethod(eventRecorder, "processEvents");
-        verify(log).info("No events available to submit.");
         assertEquals(0, totalEventNumber);
     }
 
@@ -381,8 +380,8 @@ public void testProcessEventNearReachMaxSubmissions() throws Exception {
         assertEquals(20, dbUtil.getTotalNumber());
         int eventNumber = (int) ReflectUtil.invokeMethod(eventRecorder, "processEvents");
         assertEquals(20, eventNumber);
-        verify(log).info("deleted event number: 12");
-        verify(log).info("deleted event number: 8");
+        verify(log).debug("Send event number: 12");
+        verify(log).debug("Send event number: 8");
         assertEquals(0, dbUtil.getTotalNumber());
 
     }
@@ -404,8 +403,8 @@ public void testProcessEventReachedMaxSubmissions() throws Exception {
         assertEquals(40, dbUtil.getTotalNumber());
         int eventNumber = (int) ReflectUtil.invokeMethod(eventRecorder, "processEvents");
         assertEquals(36, eventNumber);
-        verify(log, times(3)).info("deleted event number: 12");
-        verify(log).info("reached maxSubmissions: 3");
+        verify(log, times(3)).debug("Send event number: 12");
+        verify(log).debug("Reached maxSubmissions: 3");
         assertEquals(4, dbUtil.getTotalNumber());
     }
 
@@ -445,8 +444,8 @@ public void testSubmitPartOfEventForMultiRequest() throws Exception {
         eventRecorder.submitEvents();
         assertEquals(1, ((ThreadPoolExecutor) executorService).getTaskCount());
         Thread.sleep(1500);
-        verify(log, times(3)).info("deleted event number: 12");
-        verify(log).info("reached maxSubmissions: 3");
+        verify(log, times(3)).debug("Send event number: 12");
+        verify(log).debug("Reached maxSubmissions: 3");
         assertEquals(4, dbUtil.getTotalNumber());
     }
 
@@ -470,9 +469,9 @@ public void testSubmitAllEventForMultiRequest() throws Exception {
         assertEquals(2, ((ThreadPoolExecutor) executorService).getTaskCount());
         assertTrue(((ThreadPoolExecutor) executorService).getActiveCount() < 2);
         Thread.sleep(1500);
-        verify(log, times(3)).info("deleted event number: 12");
-        verify(log).info("reached maxSubmissions: 3");
-        verify(log).info("deleted event number: 4");
+        verify(log, times(3)).debug("Send event number: 12");
+        verify(log).debug("Reached maxSubmissions: 3");
+        verify(log).debug("Send event number: 4");
         assertEquals(0, dbUtil.getTotalNumber());
     }
 
@@ -497,10 +496,9 @@ public void testTimerThreeTimesSubmitAllEventForMultiRequest() throws Exception
             eventRecorder.submitEvents();
         }
         Thread.sleep(1500);
-        verify(log, times(3)).info("deleted event number: 12");
-        verify(log).info("reached maxSubmissions: 3");
-        verify(log).info("deleted event number: 4");
-        verify(log).info("No events available to submit.");
+        verify(log, times(3)).debug("Send event number: 12");
+        verify(log).debug("Reached maxSubmissions: 3");
+        verify(log).debug("Send event number: 4");
         assertEquals(0, dbUtil.getTotalNumber());
     }
 

gradle.properties

@@ -12,7 +12,7 @@ org.gradle.jvmargs=-Xmx4g
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 org.gradle.parallel=true
 
-VERSION_NAME=0.4.1
+VERSION_NAME=0.4.4
 
 POM_GROUP=software.aws.solution
 POM_ARTIFACT_ID=clickstream