diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 01a45f7bb..3baa7d3dd 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -12,6 +12,7 @@ permissions: checks: write id-token: write +jobs: # Code quality checks trunk-check: name: Trunk code check @@ -22,9 +23,7 @@ permissions: - name: Trunk Check uses: trunk-io/trunk-action@75699af9e26881e564e9d832ef7dc3af25ec031b # v1.2.4 with: - check-mode: all - -jobs: + check-mode: pull_request pr-check-hadcoded-secrets: name: "Check PR for hardcoded secrets" uses: mParticle/mparticle-workflows/.github/workflows/security-hardcoded-secrets.yml@main diff --git a/android-core/src/androidTest/java/com/mparticle/internal/MParticleJSInterfaceITest.java b/android-core/src/androidTest/java/com/mparticle/internal/MParticleJSInterfaceITest.java index 3e6286b87..0a1832b0a 100644 --- a/android-core/src/androidTest/java/com/mparticle/internal/MParticleJSInterfaceITest.java +++ b/android-core/src/androidTest/java/com/mparticle/internal/MParticleJSInterfaceITest.java @@ -233,7 +233,7 @@ public void setUserAttribute(String json) { called.value = true; latch.countDown(); } catch (JSONException jse) { - jse.printStackTrace(); + Logger.error(jse); } } @@ -259,7 +259,7 @@ public void removeUserAttribute(String json) { called.value = true; latch.countDown(); } catch (JSONException jse) { - jse.printStackTrace(); + Logger.error(jse); } } }); @@ -285,7 +285,7 @@ public void setUserTag(String json) { called.value = true; latch.countDown(); } catch (JSONException jse) { - jse.printStackTrace(); + Logger.error(jse); } } @@ -300,7 +300,7 @@ public void setUserAttribute(String json) { called.value = true; latch.countDown(); } catch (JSONException jse) { - jse.printStackTrace(); + Logger.error(jse); } } }); @@ -357,7 +357,7 @@ public void logEvent(String json) { } Logger.error(new JSONObject(json).toString(4)); } catch (JSONException e) { - e.printStackTrace(); + Logger.error(e); } } }); @@ -466,7 +466,7 @@ public void logout(String json) { called.value = true; latch.countDown(); } catch (JSONException e) { - e.printStackTrace(); + Logger.error(e); } } }); @@ -518,7 +518,7 @@ public void login(String json) { called.value = true; latch.countDown(); } catch (JSONException e) { - e.printStackTrace(); + Logger.error(e); } } }); @@ -570,7 +570,7 @@ public void modify(String json) { called.value = true; latch.countDown(); } catch (JSONException e) { - e.printStackTrace(); + Logger.error(e); } } }); diff --git a/android-core/src/androidTest/kotlin/com.mparticle/PushRegistrationTest.kt b/android-core/src/androidTest/kotlin/com.mparticle/PushRegistrationTest.kt index 3aeb3962b..6f1150cd7 100644 --- a/android-core/src/androidTest/kotlin/com.mparticle/PushRegistrationTest.kt +++ b/android-core/src/androidTest/kotlin/com.mparticle/PushRegistrationTest.kt @@ -2,6 +2,7 @@ package com.mparticle import android.content.Context import com.mparticle.internal.ConfigManager +import com.mparticle.internal.Logger import com.mparticle.internal.PushRegistrationHelper import com.mparticle.internal.PushRegistrationHelper.PushRegistration import com.mparticle.networking.Matcher @@ -209,7 +210,7 @@ class PushRegistrationTest : BaseCleanStartedEachTest() { try { Thread.sleep(10) } catch (e: InterruptedException) { - e.printStackTrace() + Logger.error(e) } } TestingUtils.setFirebasePresent(false, null) diff --git a/android-core/src/androidTest/kotlin/com.mparticle/SessionMessagesTest.kt b/android-core/src/androidTest/kotlin/com.mparticle/SessionMessagesTest.kt index 48c064066..4e549d7b8 100644 --- a/android-core/src/androidTest/kotlin/com.mparticle/SessionMessagesTest.kt +++ b/android-core/src/androidTest/kotlin/com.mparticle/SessionMessagesTest.kt @@ -5,6 +5,7 @@ import android.os.Looper import com.mparticle.internal.AccessUtils import com.mparticle.internal.AppStateManager import com.mparticle.internal.Constants +import com.mparticle.internal.Logger import com.mparticle.networking.Matcher import com.mparticle.networking.MockServer.JSONMatch import com.mparticle.testutils.AndroidUtils @@ -61,7 +62,7 @@ sent sessionId = ${eventObject.getString("id")}""", } } } catch (e: Exception) { - e.printStackTrace() + Logger.error(e) Assert.fail(e.message) } false diff --git a/android-core/src/androidTest/kotlin/com.mparticle/UploadMessageTest.kt b/android-core/src/androidTest/kotlin/com.mparticle/UploadMessageTest.kt index 91e838f38..efc13fa57 100644 --- a/android-core/src/androidTest/kotlin/com.mparticle/UploadMessageTest.kt +++ b/android-core/src/androidTest/kotlin/com.mparticle/UploadMessageTest.kt @@ -5,6 +5,7 @@ import android.os.Looper import com.mparticle.internal.AccessUtils import com.mparticle.internal.AccessUtils.EmptyMParticleApiClient import com.mparticle.internal.Constants +import com.mparticle.internal.Logger import com.mparticle.internal.MPUtility import com.mparticle.internal.MParticleApiClientImpl.MPRampException import com.mparticle.internal.MParticleApiClientImpl.MPThrottleException @@ -86,7 +87,7 @@ class UploadMessageTest : BaseCleanStartedEachTest() { } } } catch (e: Exception) { - e.printStackTrace() + Logger.error(e) Assert.fail(e.toString()) } } diff --git a/android-core/src/androidTest/kotlin/com.mparticle/identity/IdentityApiTest.kt b/android-core/src/androidTest/kotlin/com.mparticle/identity/IdentityApiTest.kt index c88de8d86..7acb583de 100644 --- a/android-core/src/androidTest/kotlin/com.mparticle/identity/IdentityApiTest.kt +++ b/android-core/src/androidTest/kotlin/com.mparticle/identity/IdentityApiTest.kt @@ -6,6 +6,7 @@ import android.os.Looper import com.mparticle.MParticle import com.mparticle.MParticle.IdentityType import com.mparticle.internal.ConfigManager +import com.mparticle.internal.Logger import com.mparticle.networking.Matcher import com.mparticle.testutils.AndroidUtils import com.mparticle.testutils.BaseCleanStartedEachTest @@ -64,7 +65,7 @@ class IdentityApiTest : BaseCleanStartedEachTest() { com.mparticle.internal.AccessUtils .awaitMessageHandler() } catch (e: InterruptedException) { - e.printStackTrace() + Logger.error(e) } assertMParticleUserEquals(user, mpid1, identities, null, isLoggedIn) latch.countDown() diff --git a/android-core/src/androidTest/kotlin/com.mparticle/identity/MParticleIdentityClientImplTest.kt b/android-core/src/androidTest/kotlin/com.mparticle/identity/MParticleIdentityClientImplTest.kt index 1f9645ab8..e0fcfbb11 100644 --- a/android-core/src/androidTest/kotlin/com.mparticle/identity/MParticleIdentityClientImplTest.kt +++ b/android-core/src/androidTest/kotlin/com.mparticle/identity/MParticleIdentityClientImplTest.kt @@ -4,6 +4,7 @@ import android.os.Handler import android.util.MutableBoolean import com.mparticle.MParticle import com.mparticle.internal.ConfigManager +import com.mparticle.internal.Logger import com.mparticle.internal.MPUtility import com.mparticle.networking.MPConnection import com.mparticle.networking.MPConnectionTestImpl @@ -323,7 +324,7 @@ class MParticleIdentityClientImplTest : BaseCleanStartedEachTest() { try { identityClient?.makeUrlRequest(connection, payload, identity) } catch (e: JSONException) { - e.printStackTrace() + Logger.error(e) Assert.fail(e.message) } (connection as MPConnectionTestImpl).responseCode = 202 diff --git a/android-core/src/androidTest/kotlin/com.mparticle/internal/AppStateManagerInstrumentedTest.kt b/android-core/src/androidTest/kotlin/com.mparticle/internal/AppStateManagerInstrumentedTest.kt index 6f348cc45..dc383532f 100644 --- a/android-core/src/androidTest/kotlin/com.mparticle/internal/AppStateManagerInstrumentedTest.kt +++ b/android-core/src/androidTest/kotlin/com.mparticle/internal/AppStateManagerInstrumentedTest.kt @@ -57,7 +57,7 @@ class AppStateManagerInstrumentedTest : BaseCleanStartedEachTest() { } checked[0] = true } catch (e: JSONException) { - e.printStackTrace() + Logger.error(e) } } }, @@ -97,7 +97,7 @@ class AppStateManagerInstrumentedTest : BaseCleanStartedEachTest() { latch.countDown() } } catch (e: JSONException) { - e.printStackTrace() + Logger.error(e) } } }, diff --git a/android-core/src/androidTest/kotlin/com.mparticle/internal/database/services/ReportingServiceTest.kt b/android-core/src/androidTest/kotlin/com.mparticle/internal/database/services/ReportingServiceTest.kt index 7751e5e77..c429a6d5d 100644 --- a/android-core/src/androidTest/kotlin/com.mparticle/internal/database/services/ReportingServiceTest.kt +++ b/android-core/src/androidTest/kotlin/com.mparticle/internal/database/services/ReportingServiceTest.kt @@ -2,6 +2,7 @@ package com.mparticle.internal.database.services import com.mparticle.internal.Constants import com.mparticle.internal.JsonReportingMessage +import com.mparticle.internal.Logger import com.mparticle.testutils.TestingUtils import org.json.JSONException import org.junit.Assert @@ -213,7 +214,7 @@ class ReportingServiceTest : BaseMPServiceTest() { .getInt("a random Number") .compareTo(o2.msgObject.getInt("a random Number")) } catch (e: JSONException) { - e.printStackTrace() + Logger.error(e) } -1 }, @@ -227,7 +228,7 @@ class ReportingServiceTest : BaseMPServiceTest() { .getInt("a random Number") .compareTo(o2.toJson().getInt("a random Number")) } catch (e: JSONException) { - e.printStackTrace() + Logger.error(e) } -1 }, diff --git a/android-core/src/androidTest/kotlin/com.mparticle/networking/PinningTestHelper.kt b/android-core/src/androidTest/kotlin/com.mparticle/networking/PinningTestHelper.kt index 29722888d..ab1302509 100644 --- a/android-core/src/androidTest/kotlin/com.mparticle/networking/PinningTestHelper.kt +++ b/android-core/src/androidTest/kotlin/com.mparticle/networking/PinningTestHelper.kt @@ -7,6 +7,7 @@ import com.mparticle.MParticle import com.mparticle.identity.MParticleIdentityClient import com.mparticle.internal.AccessUtils import com.mparticle.internal.Constants +import com.mparticle.internal.Logger import com.mparticle.internal.MParticleApiClient import com.mparticle.internal.MParticleApiClientImpl import com.mparticle.internal.MParticleApiClientImpl.MPNoConfigException @@ -43,9 +44,9 @@ class PinningTestHelper internal constructor( ), ) } catch (e: MalformedURLException) { - e.printStackTrace() + Logger.error(e) } catch (e: MPNoConfigException) { - e.printStackTrace() + Logger.error(e) } val apiClient: MParticleApiClient = AccessUtils.getApiClient() setRequestClient(apiClient, path) diff --git a/android-core/src/main/java/com/mparticle/MPReceiver.java b/android-core/src/main/java/com/mparticle/MPReceiver.java index a6a56005b..1718aa82a 100644 --- a/android-core/src/main/java/com/mparticle/MPReceiver.java +++ b/android-core/src/main/java/com/mparticle/MPReceiver.java @@ -8,6 +8,7 @@ import androidx.annotation.NonNull; +import com.mparticle.internal.Logger; import com.mparticle.messaging.MPMessagingAPI; import com.mparticle.messaging.ProviderCloudMessage; @@ -62,7 +63,7 @@ public void run() { try { Class.forName("android.os.AsyncTask"); } catch (ClassNotFoundException e) { - e.printStackTrace(); + Logger.error(e); } } }); diff --git a/android-core/src/main/java/com/mparticle/MPServiceUtil.java b/android-core/src/main/java/com/mparticle/MPServiceUtil.java index fe8f9894e..f74f76573 100644 --- a/android-core/src/main/java/com/mparticle/MPServiceUtil.java +++ b/android-core/src/main/java/com/mparticle/MPServiceUtil.java @@ -45,7 +45,7 @@ public void run() { try { Class.forName("android.os.AsyncTask"); } catch (ClassNotFoundException e) { - e.printStackTrace(); + Logger.error(e); } } }); diff --git a/android-core/src/main/java/com/mparticle/internal/ConfigManager.java b/android-core/src/main/java/com/mparticle/internal/ConfigManager.java index e39a94df1..8b7d61569 100644 --- a/android-core/src/main/java/com/mparticle/internal/ConfigManager.java +++ b/android-core/src/main/java/com/mparticle/internal/ConfigManager.java @@ -370,7 +370,7 @@ public synchronized void configUpToDate() throws JSONException { onConfigLoaded(ConfigType.KIT, kitConfig != combined); } } catch (JSONException e) { - e.printStackTrace(); + Logger.error(e); throw new RuntimeException(e); } } diff --git a/android-core/src/main/java/com/mparticle/internal/MPUtility.java b/android-core/src/main/java/com/mparticle/internal/MPUtility.java index 6e8efcc7f..1b44f551a 100644 --- a/android-core/src/main/java/com/mparticle/internal/MPUtility.java +++ b/android-core/src/main/java/com/mparticle/internal/MPUtility.java @@ -811,13 +811,13 @@ public static String getProp(String key) { Method get = SystemProperties.getMethod("get", new Class[]{String.class}); return get.invoke(SystemProperties, new Object[]{key}).toString(); } catch (ClassNotFoundException e) { - e.printStackTrace(); + Logger.error(e); } catch (NoSuchMethodException e) { - e.printStackTrace(); + Logger.error(e); } catch (IllegalAccessException e) { - e.printStackTrace(); + Logger.error(e); } catch (InvocationTargetException e) { - e.printStackTrace(); + Logger.error(e); } return null; } diff --git a/android-core/src/main/java/com/mparticle/internal/database/tables/MParticleDatabaseHelper.java b/android-core/src/main/java/com/mparticle/internal/database/tables/MParticleDatabaseHelper.java index ea7632bd4..956f63c35 100644 --- a/android-core/src/main/java/com/mparticle/internal/database/tables/MParticleDatabaseHelper.java +++ b/android-core/src/main/java/com/mparticle/internal/database/tables/MParticleDatabaseHelper.java @@ -159,7 +159,7 @@ private void removeGcmTable(SQLiteDatabase db) { try { db.execSQL("DROP TABLE IF EXISTS gcm_messages"); } catch (Exception e) { - e.printStackTrace(); + Logger.error(e); } } diff --git a/android-core/src/main/java/com/mparticle/internal/messages/BaseMPMessageBuilder.java b/android-core/src/main/java/com/mparticle/internal/messages/BaseMPMessageBuilder.java index a919b1d28..b10f620ee 100644 --- a/android-core/src/main/java/com/mparticle/internal/messages/BaseMPMessageBuilder.java +++ b/android-core/src/main/java/com/mparticle/internal/messages/BaseMPMessageBuilder.java @@ -7,6 +7,7 @@ import com.mparticle.internal.Constants; import com.mparticle.internal.InternalSession; +import com.mparticle.internal.Logger; import org.json.JSONArray; import org.json.JSONException; @@ -24,7 +25,7 @@ public BaseMPMessageBuilder(String messageType) { try { put(Constants.MessageKey.TYPE, messageType); } catch (JSONException e) { - e.printStackTrace(); + Logger.error(e); } } @@ -32,7 +33,7 @@ public BaseMPMessageBuilder timestamp(long timestamp) { try { put(Constants.MessageKey.TIMESTAMP, timestamp); } catch (JSONException e) { - e.printStackTrace(); + Logger.error(e); } return this; } @@ -50,7 +51,7 @@ public BaseMPMessageBuilder name(String name) { try { put(Constants.MessageKey.NAME, name); } catch (JSONException e) { - e.printStackTrace(); + Logger.error(e); } return this; } @@ -63,7 +64,7 @@ public BaseMPMessageBuilder attributes(JSONObject attributes) { addEventLengthAttributes(mLength); } } catch (JSONException e) { - e.printStackTrace(); + Logger.error(e); } } return this; @@ -82,7 +83,7 @@ public BaseMPMessageBuilder dataConnection(String dataConnection) { try { put(Constants.MessageKey.STATE_INFO_DATA_CONNECTION, dataConnection); } catch (JSONException e) { - e.printStackTrace(); + Logger.error(e); } } return this; @@ -95,7 +96,7 @@ public BaseMPMessageBuilder length(Double length) { put(Constants.MessageKey.EVENT_DURATION, length); addEventLengthAttributes(length); } catch (JSONException e) { - e.printStackTrace(); + Logger.error(e); } } return this; @@ -111,7 +112,7 @@ private void addEventLengthAttributes(Double length) { getJSONObject(Constants.MessageKey.ATTRIBUTES).put("EventLength", Integer.toString(length.intValue())); } } catch (JSONException e) { - e.printStackTrace(); + Logger.error(e); } } @@ -127,7 +128,7 @@ public BaseMPMessageBuilder flags(Map> customFlags) { } put(Constants.MessageKey.EVENT_FLAGS, flagsObject); } catch (JSONException e) { - e.printStackTrace(); + Logger.error(e); } } return this; diff --git a/android-core/src/main/java/com/mparticle/internal/messages/MPEventMessage.java b/android-core/src/main/java/com/mparticle/internal/messages/MPEventMessage.java index 77dd81c98..3e2526607 100644 --- a/android-core/src/main/java/com/mparticle/internal/messages/MPEventMessage.java +++ b/android-core/src/main/java/com/mparticle/internal/messages/MPEventMessage.java @@ -7,6 +7,7 @@ import com.mparticle.MParticle; import com.mparticle.internal.Constants; import com.mparticle.internal.InternalSession; +import com.mparticle.internal.Logger; import org.json.JSONException; @@ -26,7 +27,7 @@ public BaseMPMessageBuilder customEventType(MParticle.EventType eventType) { try { put(Constants.MessageKey.EVENT_TYPE, eventType); } catch (JSONException e) { - e.printStackTrace(); + Logger.error(e); } return this; } diff --git a/android-core/src/main/java/com/mparticle/networking/Certificate.java b/android-core/src/main/java/com/mparticle/networking/Certificate.java index 176e4bda7..594eda5af 100644 --- a/android-core/src/main/java/com/mparticle/networking/Certificate.java +++ b/android-core/src/main/java/com/mparticle/networking/Certificate.java @@ -43,7 +43,7 @@ static Certificate withCertificate(JSONObject jsonObject) { String certificate = jsonObject.getString("certificate"); return new Certificate(alias, certificate); } catch (JSONException e) { - e.printStackTrace(); + Logger.error(e); } return null; } diff --git a/android-core/src/main/java/com/mparticle/networking/NetworkOptions.java b/android-core/src/main/java/com/mparticle/networking/NetworkOptions.java index 5d76c32eb..6faf9d521 100644 --- a/android-core/src/main/java/com/mparticle/networking/NetworkOptions.java +++ b/android-core/src/main/java/com/mparticle/networking/NetworkOptions.java @@ -68,7 +68,7 @@ public static NetworkOptions withNetworkOptions(@Nullable String jsonString) { .build()); } } catch (Exception e) { - e.printStackTrace(); + Logger.error(e); } return builder.build(); } diff --git a/android-core/src/main/kotlin/com/mparticle/internal/AppStateManager.kt b/android-core/src/main/kotlin/com/mparticle/internal/AppStateManager.kt index f11c19de5..f05ca83ec 100644 --- a/android-core/src/main/kotlin/com/mparticle/internal/AppStateManager.kt +++ b/android-core/src/main/kotlin/com/mparticle/internal/AppStateManager.kt @@ -218,7 +218,7 @@ open class AppStateManager logBackgrounded() } } catch (e: Exception) { - e.printStackTrace() + Logger.error(e) } }, ACTIVITY_DELAY, diff --git a/android-core/src/main/kotlin/com/mparticle/internal/listeners/InternalListenerManager.kt b/android-core/src/main/kotlin/com/mparticle/internal/listeners/InternalListenerManager.kt index ac65bcd8a..fbb42ba69 100644 --- a/android-core/src/main/kotlin/com/mparticle/internal/listeners/InternalListenerManager.kt +++ b/android-core/src/main/kotlin/com/mparticle/internal/listeners/InternalListenerManager.kt @@ -7,6 +7,7 @@ import com.mparticle.SdkListener import com.mparticle.identity.AliasResponse import com.mparticle.internal.InternalSession import com.mparticle.internal.KitFrameworkWrapper +import com.mparticle.internal.Logger import com.mparticle.internal.MPUtility import org.json.JSONException import org.json.JSONObject @@ -175,7 +176,7 @@ class InternalListenerManager private constructor( jsonObject.put(key, value) } } catch (e: JSONException) { - e.printStackTrace() + Logger.error(e) } } } @@ -359,7 +360,7 @@ class InternalListenerManager private constructor( } } } catch (e: ClassNotFoundException) { - e.printStackTrace() + Logger.error(e) } } return simpleClassName diff --git a/android-kit-base/src/test/kotlin/com/mparticle/kits/KitIntegrationTest.kt b/android-kit-base/src/test/kotlin/com/mparticle/kits/KitIntegrationTest.kt index ba8ee52d3..dd8c8b096 100644 --- a/android-kit-base/src/test/kotlin/com/mparticle/kits/KitIntegrationTest.kt +++ b/android-kit-base/src/test/kotlin/com/mparticle/kits/KitIntegrationTest.kt @@ -4,6 +4,7 @@ import android.content.Context import android.util.SparseBooleanArray import com.mparticle.MParticle import com.mparticle.MParticle.IdentityType +import com.mparticle.internal.Logger import com.mparticle.internal.MPUtility import com.mparticle.kits.KitIntegration.AttributeListener import com.mparticle.mock.MockMParticle @@ -55,7 +56,7 @@ class KitIntegrationTest { key: Int, valueIfKeyNotFound: Boolean, ): Boolean { - print("SparseArray getting: $key") + Logger.verbose("SparseArray getting: $key") return if (map.containsKey(key)) { map[key]!! } else { diff --git a/android-kit-base/src/test/kotlin/com/mparticle/kits/KitManagerImplTest.kt b/android-kit-base/src/test/kotlin/com/mparticle/kits/KitManagerImplTest.kt index 95cdf22de..1f0a59939 100644 --- a/android-kit-base/src/test/kotlin/com/mparticle/kits/KitManagerImplTest.kt +++ b/android-kit-base/src/test/kotlin/com/mparticle/kits/KitManagerImplTest.kt @@ -21,6 +21,7 @@ import com.mparticle.identity.IdentityApi import com.mparticle.identity.IdentityApiResult import com.mparticle.identity.MParticleUser import com.mparticle.internal.CoreCallbacks +import com.mparticle.internal.Logger import com.mparticle.internal.MPUtility import com.mparticle.internal.SideloadedKit import com.mparticle.kits.KitIntegration.AttributeListener @@ -2261,11 +2262,11 @@ class KitManagerImplTest { user: FilteredMParticleUser?, config: RoktConfig?, ) { - println("Executed with $attributes") + Logger.info("Executed with $attributes") } override fun events(identifier: String): Flow { - println("events called with identfier: $identifier") + Logger.info("events called with identfier: $identifier") return flowOf() } @@ -2273,11 +2274,11 @@ class KitManagerImplTest { attributes: MutableMap, user: FilteredMParticleUser?, ) { - println("callRoktComposable with $attributes") + Logger.info("callRoktComposable with $attributes") } override fun setWrapperSdkVersion(wrapperSdkVersion: WrapperSdkVersion) { - println("setWrapperSdkVersion with $wrapperSdkVersion") + Logger.info("setWrapperSdkVersion with $wrapperSdkVersion") } override fun purchaseFinalized( @@ -2285,11 +2286,11 @@ class KitManagerImplTest { catalogItemId: String, status: Boolean, ) { - println("purchaseFinalized with placementId: $placementId catalogItemId : $catalogItemId status : $status ") + Logger.info("purchaseFinalized with placementId: $placementId catalogItemId : $catalogItemId status : $status ") } override fun close() { - println("close called") + Logger.info("close called") } } diff --git a/testutils/src/androidTest/java/com/mparticle/LegacyStartupTest.java b/testutils/src/androidTest/java/com/mparticle/LegacyStartupTest.java index bade6901d..dbde5c991 100644 --- a/testutils/src/androidTest/java/com/mparticle/LegacyStartupTest.java +++ b/testutils/src/androidTest/java/com/mparticle/LegacyStartupTest.java @@ -31,7 +31,7 @@ public void before() throws InterruptedException { try { mParticleStart = MParticle.class.getMethod("start", Context.class, String.class, String.class); } catch (NoSuchMethodException e) { - e.printStackTrace(); + Logger.error(e); } Assume.assumeNotNull(mParticleStart); } diff --git a/testutils/src/main/java/com/mparticle/mock/MockKitConfiguration.java b/testutils/src/main/java/com/mparticle/mock/MockKitConfiguration.java index a6677bdab..1bc9913a9 100644 --- a/testutils/src/main/java/com/mparticle/mock/MockKitConfiguration.java +++ b/testutils/src/main/java/com/mparticle/mock/MockKitConfiguration.java @@ -68,7 +68,7 @@ public boolean get(int key) { @Override public boolean get(int key, boolean valueIfKeyNotFound) { - System.out.print("SparseArray getting: " + key); + Logger.debug("SparseArray getting: " + key); if (map.containsKey(key)) { return map.get(key); } else { @@ -98,4 +98,4 @@ public String toString() { return map.toString(); } } -} \ No newline at end of file +} diff --git a/testutils/src/main/java/com/mparticle/networking/MockServer.java b/testutils/src/main/java/com/mparticle/networking/MockServer.java index 68ef5673e..0b9dad61f 100644 --- a/testutils/src/main/java/com/mparticle/networking/MockServer.java +++ b/testutils/src/main/java/com/mparticle/networking/MockServer.java @@ -149,7 +149,7 @@ void onRequestMade(MPConnectionTestImpl mockConnection) { try { Thread.sleep(delay); } catch (InterruptedException e) { - e.printStackTrace(); + Logger.error(e); } } } catch (InterruptedException e) { @@ -416,7 +416,7 @@ private MPUrl getUrl(MParticleBaseClientImpl.Endpoint endpoint) { try { return getClient().getUrl(endpoint); } catch (MalformedURLException e) { - e.printStackTrace(); + Logger.error(e); throw new RuntimeException(e); } } @@ -465,7 +465,7 @@ private String getIdentityResponse(long mpid, boolean isLoggedIn) { .put("is_logged_in", isLoggedIn) .toString(); } catch (JSONException e) { - e.printStackTrace(); + Logger.error(e); throw new RuntimeException(e); } } @@ -512,7 +512,7 @@ public int compare(Map.Entry o1, Map.Entry o2) } } } catch (Exception e) { - e.printStackTrace(); + Logger.error(e); } } diff --git a/testutils/src/main/java/com/mparticle/testutils/StreamAssert.java b/testutils/src/main/java/com/mparticle/testutils/StreamAssert.java index 359135b20..3f96193b5 100644 --- a/testutils/src/main/java/com/mparticle/testutils/StreamAssert.java +++ b/testutils/src/main/java/com/mparticle/testutils/StreamAssert.java @@ -5,6 +5,8 @@ import android.os.Handler; import android.os.Looper; +import com.mparticle.internal.Logger; + import junit.framework.AssertionFailedError; import org.json.JSONException; @@ -34,7 +36,7 @@ public void startTimer(final long millis, boolean block) { try { Thread.sleep(100); } catch (InterruptedException e) { - e.printStackTrace(); + Logger.error(e); } } else { return; diff --git a/tooling/android-plugin/src/main/java/com/mparticle/MParticlePlugin.kt b/tooling/android-plugin/src/main/java/com/mparticle/MParticlePlugin.kt index 23f87e039..d03b77e81 100644 --- a/tooling/android-plugin/src/main/java/com/mparticle/MParticlePlugin.kt +++ b/tooling/android-plugin/src/main/java/com/mparticle/MParticlePlugin.kt @@ -39,20 +39,20 @@ class MParticlePlugin : Plugin { private val installTask: (Task) -> Unit = { if (isInstallTask) { - println("installing MParticle ClI") + Logger.verbose("installing MParticle ClI") val dataPlanningNodeApp = getDataplanningApp() if (dataPlanningNodeApp != null) { if (!dataPlanningNodeApp.checkNPMInstalled()) { - println("MParticle requires NPM be installed. Please install NPM") + Logger.verbose("MParticle requires NPM be installed. Please install NPM") } else if (dataPlanningNodeApp.checkMPInstalled()) { - println("MParticle CLI tools aready installed") + Logger.verbose("MParticle CLI tools aready installed") } else { val result = dataPlanningNodeApp.install() - println("MParticle CLI result: \n${result.response}") + Logger.verbose("MParticle CLI result: \n${result.response}") if (result.response == null || result.response?.contains("npm ERR") == true) { - println("MParticle unable to install CLI tools.)") + Logger.verbose("MParticle unable to install CLI tools.)") } else { - println("MParticle CLI installed") + Logger.verbose("MParticle CLI installed") } } } @@ -62,15 +62,15 @@ class MParticlePlugin : Plugin { private val uninstallTask: (Task) -> Unit = { if (isUninstallTask) { - println("uninstalling MParticle CLI") + Logger.verbose("uninstalling MParticle CLI") val dataPlanningNodeApp = getDataplanningApp() if (dataPlanningNodeApp != null) { val result = dataPlanningNodeApp.uninstall() - println("MParticle CLI result: \n${result.response}") + Logger.verbose("MParticle CLI result: \n${result.response}") if (result.response == null || result.response?.contains("npm ERR") ?: false) { - println("MParticle unable to uninstall CLI tools. To do so manually, run \"npm uninstall @mparticle/cli\"") + Logger.verbose("MParticle unable to uninstall CLI tools. To do so manually, run \"npm uninstall @mparticle/cli\"") } else { - println("MParticle CLI uninstalled") + Logger.verbose("MParticle CLI uninstalled") } } updateConfig(it.project) @@ -105,17 +105,17 @@ class MParticlePlugin : Plugin { private fun updateArtifactPaths(config: Config) { val dataPlanningNodeApp = getDataplanningApp(true) if (dataPlanningNodeApp?.checkNodeInstalled() == false) { - println("MParticle Node not installed. Please install to use Dataplanning features") + Logger.verbose("MParticle Node not installed. Please install to use Dataplanning features") } else { val nodeLocation = arrayOf("type", "-p", "node").executeCLI().trim() Logger.verbose("node location = $nodeLocation") config.internalConfig.nodePath = nodeLocation } if (dataPlanningNodeApp?.checkNPMInstalled() == false) { - println("MParticle NPM not installed. Please install to use Dataplanning features") + Logger.verbose("MParticle NPM not installed. Please install to use Dataplanning features") } if (dataPlanningNodeApp?.checkMPInstalled() == false && !isInstallTask && !isUninstallTask) { - println("MParticle CLI tools not installed. run \"./gradlew mpInstall\" to install") + Logger.verbose("MParticle CLI tools not installed. run \"./gradlew mpInstall\" to install") } else { val location = arrayOf("type", "-p", "mp").executeCLI().trim() Logger.verbose("mp location = $location") diff --git a/tooling/common/src/main/java/com/mparticle/tooling/DataPlanningNodeApp.kt b/tooling/common/src/main/java/com/mparticle/tooling/DataPlanningNodeApp.kt index 99bea36ee..a8bfc6621 100644 --- a/tooling/common/src/main/java/com/mparticle/tooling/DataPlanningNodeApp.kt +++ b/tooling/common/src/main/java/com/mparticle/tooling/DataPlanningNodeApp.kt @@ -103,7 +103,7 @@ class DataPlanningNodeApp( fun install(version: String? = null): NodeAppResult { if (checkMPInstalled()) { - println("MParticle CLI tools already installed") + Logger.verbose("MParticle CLI tools already installed") } val packageString = "@mparticle/cli" + if (version != null) "@$version" else "" try { diff --git a/tooling/custom-lint-rules/src/main/java/com/mparticle/lints/basedetectors/CallScanner.kt b/tooling/custom-lint-rules/src/main/java/com/mparticle/lints/basedetectors/CallScanner.kt index be9b6f8b1..bd6367274 100644 --- a/tooling/custom-lint-rules/src/main/java/com/mparticle/lints/basedetectors/CallScanner.kt +++ b/tooling/custom-lint-rules/src/main/java/com/mparticle/lints/basedetectors/CallScanner.kt @@ -9,6 +9,7 @@ import com.mparticle.lints.dtos.RootParent import com.mparticle.lints.getVariableElement import com.mparticle.lints.receiverClassName import com.mparticle.lints.resolveChainedCalls +import com.mparticle.tooling.Logger import org.jetbrains.uast.UCallExpression import org.jetbrains.uast.UElement import org.jetbrains.uast.UExpression @@ -57,7 +58,7 @@ abstract class CallScanner : } } catch (e: Exception) { if (config?.verbose == true) { - e.printStackTrace() + Logger.error(e.toString()) } } } diff --git a/tooling/custom-lint-rules/src/main/java/com/mparticle/lints/detectors/MpApiDetectorKt.kt b/tooling/custom-lint-rules/src/main/java/com/mparticle/lints/detectors/MpApiDetectorKt.kt index cd5fe5225..48d072f7e 100644 --- a/tooling/custom-lint-rules/src/main/java/com/mparticle/lints/detectors/MpApiDetectorKt.kt +++ b/tooling/custom-lint-rules/src/main/java/com/mparticle/lints/detectors/MpApiDetectorKt.kt @@ -13,6 +13,7 @@ import com.android.tools.lint.detector.api.Scope import com.android.tools.lint.detector.api.Severity import com.android.tools.lint.detector.api.UastLintUtils.Companion.tryResolveUDeclaration import com.mparticle.lints.basedetectors.BaseDetector +import com.mparticle.tooling.Logger import org.jetbrains.uast.UBlockExpression import org.jetbrains.uast.UCallExpression import org.jetbrains.uast.UClass @@ -153,7 +154,7 @@ class MpApiDetectorKt : } } } catch (e: Exception) { - e.printStackTrace() + Logger.error(e.toString()) } } }