Skip to content

Commit 9c9cb33

Browse files
Mansi-mParticleMansi-mParticle
authored
fix: migrate all generic logs to Logger class (#630)
1 parent 0780abd commit 9c9cb33

File tree

31 files changed

+92
-73
lines changed

31 files changed

+92
-73
lines changed

‎.github/workflows/pull-request.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ permissions:
1313
id-token: write
1414

1515
jobs:
16+
# Code quality checks
1617
trunk-check:
1718
name: Trunk code check
1819
runs-on: ubuntu-latest
@@ -21,7 +22,8 @@ jobs:
2122
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
2223
- name: Trunk Check
2324
uses: trunk-io/trunk-action@75699af9e26881e564e9d832ef7dc3af25ec031b # v1.2.4
24-
25+
with:
26+
check-mode: pull_request
2527
pr-check-hadcoded-secrets:
2628
name: "Check PR for hardcoded secrets"
2729
uses: mParticle/mparticle-workflows/.github/workflows/security-hardcoded-secrets.yml@main

‎android-core/src/androidTest/java/com/mparticle/internal/MParticleJSInterfaceITest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public void setUserAttribute(String json) {
233233
called.value = true;
234234
latch.countDown();
235235
} catch (JSONException jse) {
236-
jse.printStackTrace();
236+
Logger.error(jse);
237237
}
238238

239239
}
@@ -259,7 +259,7 @@ public void removeUserAttribute(String json) {
259259
called.value = true;
260260
latch.countDown();
261261
} catch (JSONException jse) {
262-
jse.printStackTrace();
262+
Logger.error(jse);
263263
}
264264
}
265265
});
@@ -285,7 +285,7 @@ public void setUserTag(String json) {
285285
called.value = true;
286286
latch.countDown();
287287
} catch (JSONException jse) {
288-
jse.printStackTrace();
288+
Logger.error(jse);
289289
}
290290
}
291291

@@ -300,7 +300,7 @@ public void setUserAttribute(String json) {
300300
called.value = true;
301301
latch.countDown();
302302
} catch (JSONException jse) {
303-
jse.printStackTrace();
303+
Logger.error(jse);
304304
}
305305
}
306306
});
@@ -357,7 +357,7 @@ public void logEvent(String json) {
357357
}
358358
Logger.error(new JSONObject(json).toString(4));
359359
} catch (JSONException e) {
360-
e.printStackTrace();
360+
Logger.error(e);
361361
}
362362
}
363363
});
@@ -466,7 +466,7 @@ public void logout(String json) {
466466
called.value = true;
467467
latch.countDown();
468468
} catch (JSONException e) {
469-
e.printStackTrace();
469+
Logger.error(e);
470470
}
471471
}
472472
});
@@ -518,7 +518,7 @@ public void login(String json) {
518518
called.value = true;
519519
latch.countDown();
520520
} catch (JSONException e) {
521-
e.printStackTrace();
521+
Logger.error(e);
522522
}
523523
}
524524
});
@@ -570,7 +570,7 @@ public void modify(String json) {
570570
called.value = true;
571571
latch.countDown();
572572
} catch (JSONException e) {
573-
e.printStackTrace();
573+
Logger.error(e);
574574
}
575575
}
576576
});

‎android-core/src/androidTest/kotlin/com.mparticle/PushRegistrationTest.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.mparticle
22

33
import android.content.Context
44
import com.mparticle.internal.ConfigManager
5+
import com.mparticle.internal.Logger
56
import com.mparticle.internal.PushRegistrationHelper
67
import com.mparticle.internal.PushRegistrationHelper.PushRegistration
78
import com.mparticle.networking.Matcher
@@ -209,7 +210,7 @@ class PushRegistrationTest : BaseCleanStartedEachTest() {
209210
try {
210211
Thread.sleep(10)
211212
} catch (e: InterruptedException) {
212-
e.printStackTrace()
213+
Logger.error(e)
213214
}
214215
}
215216
TestingUtils.setFirebasePresent(false, null)

‎android-core/src/androidTest/kotlin/com.mparticle/SessionMessagesTest.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import android.os.Looper
55
import com.mparticle.internal.AccessUtils
66
import com.mparticle.internal.AppStateManager
77
import com.mparticle.internal.Constants
8+
import com.mparticle.internal.Logger
89
import com.mparticle.networking.Matcher
910
import com.mparticle.networking.MockServer.JSONMatch
1011
import com.mparticle.testutils.AndroidUtils
@@ -61,7 +62,7 @@ sent sessionId = ${eventObject.getString("id")}""",
6162
}
6263
}
6364
} catch (e: Exception) {
64-
e.printStackTrace()
65+
Logger.error(e)
6566
Assert.fail(e.message)
6667
}
6768
false

‎android-core/src/androidTest/kotlin/com.mparticle/UploadMessageTest.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import android.os.Looper
55
import com.mparticle.internal.AccessUtils
66
import com.mparticle.internal.AccessUtils.EmptyMParticleApiClient
77
import com.mparticle.internal.Constants
8+
import com.mparticle.internal.Logger
89
import com.mparticle.internal.MPUtility
910
import com.mparticle.internal.MParticleApiClientImpl.MPRampException
1011
import com.mparticle.internal.MParticleApiClientImpl.MPThrottleException
@@ -86,7 +87,7 @@ class UploadMessageTest : BaseCleanStartedEachTest() {
8687
}
8788
}
8889
} catch (e: Exception) {
89-
e.printStackTrace()
90+
Logger.error(e)
9091
Assert.fail(e.toString())
9192
}
9293
}

‎android-core/src/androidTest/kotlin/com.mparticle/identity/IdentityApiTest.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import android.os.Looper
66
import com.mparticle.MParticle
77
import com.mparticle.MParticle.IdentityType
88
import com.mparticle.internal.ConfigManager
9+
import com.mparticle.internal.Logger
910
import com.mparticle.networking.Matcher
1011
import com.mparticle.testutils.AndroidUtils
1112
import com.mparticle.testutils.BaseCleanStartedEachTest
@@ -64,7 +65,7 @@ class IdentityApiTest : BaseCleanStartedEachTest() {
6465
com.mparticle.internal.AccessUtils
6566
.awaitMessageHandler()
6667
} catch (e: InterruptedException) {
67-
e.printStackTrace()
68+
Logger.error(e)
6869
}
6970
assertMParticleUserEquals(user, mpid1, identities, null, isLoggedIn)
7071
latch.countDown()

‎android-core/src/androidTest/kotlin/com.mparticle/identity/MParticleIdentityClientImplTest.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.os.Handler
44
import android.util.MutableBoolean
55
import com.mparticle.MParticle
66
import com.mparticle.internal.ConfigManager
7+
import com.mparticle.internal.Logger
78
import com.mparticle.internal.MPUtility
89
import com.mparticle.networking.MPConnection
910
import com.mparticle.networking.MPConnectionTestImpl
@@ -323,7 +324,7 @@ class MParticleIdentityClientImplTest : BaseCleanStartedEachTest() {
323324
try {
324325
identityClient?.makeUrlRequest(connection, payload, identity)
325326
} catch (e: JSONException) {
326-
e.printStackTrace()
327+
Logger.error(e)
327328
Assert.fail(e.message)
328329
}
329330
(connection as MPConnectionTestImpl).responseCode = 202

‎android-core/src/androidTest/kotlin/com.mparticle/internal/AppStateManagerInstrumentedTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class AppStateManagerInstrumentedTest : BaseCleanStartedEachTest() {
5757
}
5858
checked[0] = true
5959
} catch (e: JSONException) {
60-
e.printStackTrace()
60+
Logger.error(e)
6161
}
6262
}
6363
},
@@ -97,7 +97,7 @@ class AppStateManagerInstrumentedTest : BaseCleanStartedEachTest() {
9797
latch.countDown()
9898
}
9999
} catch (e: JSONException) {
100-
e.printStackTrace()
100+
Logger.error(e)
101101
}
102102
}
103103
},

‎android-core/src/androidTest/kotlin/com.mparticle/internal/database/services/ReportingServiceTest.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.mparticle.internal.database.services
22

33
import com.mparticle.internal.Constants
44
import com.mparticle.internal.JsonReportingMessage
5+
import com.mparticle.internal.Logger
56
import com.mparticle.testutils.TestingUtils
67
import org.json.JSONException
78
import org.junit.Assert
@@ -213,7 +214,7 @@ class ReportingServiceTest : BaseMPServiceTest() {
213214
.getInt("a random Number")
214215
.compareTo(o2.msgObject.getInt("a random Number"))
215216
} catch (e: JSONException) {
216-
e.printStackTrace()
217+
Logger.error(e)
217218
}
218219
-1
219220
},
@@ -227,7 +228,7 @@ class ReportingServiceTest : BaseMPServiceTest() {
227228
.getInt("a random Number")
228229
.compareTo(o2.toJson().getInt("a random Number"))
229230
} catch (e: JSONException) {
230-
e.printStackTrace()
231+
Logger.error(e)
231232
}
232233
-1
233234
},

‎android-core/src/androidTest/kotlin/com.mparticle/networking/PinningTestHelper.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import com.mparticle.MParticle
77
import com.mparticle.identity.MParticleIdentityClient
88
import com.mparticle.internal.AccessUtils
99
import com.mparticle.internal.Constants
10+
import com.mparticle.internal.Logger
1011
import com.mparticle.internal.MParticleApiClient
1112
import com.mparticle.internal.MParticleApiClientImpl
1213
import com.mparticle.internal.MParticleApiClientImpl.MPNoConfigException
@@ -43,9 +44,9 @@ class PinningTestHelper internal constructor(
4344
),
4445
)
4546
} catch (e: MalformedURLException) {
46-
e.printStackTrace()
47+
Logger.error(e)
4748
} catch (e: MPNoConfigException) {
48-
e.printStackTrace()
49+
Logger.error(e)
4950
}
5051
val apiClient: MParticleApiClient = AccessUtils.getApiClient()
5152
setRequestClient(apiClient, path)

0 commit comments

Comments
 (0)