Skip to content

Commit 5c3f846

Browse files
committed
refactor: Simplify logging calls by directly using the Logger instance in batchUploader and identityApiClient
1 parent e7c10ee commit 5c3f846

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

src/batchUploader.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,15 @@ export class BatchUploader {
259259
return;
260260
}
261261

262+
const { Logger } = this.mpInstance;
263+
262264
this.eventsQueuedForProcessing.push(event);
263265
if (this.offlineStorageEnabled && this.eventVault) {
264266
this.eventVault.store(this.eventsQueuedForProcessing);
265267
}
266268

267-
this.mpInstance.Logger.verbose(`Queuing event: ${JSON.stringify(event)}`);
268-
this.mpInstance.Logger.verbose(`Queued event count: ${this.eventsQueuedForProcessing.length}`);
269+
Logger.verbose(`Queuing event: ${JSON.stringify(event)}`);
270+
Logger.verbose(`Queued event count: ${this.eventsQueuedForProcessing.length}`);
269271

270272
if (this.shouldTriggerImmediateUpload(event.EventDataType)) {
271273
this.prepareAndUpload(false, false);

src/identityApiClient.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,12 @@ export default function IdentityAPIClient(
8888
aliasRequest: IAliasRequest,
8989
aliasCallback: IAliasCallback
9090
) {
91+
const { Logger } = mpInstance;
9192
const { invokeAliasCallback } = mpInstance._Helpers;
9293
const { aliasUrl } = mpInstance._Store.SDKConfig;
9394
const { devToken: apiKey } = mpInstance._Store;
9495

95-
mpInstance.Logger.verbose(Messages.InformationMessages.SendAliasHttp);
96+
Logger.verbose(Messages.InformationMessages.SendAliasHttp);
9697

9798
// https://go.mparticle.com/work/SQDSDKS-6750
9899
const uploadUrl = `https://${aliasUrl}${apiKey}/Alias`;
@@ -135,7 +136,7 @@ export default function IdentityAPIClient(
135136
try {
136137
aliasResponseBody = await response.json();
137138
} catch (e) {
138-
mpInstance.Logger.verbose('The request has no response body');
139+
Logger.verbose('The request has no response body');
139140
}
140141
} else {
141142
// https://go.mparticle.com/work/SQDSDKS-6568
@@ -170,11 +171,11 @@ export default function IdentityAPIClient(
170171

171172
}
172173

173-
mpInstance.Logger.verbose(message);
174+
Logger.verbose(message);
174175
invokeAliasCallback(aliasCallback, response.status, errorMessage);
175176
} catch (e) {
176177
const errorMessage = (e as Error).message || e.toString();
177-
mpInstance.Logger.error('Error sending alias request to mParticle servers. ' + errorMessage);
178+
Logger.error('Error sending alias request to mParticle servers. ' + errorMessage);
178179
invokeAliasCallback(
179180
aliasCallback,
180181
HTTPCodes.noHttpCoverage,
@@ -193,13 +194,13 @@ export default function IdentityAPIClient(
193194
knownIdentities: UserIdentities
194195
) {
195196
const { invokeCallback } = mpInstance._Helpers;
196-
197-
mpInstance.Logger.verbose(Messages.InformationMessages.SendIdentityBegin);
197+
const { Logger } = mpInstance;
198+
Logger.verbose(Messages.InformationMessages.SendIdentityBegin);
198199
if (!identityApiRequest) {
199-
mpInstance.Logger.error(Messages.ErrorMessages.APIRequestEmpty);
200+
Logger.error(Messages.ErrorMessages.APIRequestEmpty);
200201
return;
201202
}
202-
mpInstance.Logger.verbose(Messages.InformationMessages.SendIdentityHttp);
203+
Logger.verbose(Messages.InformationMessages.SendIdentityHttp);
203204

204205
if (mpInstance._Store.identityCallInFlight) {
205206
invokeCallback(
@@ -287,7 +288,7 @@ export default function IdentityAPIClient(
287288

288289
mpInstance._Store.identityCallInFlight = false;
289290

290-
mpInstance.Logger.verbose(message);
291+
Logger.verbose(message);
291292
parseIdentityResponse(
292293
identityResponse,
293294
previousMPID,
@@ -302,7 +303,7 @@ export default function IdentityAPIClient(
302303

303304
const errorMessage = (err as Error).message || err.toString();
304305

305-
mpInstance.Logger.error('Error sending identity request to servers' + ' - ' + errorMessage);
306+
Logger.error('Error sending identity request to servers' + ' - ' + errorMessage);
306307
invokeCallback(
307308
callback,
308309
HTTPCodes.noHttpCoverage,

0 commit comments

Comments
 (0)