@aws-amplify/core 4.4.1-cloud-logging.7 → 4.4.1-unstable.3

package/lib-esm/Util/Constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"Constants.js","sourceRoot":"","sources":["../../src/Util/Constants.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,oBAAoB;AACpB,aAAa;AACb,IAAM,+BAA+B,GAAG,EAAE,CAAC;AAC3C,IAAM,mCAAmC,GAAG,OAAO,CAAC;AACpD,IAAM,6BAA6B,GAAG,MAAM,CAAC;AAC7C,IAAM,uBAAuB,GAAG,SAAS,CAAC;AAC1C,IAAM,4BAA4B,GAAG,eAAe,CAAC;AAErD,IAAM,+BAA+B,GAAG,gBAAgB,CAAC;AACzD,IAAM,oCAAoC,GAAG,sBAAsB,CAAC;AAEpE,IAAM,qBAAqB,GAAG,gBAAgB,CAAC;AAC/C,IAAM,iBAAiB,GAAG;IACzB,2BAA2B;IAC3B,+BAA+B;CAC/B,CAAC;AAEF,OAAO,EACN,+BAA+B,EAC/B,uBAAuB,EACvB,mCAAmC,EACnC,6BAA6B,EAC7B,4BAA4B,EAC5B,qBAAqB,EACrB,iBAAiB,EACjB,oCAAoC,EACpC,+BAA+B,GAC/B,CAAC"}
+{"version":3,"file":"Constants.js","sourceRoot":"","sources":["../../src/Util/Constants.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,oBAAoB;AACpB,IAAM,+BAA+B,GAAG,EAAE,CAAC;AAC3C,IAAM,mCAAmC,GAAG,OAAO,CAAC;AACpD,IAAM,6BAA6B,GAAG,MAAM,CAAC;AAC7C,IAAM,uBAAuB,GAAG,SAAS,CAAC;AAC1C,IAAM,4BAA4B,GAAG,eAAe,CAAC;AACrD,IAAM,qBAAqB,GAAG,gBAAgB,CAAC;AAC/C,IAAM,iBAAiB,GAAG;IACzB,2BAA2B;IAC3B,+BAA+B;CAC/B,CAAC;AAEF,OAAO,EACN,+BAA+B,EAC/B,uBAAuB,EACvB,mCAAmC,EACnC,6BAA6B,EAC7B,4BAA4B,EAC5B,qBAAqB,EACrB,iBAAiB,GACjB,CAAC"}

package/lib-esm/Util/Retry.js

@@ -97,7 +97,7 @@ export function retry(functionToRetry, args, delayFn, attempt) {
                     if (typeof functionToRetry !== 'function') {
                         throw Error('functionToRetry must be a function');
                     }
-                    logger.debug(functionToRetry.name + " attempt #" + attempt + " with this vars:", args);
+                    logger.debug(functionToRetry.name + " attempt #" + attempt + " with this vars: " + JSON.stringify(args));
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 8]);

package/lib-esm/Util/Retry.js.map

@@ -1 +1 @@
-{"version":3,"file":"Retry.js","sourceRoot":"","sources":["../../src/Util/Retry.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,EAAE,aAAa,IAAI,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAClE,IAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;AAElC;IAAuC,qCAAK;IAE3C,2BAAY,OAAe;QAA3B,YACC,kBAAM,OAAO,CAAC,SACd;QAHe,kBAAY,GAAG,IAAI,CAAC;;IAGpC,CAAC;IACF,wBAAC;AAAD,CAAC,AALD,CAAuC,KAAK,GAK3C;;AAED,IAAM,mBAAmB,GAAG,UAAC,GAAQ;IACpC,IAAM,GAAG,GAA4B,cAAc,CAAC;IACpD,OAAO,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;AACxB,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,UAAgB,KAAK,CAC1B,eAAyB,EACzB,IAAW,EACX,OAAsB,EACtB,OAAmB;IAAnB,wBAAA,EAAA,WAAmB;;;;;;oBAEnB,IAAI,OAAO,eAAe,KAAK,UAAU,EAAE;wBAC1C,MAAM,KAAK,CAAC,oCAAoC,CAAC,CAAC;qBAClD;oBACD,MAAM,CAAC,KAAK,CACR,eAAe,CAAC,IAAI,kBAAa,OAAO,qBAAkB,EAC7D,IAAI,CACJ,CAAC;;;;oBAGM,qBAAM,eAAe,wBAAI,IAAI,IAAC;wBAArC,sBAAO,SAA8B,EAAC;;;oBAEtC,MAAM,CAAC,KAAK,CAAC,cAAY,eAAe,CAAC,IAAM,EAAE,KAAG,CAAC,CAAC;oBAEtD,IAAI,mBAAmB,CAAC,KAAG,CAAC,EAAE;wBAC7B,MAAM,CAAC,KAAK,CAAI,eAAe,CAAC,IAAI,yBAAsB,EAAE,KAAG,CAAC,CAAC;wBACjE,MAAM,KAAG,CAAC;qBACV;oBAEK,YAAU,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,KAAG,CAAC,CAAC;oBAC5C,MAAM,CAAC,KAAK,CAAI,eAAe,CAAC,IAAI,qBAAgB,SAAO,QAAK,CAAC,CAAC;yBAE9D,CAAA,SAAO,KAAK,KAAK,CAAA,EAAjB,wBAAiB;oBACpB,qBAAM,IAAI,OAAO,CAAC,UAAA,GAAG,IAAI,OAAA,UAAU,CAAC,GAAG,EAAE,SAAO,CAAC,EAAxB,CAAwB,CAAC,EAAA;;oBAAlD,SAAkD,CAAC;oBAC5C,qBAAM,KAAK,CAAC,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,GAAG,CAAC,CAAC,EAAA;wBAA/D,sBAAO,SAAwD,EAAC;wBAEhE,MAAM,KAAG,CAAC;;;;;;CAGZ;AAED,IAAM,YAAY,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAEnC,SAAS,eAAe,CAAC,UAAkB;IAC1C,IAAM,YAAY,GAAG,GAAG,CAAC;IACzB,IAAM,aAAa,GAAG,GAAG,CAAC;IAE1B,OAAO,UAAA,OAAO;QACb,IAAM,KAAK,GAAG,SAAA,CAAC,EAAI,OAAO,CAAA,GAAG,YAAY,GAAG,aAAa,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC1E,OAAO,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;IAC3C,CAAC,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,IAAM,wBAAwB,GAAG,UACvC,eAAyB,EACzB,IAAW,EACX,UAAiC;IAAjC,2BAAA,EAAA,yBAAiC;IAC7B,OAAA,KAAK,CAAC,eAAe,EAAE,IAAI,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;AAAzD,CAAyD,CAAC"}
+{"version":3,"file":"Retry.js","sourceRoot":"","sources":["../../src/Util/Retry.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,EAAE,aAAa,IAAI,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAClE,IAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;AAElC;IAAuC,qCAAK;IAE3C,2BAAY,OAAe;QAA3B,YACC,kBAAM,OAAO,CAAC,SACd;QAHe,kBAAY,GAAG,IAAI,CAAC;;IAGpC,CAAC;IACF,wBAAC;AAAD,CAAC,AALD,CAAuC,KAAK,GAK3C;;AAED,IAAM,mBAAmB,GAAG,UAAC,GAAQ;IACpC,IAAM,GAAG,GAA4B,cAAc,CAAC;IACpD,OAAO,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;AACxB,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,UAAgB,KAAK,CAC1B,eAAyB,EACzB,IAAW,EACX,OAAsB,EACtB,OAAmB;IAAnB,wBAAA,EAAA,WAAmB;;;;;;oBAEnB,IAAI,OAAO,eAAe,KAAK,UAAU,EAAE;wBAC1C,MAAM,KAAK,CAAC,oCAAoC,CAAC,CAAC;qBAClD;oBACD,MAAM,CAAC,KAAK,CAEV,eAAe,CAAC,IAAI,kBACR,OAAO,yBAAoB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAG,CAC9D,CAAC;;;;oBAGM,qBAAM,eAAe,wBAAI,IAAI,IAAC;wBAArC,sBAAO,SAA8B,EAAC;;;oBAEtC,MAAM,CAAC,KAAK,CAAC,cAAY,eAAe,CAAC,IAAM,EAAE,KAAG,CAAC,CAAC;oBAEtD,IAAI,mBAAmB,CAAC,KAAG,CAAC,EAAE;wBAC7B,MAAM,CAAC,KAAK,CAAI,eAAe,CAAC,IAAI,yBAAsB,EAAE,KAAG,CAAC,CAAC;wBACjE,MAAM,KAAG,CAAC;qBACV;oBAEK,YAAU,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,KAAG,CAAC,CAAC;oBAC5C,MAAM,CAAC,KAAK,CAAI,eAAe,CAAC,IAAI,qBAAgB,SAAO,QAAK,CAAC,CAAC;yBAE9D,CAAA,SAAO,KAAK,KAAK,CAAA,EAAjB,wBAAiB;oBACpB,qBAAM,IAAI,OAAO,CAAC,UAAA,GAAG,IAAI,OAAA,UAAU,CAAC,GAAG,EAAE,SAAO,CAAC,EAAxB,CAAwB,CAAC,EAAA;;oBAAlD,SAAkD,CAAC;oBAC5C,qBAAM,KAAK,CAAC,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,GAAG,CAAC,CAAC,EAAA;wBAA/D,sBAAO,SAAwD,EAAC;wBAEhE,MAAM,KAAG,CAAC;;;;;;CAGZ;AAED,IAAM,YAAY,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAEnC,SAAS,eAAe,CAAC,UAAkB;IAC1C,IAAM,YAAY,GAAG,GAAG,CAAC;IACzB,IAAM,aAAa,GAAG,GAAG,CAAC;IAE1B,OAAO,UAAA,OAAO;QACb,IAAM,KAAK,GAAG,SAAA,CAAC,EAAI,OAAO,CAAA,GAAG,YAAY,GAAG,aAAa,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC1E,OAAO,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;IAC3C,CAAC,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,IAAM,wBAAwB,GAAG,UACvC,eAAyB,EACzB,IAAW,EACX,UAAiC;IAAjC,2BAAA,EAAA,yBAAiC;IAC7B,OAAA,KAAK,CAAC,eAAe,EAAE,IAAI,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;AAAzD,CAAyD,CAAC"}

package/lib-esm/types/types.d.ts

@@ -28,8 +28,6 @@ export interface LoggingProvider {
     getCategoryName(): string;
     configure(config?: object): object;
     pushLogs(logs: InputLogEvent[]): void;
-    pause(): void;
-    resume(): void;
 }
 export interface AWSCloudWatchProviderOptions {
     logGroupName?: string;
@@ -38,19 +36,8 @@ export interface AWSCloudWatchProviderOptions {
     credentials?: Credentials;
     endpoint?: string;
 }
-export interface AmplifyConfigure {
-    Logging: {
-        logGroupName: string;
-        logStreamName: string;
-    };
-}
 export interface CloudWatchDataTracker {
     eventUploadInProgress: boolean;
     logEvents: InputLogEvent[];
     verifiedLogGroup?: LogGroup;
 }
-export interface AmazonKinesisLoggerOptions {
-    region?: string;
-    credentials?: Credentials;
-    endpoint?: string;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/core",
-	"version": "4.4.1-cloud-logging.7+a219f0109",
+	"version": "4.4.1-unstable.3+1b188626a",
 	"description": "Core category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -61,7 +61,6 @@
 		"@aws-sdk/credential-provider-cognito-identity": "3.6.1",
 		"@aws-sdk/types": "3.6.1",
 		"@aws-sdk/util-hex-encoding": "3.6.1",
-		"fast-text-encoding": "1.0.3",
 		"universal-cookie": "^4.0.4",
 		"zen-observable-ts": "0.8.19"
 	},
@@ -109,5 +108,5 @@
 			"lib-esm"
 		]
 	},
-	"gitHead": "a219f01098b90acc930fcbb9ffd4d6ed261ac6dd"
+	"gitHead": "1b188626afcc7f0f755ba449534236a38260e692"
 }

package/src/Logger/ConsoleLogger.ts

@@ -24,8 +24,6 @@ const LOG_LEVELS = {
 	ERROR: 5,
 };
 
-const COMPATIBLE_PLUGINS = [AWS_CLOUDWATCH_CATEGORY];
-
 export enum LOG_TYPE {
 	DEBUG = 'DEBUG',
 	ERROR = 'ERROR',
@@ -34,14 +32,6 @@ export enum LOG_TYPE {
 	VERBOSE = 'VERBOSE',
 }
 
-const cloudWatchExcludeList = [
-	'AWSCloudWatch',
-	'Amplify',
-	'Credentials',
-	'AuthClass',
-	'CloudLogger',
-];
-
 /**
  * Write logs
  * @class Logger
@@ -51,7 +41,6 @@ export class ConsoleLogger implements Logger {
 	level: LOG_TYPE | string;
 	private _pluggables: LoggingProvider[];
 	private _config: object;
-	private static _globalpluggables: LoggingProvider[] = [];
 
 	/**
 	 * @constructor
@@ -61,21 +50,9 @@ export class ConsoleLogger implements Logger {
 		this.name = name;
 		this.level = level;
 		this._pluggables = [];
-		this.addPluggable = this.addPluggable.bind(this);
 	}
 
 	static LOG_LEVEL = null;
-	static CLOUD_LOG_LEVEL = null;
-	static globalPluggables(pluggable: LoggingProvider) {
-		if (pluggable && COMPATIBLE_PLUGINS.includes(pluggable.getCategoryName())) {
-			ConsoleLogger._globalpluggables.push(pluggable);
-		}
-	}
-
-	static clearGlobalPluggables() {
-		ConsoleLogger._globalpluggables = [];
-	}
-	static connectivity;
 
 	_padding(n) {
 		return n < 10 ? '0' + n : '' + n;
@@ -100,19 +77,6 @@ export class ConsoleLogger implements Logger {
 		return this._config;
 	}
 
-	_checkPluggables() {
-		if (this._pluggables.length !== ConsoleLogger._globalpluggables.length) {
-			if (ConsoleLogger._globalpluggables.length > 0) {
-				ConsoleLogger._globalpluggables.forEach(this.addPluggable);
-				return;
-			}
-
-			if (ConsoleLogger._globalpluggables.length === 0) {
-				this._pluggables = [];
-			}
-		}
-	}
-
 	/**
 	 * Write log
 	 * @method
@@ -121,37 +85,6 @@ export class ConsoleLogger implements Logger {
 	 * @param {string|object} msg - Logging message or object
 	 */
 	_log(type: LOG_TYPE | string, ...msg) {
-		if (!cloudWatchExcludeList.includes(this.name)) {
-			this._checkPluggables();
-		}
-
-		const generateCloudMessage = (msg: any[]) => {
-			let message = '';
-			let data;
-
-			if (msg.length === 1 && typeof msg[0] === 'string') {
-				message = msg[0];
-			} else if (msg.length === 1) {
-				data = msg[0];
-			} else if (typeof msg[0] === 'string') {
-				let obj = msg.slice(1);
-				if (obj.length === 1) {
-					obj = obj[0];
-				}
-				message = msg[0];
-				data = obj;
-			} else {
-				data = msg;
-			}
-
-			return JSON.stringify({
-				level: type,
-				class: this.name,
-				message,
-				data,
-			});
-		};
-
 		let logger_level_name = this.level;
 		if (ConsoleLogger.LOG_LEVEL) {
 			logger_level_name = ConsoleLogger.LOG_LEVEL;
@@ -161,60 +94,43 @@ export class ConsoleLogger implements Logger {
 		}
 		const logger_level = LOG_LEVELS[logger_level_name];
 		const type_level = LOG_LEVELS[type];
-		if (type_level >= logger_level) {
-			let log = console.log.bind(console);
-
-			if (type === LOG_TYPE.ERROR && console.error) {
-				log = console.error.bind(console);
-			}
-			if (type === LOG_TYPE.WARN && console.warn) {
-				log = console.warn.bind(console);
-			}
+		if (!(type_level >= logger_level)) {
+			// Do nothing if type is not greater than or equal to logger level (handle undefined)
+			return;
+		}
 
-			const prefix = `[${type}] ${this._ts()} ${this.name}`;
-			let message = '';
-			let data;
+		let log = console.log.bind(console);
+		if (type === LOG_TYPE.ERROR && console.error) {
+			log = console.error.bind(console);
+		}
+		if (type === LOG_TYPE.WARN && console.warn) {
+			log = console.warn.bind(console);
+		}
 
-			if (msg.length === 1 && typeof msg[0] === 'string') {
-				message = msg[0];
-				log(`${prefix} - ${message}`);
-			} else if (msg.length === 1) {
-				data = msg[0];
-				log(prefix, data);
-			} else if (typeof msg[0] === 'string') {
-				let obj = msg.slice(1);
-				if (obj.length === 1) {
-					obj = obj[0];
-				}
-				message = msg[0];
-				data = obj;
-				log(`${prefix} - ${message}`, data);
-			} else {
-				data = msg;
-				log(prefix, data);
+		const prefix = `[${type}] ${this._ts()} ${this.name}`;
+		let message = '';
+
+		if (msg.length === 1 && typeof msg[0] === 'string') {
+			message = `${prefix} - ${msg[0]}`;
+			log(message);
+		} else if (msg.length === 1) {
+			message = `${prefix} ${msg[0]}`;
+			log(prefix, msg[0]);
+		} else if (typeof msg[0] === 'string') {
+			let obj = msg.slice(1);
+			if (obj.length === 1) {
+				obj = obj[0];
 			}
+			message = `${prefix} - ${msg[0]} ${obj}`;
+			log(`${prefix} - ${msg[0]}`, obj);
+		} else {
+			message = `${prefix} ${msg}`;
+			log(prefix, msg);
 		}
 
-		if (
-			ConsoleLogger.CLOUD_LOG_LEVEL != null &&
-			!cloudWatchExcludeList.includes(this.name)
-		) {
-			const cloudMessage = generateCloudMessage(msg);
-			for (const plugin of this._pluggables) {
-				const logger_level = LOG_LEVELS[ConsoleLogger.CLOUD_LOG_LEVEL];
-				const type_level = LOG_LEVELS[type];
-
-				const logEvent: InputLogEvent = {
-					message: cloudMessage,
-					timestamp: Date.now(),
-				};
-
-				if (type_level >= logger_level) {
-					plugin.pushLogs([logEvent]);
-				} else {
-					plugin.pushLogs([]);
-				}
-			}
+		for (const plugin of this._pluggables) {
+			const logEvent: InputLogEvent = { message, timestamp: Date.now() };
+			plugin.pushLogs([logEvent]);
 		}
 	}
 
@@ -279,8 +195,9 @@ export class ConsoleLogger implements Logger {
 	}
 
 	addPluggable(pluggable: LoggingProvider) {
-		if (pluggable && COMPATIBLE_PLUGINS.includes(pluggable.getCategoryName())) {
+		if (pluggable && pluggable.getCategoryName() === AWS_CLOUDWATCH_CATEGORY) {
 			this._pluggables.push(pluggable);
+			pluggable.configure(this._config);
 		}
 	}
 

package/src/Providers/AWSCloudWatchProvider.ts

@@ -39,7 +39,6 @@ import {
 	AWSCloudWatchProviderOptions,
 	CloudWatchDataTracker,
 	LoggingProvider,
-	AmplifyConfigure,
 } from '../types/types';
 import { Credentials } from '../..';
 import { ConsoleLogger as Logger } from '../Logger';
@@ -55,15 +54,8 @@ import {
 	RETRY_ERROR_CODES,
 } from '../Util/Constants';
 
-if (
-	typeof window === 'undefined' ||
-	(typeof window === 'object' && !window.TextEncoder)
-) {
-	require('fast-text-encoding');
-}
-
 const logger = new Logger('AWSCloudWatch');
-const INTERVAL = 10000;
+
 class AWSCloudWatchProvider implements LoggingProvider {
 	static readonly PROVIDER_NAME = AWS_CLOUDWATCH_PROVIDER_NAME;
 	static readonly CATEGORY = AWS_CLOUDWATCH_CATEGORY;
@@ -73,25 +65,15 @@ class AWSCloudWatchProvider implements LoggingProvider {
 	private _currentLogBatch: InputLogEvent[];
 	private _timer;
 	private _nextSequenceToken: string | undefined;
-	private _processing: boolean;
-	private _initialized = false;
-	private _preFlightCheck: () => Promise<boolean>;
-
-	constructor(config?: AmplifyConfigure) {
-		console.log('cstr', config);
-		if (!this._initialized) {
-			this.configure(config);
-
-			this._dataTracker = {
-				eventUploadInProgress: false,
-				logEvents: [],
-				verifiedLogGroup: { logGroupName: this._config.logGroupName },
-			};
 
-			this._currentLogBatch = [];
-			this._initiateLogPushInterval();
-			this._initialized = true;
-		}
+	constructor(config?: AWSCloudWatchProviderOptions) {
+		this.configure(config);
+		this._dataTracker = {
+			eventUploadInProgress: false,
+			logEvents: [],
+		};
+		this._currentLogBatch = [];
+		this._initiateLogPushInterval();
 	}
 
 	public getProviderName(): string {
@@ -106,13 +88,9 @@ class AWSCloudWatchProvider implements LoggingProvider {
 		return this._dataTracker.logEvents;
 	}
 
-	public setPreFlightCheck(cb): void {
-		if (typeof cb === 'function') {
-			this._preFlightCheck = cb;
-		}
-	}
-
-	public configure(config?: AmplifyConfigure): AWSCloudWatchProviderOptions {
+	public configure(
+		config?: AWSCloudWatchProviderOptions
+	): AWSCloudWatchProviderOptions {
 		if (!config) return this._config || {};
 
 		const conf = Object.assign(
@@ -239,25 +217,8 @@ class AWSCloudWatchProvider implements LoggingProvider {
 	}
 
 	public pushLogs(logs: InputLogEvent[]): void {
-		logger.debug('pushing log events to buffer');
-		this._dataTracker.logEvents = this._dataTracker.logEvents.concat(logs);
-	}
-
-	public pause() {
-		this._processing = false;
-		if (this._timer) {
-			clearInterval(this._timer);
-		}
-	}
-
-	public resume() {
-		this._processing = true;
-		this._initiateLogPushInterval();
-	}
-
-	public clear() {
-		this._dataTracker.logEvents = [];
-		this._currentLogBatch = [];
+		logger.debug('pushing log events to Cloudwatch...');
+		this._dataTracker.logEvents = [...this._dataTracker.logEvents, ...logs];
 	}
 
 	private async _validateLogGroupExistsAndCreate(
@@ -433,11 +394,6 @@ class AWSCloudWatchProvider implements LoggingProvider {
 			 * We also need to ensure that the logs in the batch are sorted in chronological order.
 			 * https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutLogEvents.html
 			 */
-			if (!(await this._preFlightCheck())) {
-				this.clear();
-				return;
-			}
-
 			const seqToken = await this._getNextSequenceToken();
 			const logBatch =
 				this._currentLogBatch.length === 0
@@ -475,47 +431,6 @@ class AWSCloudWatchProvider implements LoggingProvider {
 		}
 	}
 
-	private truncateOversizedEvent(event) {
-		const { timestamp, message } = event;
-		let messageJson;
-		try {
-			messageJson = JSON.parse(message);
-
-			const truncated = JSON.stringify({
-				level: messageJson.level,
-				class: messageJson.class,
-				message: messageJson.message.substring(0, 500),
-			});
-
-			if (messageJson.data != null) {
-				truncated[
-					'data'
-				] = `OBJECT SIZE EXCEEDS CLOUDWATCH EVENT LIMIT. Truncated: ${JSON.stringify(
-					messageJson.data
-				).substring(0, 500)}`;
-			}
-
-			return {
-				timestamp,
-				message: truncated,
-			};
-		} catch (error) {
-			logger.warn('Could not minify oversized event', error);
-
-			const truncated = JSON.stringify({
-				level: 'UNKNOWN',
-				class: 'Unknown',
-				message:
-					'OBJECT SIZE EXCEEDS CLOUDWATCH EVENT LIMIT. Could not parse event to truncate',
-			});
-
-			return {
-				timestamp,
-				message: truncated,
-			};
-		}
-	}
-
 	private _getBufferedBatchOfLogs(): InputLogEvent[] {
 		/**
 		 * CloudWatch has restrictions on the size of the log events that get sent up.
@@ -529,28 +444,20 @@ class AWSCloudWatchProvider implements LoggingProvider {
 		let totalByteSize = 0;
 
 		while (currentEventIdx < this._dataTracker.logEvents.length) {
-			let currentEvent = this._dataTracker.logEvents[currentEventIdx];
-
-			let eventSize = currentEvent
+			const currentEvent = this._dataTracker.logEvents[currentEventIdx];
+			const eventSize = currentEvent
 				? new TextEncoder().encode(currentEvent.message).length +
 				  AWS_CLOUDWATCH_BASE_BUFFER_SIZE
 				: 0;
-
 			if (eventSize > AWS_CLOUDWATCH_MAX_EVENT_SIZE) {
 				const errString = `Log entry exceeds maximum size for CloudWatch logs. Log size: ${eventSize}. Truncating log message.`;
 				logger.warn(errString);
 
-				currentEvent = this.truncateOversizedEvent(currentEvent);
-				this._dataTracker.logEvents[currentEventIdx] = currentEvent;
-
-				eventSize =
-					new TextEncoder().encode(currentEvent.message).length +
-					AWS_CLOUDWATCH_BASE_BUFFER_SIZE;
+				currentEvent.message = currentEvent.message.substring(0, eventSize);
 			}
 
 			if (totalByteSize + eventSize > AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE)
 				break;
-
 			totalByteSize += eventSize;
 			currentEventIdx++;
 		}
@@ -602,9 +509,8 @@ class AWSCloudWatchProvider implements LoggingProvider {
 				logger.error(
 					`error when calling _safeUploadLogEvents in the timer interval - ${err}`
 				);
-				this.pause();
 			}
-		}, INTERVAL);
+		}, 2000);
 	}
 
 	private _getDocUploadPermissibility(): boolean {

package/src/Util/Constants.ts

@@ -12,16 +12,11 @@
  */
 
 // Logging constants
-// Cloudwatch
 const AWS_CLOUDWATCH_BASE_BUFFER_SIZE = 26;
 const AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE = 1048576;
 const AWS_CLOUDWATCH_MAX_EVENT_SIZE = 256000;
 const AWS_CLOUDWATCH_CATEGORY = 'Logging';
 const AWS_CLOUDWATCH_PROVIDER_NAME = 'AWSCloudWatch';
-
-const AMAZON_KINESIS_LOGGING_CATEGORY = 'KinesisLogging';
-const AMAZON_KINESIS_LOGGING_PROVIDER_NAME = 'AmazonKinesisLogging';
-
 const NO_CREDS_ERROR_STRING = 'No credentials';
 const RETRY_ERROR_CODES = [
 	'ResourceNotFoundException',
@@ -36,6 +31,4 @@ export {
 	AWS_CLOUDWATCH_PROVIDER_NAME,
 	NO_CREDS_ERROR_STRING,
 	RETRY_ERROR_CODES,
-	AMAZON_KINESIS_LOGGING_PROVIDER_NAME,
-	AMAZON_KINESIS_LOGGING_CATEGORY,
 };

package/src/Util/Retry.ts

@@ -28,8 +28,9 @@ export async function retry(
 		throw Error('functionToRetry must be a function');
 	}
 	logger.debug(
-		`${functionToRetry.name} attempt #${attempt} with this vars:`,
-		args
+		`${
+			functionToRetry.name
+		} attempt #${attempt} with this vars: ${JSON.stringify(args)}`
 	);
 
 	try {

package/src/types/types.ts

@@ -1,79 +1,62 @@
-import { InputLogEvent, LogGroup } from '@aws-sdk/client-cloudwatch-logs';
-import { Credentials } from '@aws-sdk/types';
-
-export interface AmplifyConfig {
-	Analytics?: object;
-	Auth?: object;
-	API?: object;
-	Logging?: object;
-	Storage?: object;
-	Cache?: object;
-	Geo?: object;
-	ssr?: boolean;
-}
-
-export interface ICredentials {
-	accessKeyId: string;
-	sessionToken: string;
-	secretAccessKey: string;
-	identityId: string;
-	authenticated: boolean;
-	// Long term creds do not provide an expiration date
-	expiration?: Date;
-}
-
-/**
- * @private
- * Internal use of Amplify only
- */
-
-export type DelayFunction = (
-	attempt: number,
-	args?: any[],
-	error?: Error
-) => number | false;
-
-export interface LoggingProvider {
-	// return the name of you provider
-	getProviderName(): string;
-
-	// return the name of you category
-	getCategoryName(): string;
-
-	// configure the plugin
-	configure(config?: object): object;
-
-	// take logs and push to provider
-	pushLogs(logs: InputLogEvent[]): void;
-
-	// pause sending logs
-	pause(): void;
-	resume(): void;
-}
-
-export interface AWSCloudWatchProviderOptions {
-	logGroupName?: string;
-	logStreamName?: string;
-	region?: string;
-	credentials?: Credentials;
-	endpoint?: string;
-}
-
-export interface AmplifyConfigure {
-	Logging: {
-		logGroupName: string;
-		logStreamName: string;
-	};
-}
-
-export interface CloudWatchDataTracker {
-	eventUploadInProgress: boolean;
-	logEvents: InputLogEvent[];
-	verifiedLogGroup?: LogGroup;
-}
-
-export interface AmazonKinesisLoggerOptions {
-	region?: string;
-	credentials?: Credentials;
-	endpoint?: string;
-}
+import { InputLogEvent, LogGroup } from '@aws-sdk/client-cloudwatch-logs';
+import { Credentials } from '@aws-sdk/types';
+
+export interface AmplifyConfig {
+	Analytics?: object;
+	Auth?: object;
+	API?: object;
+	Logging?: object;
+	Storage?: object;
+	Cache?: object;
+	Geo?: object;
+	ssr?: boolean;
+}
+
+export interface ICredentials {
+	accessKeyId: string;
+	sessionToken: string;
+	secretAccessKey: string;
+	identityId: string;
+	authenticated: boolean;
+	// Long term creds do not provide an expiration date
+	expiration?: Date;
+}
+
+/**
+ * @private
+ * Internal use of Amplify only
+ */
+
+export type DelayFunction = (
+	attempt: number,
+	args?: any[],
+	error?: Error
+) => number | false;
+
+export interface LoggingProvider {
+	// return the name of you provider
+	getProviderName(): string;
+
+	// return the name of you category
+	getCategoryName(): string;
+
+	// configure the plugin
+	configure(config?: object): object;
+
+	// take logs and push to provider
+	pushLogs(logs: InputLogEvent[]): void;
+}
+
+export interface AWSCloudWatchProviderOptions {
+	logGroupName?: string;
+	logStreamName?: string;
+	region?: string;
+	credentials?: Credentials;
+	endpoint?: string;
+}
+
+export interface CloudWatchDataTracker {
+	eventUploadInProgress: boolean;
+	logEvents: InputLogEvent[];
+	verifiedLogGroup?: LogGroup;
+}