From 63aaeca2b9e1637407a2199190f6bf03b5d97ff1 Mon Sep 17 00:00:00 2001 From: Vladimir Kryachko Date: Thu, 14 Apr 2022 10:15:15 -0400 Subject: [PATCH 1/2] Disable verbose logging in transport-runtime. fixes #3441 --- .../cct/CctTransportBackend.java | 8 ++-- .../runtime/logging/Logging.java | 37 +++++++++++++++---- 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/CctTransportBackend.java b/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/CctTransportBackend.java index bdd063898c4..d44f182c202 100644 --- a/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/CctTransportBackend.java +++ b/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/CctTransportBackend.java @@ -283,7 +283,7 @@ private BatchedLogRequest getRequestBody(BackendRequest backendRequest) { private HttpResponse doSend(HttpRequest request) throws IOException { - Logging.d(LOG_TAG, "Making request to: %s", request.url); + Logging.i(LOG_TAG, "Making request to: %s", request.url); HttpURLConnection connection = (HttpURLConnection) request.url.openConnection(); connection.setConnectTimeout(CONNECTION_TIME_OUT); connection.setReadTimeout(readTimeout); @@ -315,9 +315,9 @@ private HttpResponse doSend(HttpRequest request) throws IOException { } int responseCode = connection.getResponseCode(); - Logging.i(LOG_TAG, "Status Code: " + responseCode); - Logging.i(LOG_TAG, "Content-Type: " + connection.getHeaderField("Content-Type")); - Logging.i(LOG_TAG, "Content-Encoding: " + connection.getHeaderField("Content-Encoding")); + Logging.i(LOG_TAG, "Status Code: %d", responseCode); + Logging.d(LOG_TAG, "Content-Type: " + connection.getHeaderField("Content-Type")); + Logging.d(LOG_TAG, "Content-Encoding: " + connection.getHeaderField("Content-Encoding")); if (responseCode == 302 || responseCode == 301 || responseCode == 307) { String redirect = connection.getHeaderField("Location"); diff --git a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/logging/Logging.java b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/logging/Logging.java index f46853f8f64..b9ecfd42b17 100644 --- a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/logging/Logging.java +++ b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/logging/Logging.java @@ -24,30 +24,51 @@ private static String getTag(String tag) { } public static void d(String tag, String message) { - Log.d(getTag(tag), message); + tag = getTag(tag); + if (Log.isLoggable(tag, Log.DEBUG)) { + Log.d(tag, message); + } } public static void d(String tag, String message, Object arg1) { - Log.d(getTag(tag), String.format(message, arg1)); + tag = getTag(tag); + if (Log.isLoggable(tag, Log.DEBUG)) { + Log.d(tag, String.format(message, arg1)); + } } public static void d(String tag, String message, Object arg1, Object arg2) { - Log.d(getTag(tag), String.format(message, arg1, arg2)); + tag = getTag(tag); + if (Log.isLoggable(tag, Log.DEBUG)) { + Log.d(tag, String.format(message, arg1, arg2)); + } } public static void d(String tag, String message, Object... args) { - Log.d(getTag(tag), String.format(message, args)); + tag = getTag(tag); + if (Log.isLoggable(tag, Log.DEBUG)) { + Log.d(tag, String.format(message, args)); + } } - public static void i(String tag, String message) { - Log.i(getTag(tag), message); + public static void i(String tag, String message, Object arg1) { + tag = getTag(tag); + if (Log.isLoggable(tag, Log.INFO)) { + Log.i(tag, String.format(message, arg1)); + } } public static void e(String tag, String message, Throwable e) { - Log.e(getTag(tag), message, e); + tag = getTag(tag); + if (Log.isLoggable(tag, Log.ERROR)) { + Log.e(tag, message, e); + } } public static void w(String tag, String message, Object arg1) { - Log.w(getTag(tag), String.format(message, arg1)); + tag = getTag(tag); + if (Log.isLoggable(tag, Log.WARN)) { + Log.w(tag, String.format(message, arg1)); + } } } From a8c355057d49766bed8416bd1a599154a9b1ab20 Mon Sep 17 00:00:00 2001 From: Vladimir Kryachko Date: Thu, 14 Apr 2022 11:03:00 -0400 Subject: [PATCH 2/2] Address review comments. --- .../google/android/datatransport/cct/CctTransportBackend.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/CctTransportBackend.java b/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/CctTransportBackend.java index d44f182c202..7d1f7162a68 100644 --- a/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/CctTransportBackend.java +++ b/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/CctTransportBackend.java @@ -316,8 +316,8 @@ private HttpResponse doSend(HttpRequest request) throws IOException { int responseCode = connection.getResponseCode(); Logging.i(LOG_TAG, "Status Code: %d", responseCode); - Logging.d(LOG_TAG, "Content-Type: " + connection.getHeaderField("Content-Type")); - Logging.d(LOG_TAG, "Content-Encoding: " + connection.getHeaderField("Content-Encoding")); + Logging.d(LOG_TAG, "Content-Type: %s", connection.getHeaderField("Content-Type")); + Logging.d(LOG_TAG, "Content-Encoding: %s", connection.getHeaderField("Content-Encoding")); if (responseCode == 302 || responseCode == 301 || responseCode == 307) { String redirect = connection.getHeaderField("Location");