From d5f54135771396599f1025ee40270518e41fd7c4 Mon Sep 17 00:00:00 2001 From: bidetofevil Date: Wed, 15 May 2024 22:33:22 -0700 Subject: [PATCH] Remove extra logging --- .../android/fcm/FirebaseSwazzledHooks.java | 1 - .../callback/okhttp3/OkHttpClient.java | 21 +++---------------- .../android/embracesdk/ViewSwazzledHooks.java | 4 +--- .../WebViewChromeClientSwazzledHooks.java | 1 - .../network/http/EmbraceHttpPathOverride.java | 16 -------------- .../EmbraceHttpUrlConnectionOverride.java | 4 ---- .../http/EmbraceUrlConnectionDelegate.java | 3 +-- .../http/EmbraceUrlStreamHandlerFactory.java | 1 - .../http/StreamHandlerFactoryInstaller.java | 5 ----- 9 files changed, 5 insertions(+), 51 deletions(-) diff --git a/embrace-android-fcm/src/main/java/io/embrace/android/embracesdk/fcm/swazzle/callback/com/android/fcm/FirebaseSwazzledHooks.java b/embrace-android-fcm/src/main/java/io/embrace/android/embracesdk/fcm/swazzle/callback/com/android/fcm/FirebaseSwazzledHooks.java index 620d219c0..2bcb2b96d 100644 --- a/embrace-android-fcm/src/main/java/io/embrace/android/embracesdk/fcm/swazzle/callback/com/android/fcm/FirebaseSwazzledHooks.java +++ b/embrace-android-fcm/src/main/java/io/embrace/android/embracesdk/fcm/swazzle/callback/com/android/fcm/FirebaseSwazzledHooks.java @@ -105,7 +105,6 @@ private static void handleRemoteMessage(@NonNull RemoteMessage message) { } private static void logError(@NonNull String message, @Nullable Exception e) { - Embrace.getInstance().getInternalInterface().logError(message, null, null, false); if (e != null) { Embrace.getInstance().getInternalInterface().logInternalError(e); } diff --git a/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/swazzle/callback/okhttp3/OkHttpClient.java b/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/swazzle/callback/okhttp3/OkHttpClient.java index 29df31c9e..2c9d7fc94 100644 --- a/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/swazzle/callback/okhttp3/OkHttpClient.java +++ b/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/swazzle/callback/okhttp3/OkHttpClient.java @@ -34,13 +34,11 @@ private Builder() { */ @SuppressWarnings("MethodNameCheck") public static void _preBuild(okhttp3.OkHttpClient.Builder thiz) { - logInfo("Embrace OkHTTP Wrapper; onPrebuild"); addEmbraceInterceptors(thiz); } @SuppressWarnings("MethodNameCheck") public static void _constructorOnPostBody(okhttp3.OkHttpClient.Builder thiz) { - logInfo("Embrace OkHTTP Wrapper; onPostBody"); addEmbraceInterceptors(thiz); } @@ -51,15 +49,14 @@ public static void _constructorOnPostBody(okhttp3.OkHttpClient.Builder thiz) { */ private static void addEmbraceInterceptors(okhttp3.OkHttpClient.Builder thiz) { try { - logInfo("Embrace OkHTTP Wrapper; Adding interceptors"); addInterceptor(thiz.interceptors(), new EmbraceOkHttp3ApplicationInterceptor()); addInterceptor(thiz.networkInterceptors(), new EmbraceOkHttp3NetworkInterceptor()); } catch (NoSuchMethodError exception) { // The customer may be overwriting OkHttpClient with their own implementation, and some of the // methods we use are missing. - logError("Altered OkHttpClient implementation, could not add OkHttp interceptor. ", exception); + logInternalError("Altered OkHttpClient implementation, could not add OkHttp interceptor. ", exception); } catch (Exception exception) { - logError("Could not add OkHttp interceptor. ", exception); + logInternalError("Could not add OkHttp interceptor. ", exception); } } @@ -73,10 +70,6 @@ private static void addInterceptor(List interceptors, Interceptor interceptor) { if (interceptors != null && !containsInstance(interceptors, interceptor.getClass())) { interceptors.add(0, interceptor); - } else { - logInfo( - "Not adding interceptor [" + interceptor.getClass().getSimpleName() + "]" - ); } } @@ -92,21 +85,13 @@ private static boolean containsInstance(List elementsList, Class clazz) { for (T classInstance : elementsList) { if (clazz.isInstance(classInstance)) { - logInfo( - "[" + clazz.getSimpleName() + "] already present in list" - ); return true; } } return false; } - private static void logInfo(String message) { - Embrace.getInstance().getInternalInterface().logInfo(message, null); - } - - private static void logError(String message, Throwable throwable) { - Embrace.getInstance().getInternalInterface().logError(message, null, null, false); + private static void logInternalError(String message, Throwable throwable) { Embrace.getInstance().getInternalInterface().logInternalError(throwable); } } diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/ViewSwazzledHooks.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/ViewSwazzledHooks.java index b45779796..b0385918f 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/ViewSwazzledHooks.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/ViewSwazzledHooks.java @@ -1,12 +1,11 @@ package io.embrace.android.embracesdk; -import kotlin.Pair; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; import io.embrace.android.embracesdk.annotation.InternalApi; import io.embrace.android.embracesdk.payload.TapBreadcrumb.TapBreadcrumbType; +import kotlin.Pair; /** * @hide @@ -44,7 +43,6 @@ static void logOnClickEvent(android.view.View view, TapBreadcrumbType breadcrumb } private static void logError(@NonNull String message, @Nullable Throwable throwable) { - Embrace.getInstance().getInternalInterface().logError(message, null, null, false); if (throwable != null) { Embrace.getInstance().getInternalInterface().logInternalError(throwable); } diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/WebViewChromeClientSwazzledHooks.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/WebViewChromeClientSwazzledHooks.java index d679c0f31..9aff94818 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/WebViewChromeClientSwazzledHooks.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/WebViewChromeClientSwazzledHooks.java @@ -17,6 +17,5 @@ private WebViewChromeClientSwazzledHooks() { @SuppressWarnings("MethodNameCheck") public static void _preOnConsoleMessage(@NonNull ConsoleMessage consoleMessage) { - Embrace.getInstance().getInternalInterface().logInfo("webview _preOnConsoleMessage", null); } } diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpPathOverride.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpPathOverride.java index ff9f5a9c3..3e8e1c541 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpPathOverride.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpPathOverride.java @@ -4,10 +4,8 @@ import androidx.annotation.Nullable; import java.nio.charset.StandardCharsets; -import java.util.Locale; import java.util.regex.Pattern; -import io.embrace.android.embracesdk.Embrace; import io.embrace.android.embracesdk.annotation.InternalApi; @InternalApi @@ -54,38 +52,24 @@ public static String getURLString(@NonNull HttpPathOverrideRequest request, @Nul private static Boolean validatePathOverride(String path) { if (path == null) { - logError("URL relative path cannot be null"); return false; } if (path.isEmpty()) { - logError("Relative path must have non-zero length"); return false; } if (path.length() > RELATIVE_PATH_MAX_LENGTH) { - logError(String.format(Locale.US, - "Relative path %s is greater than the maximum allowed length of %d. It will be ignored", - path, RELATIVE_PATH_MAX_LENGTH)); return false; } if (!StandardCharsets.US_ASCII.newEncoder().canEncode(path)) { - logError("Relative path must not contain unicode " + - "characters. Relative path " + path + " will be ignored."); return false; } if (!path.startsWith("/")) { - logError("Relative path must start with a /"); return false; } if (!RELATIVE_PATH_PATTERN.matcher(path).matches()) { - logError("Relative path contains invalid chars. " + - "Relative path " + path + " will be ignored."); return false; } return true; } - - private static void logError(@NonNull String message) { - Embrace.getInstance().getInternalInterface().logError(message, null, null, false); - } } \ No newline at end of file diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlConnectionOverride.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlConnectionOverride.java index 627fe97e8..f1573042d 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlConnectionOverride.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlConnectionOverride.java @@ -7,8 +7,6 @@ import java.net.MalformedURLException; import java.net.URL; -import io.embrace.android.embracesdk.Embrace; - class EmbraceHttpUrlConnectionOverride implements HttpPathOverrideRequest { private final HttpURLConnection connection; @@ -30,8 +28,6 @@ public String getOverriddenURL(@NonNull String pathOverride) { return new URL(connection.getURL().getProtocol(), connection.getURL().getHost(), connection.getURL().getPort(), pathOverride + "?" + connection.getURL().getQuery()).toString(); } catch (MalformedURLException e) { - Embrace.getInstance().getInternalInterface().logError( - "Failed to override path of " + connection.getURL() + " with " + pathOverride, null, null, false); return connection.getURL().toString(); } } diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlConnectionDelegate.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlConnectionDelegate.java index 170a5501b..73de66c9b 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlConnectionDelegate.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlConnectionDelegate.java @@ -662,8 +662,7 @@ private void identifyTraceId() { try { traceId = getRequestProperty(embrace.getTraceIdHeader()); } catch (Exception e) { - Embrace.getInstance().getInternalInterface().logWarning( - "Failed to retrieve actual trace id header. Current: " + traceId, null, null); + // don't do anything } } } diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlStreamHandlerFactory.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlStreamHandlerFactory.java index b674704b8..735ffb92f 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlStreamHandlerFactory.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlStreamHandlerFactory.java @@ -44,7 +44,6 @@ static URLStreamHandler newUrlStreamHandler(String className) { } private static void logError(@NonNull String message, @Nullable Throwable throwable) { - Embrace.getInstance().getInternalInterface().logError(message, null, null, false); if (throwable != null) { Embrace.getInstance().getInternalInterface().logInternalError(throwable); } diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/StreamHandlerFactoryInstaller.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/StreamHandlerFactoryInstaller.java index 8f5ad6492..a927c51e5 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/StreamHandlerFactoryInstaller.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/StreamHandlerFactoryInstaller.java @@ -48,12 +48,8 @@ static void registerFactory(Boolean enableRequestSizeCapture) { Object existingFactory = getFactoryField().get(null); if (existingFactory == null) { // No factory is registered, so we can simply register the Embrace factory - Embrace.getInstance().getInternalInterface().logInfo("Registering EmbraceUrlStreamHandlerFactory.", null); URL.setURLStreamHandlerFactory(new EmbraceUrlStreamHandlerFactory()); } else { - Embrace.getInstance().getInternalInterface().logInfo("Existing URLStreamHandlerFactory detected " + - "(" + existingFactory.getClass().getName() + "). Wrapping with Embrace factory " + - "to enable network traffic interception.", null); WrappingFactory wrappingFactory = new WrappingFactory((URLStreamHandlerFactory) existingFactory, enableRequestSizeCapture); clearFactory(); URL.setURLStreamHandlerFactory(wrappingFactory); @@ -105,7 +101,6 @@ private static void clearFactory() { } static void logError(@NonNull String message, @Nullable Throwable throwable) { - Embrace.getInstance().getInternalInterface().logError(message, null, null, false); if (throwable != null) { Embrace.getInstance().getInternalInterface().logInternalError(throwable); }