@aws-amplify/core 4.3.15-unstable.9 → 4.4.1-cloud-logging.8

package/src/Logger/ConsoleLogger.ts

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

package/src/Platform/version.ts

@@ -1,2 +1,2 @@
 // generated by genversion
-export const version = '4.3.14';
+export const version = '4.5.2';

package/src/Providers/AWSCloudWatchProvider.ts

@@ -39,6 +39,7 @@ import {
 	AWSCloudWatchProviderOptions,
 	CloudWatchDataTracker,
 	LoggingProvider,
+	AmplifyConfigure,
 } from '../types/types';
 import { Credentials } from '../..';
 import { ConsoleLogger as Logger } from '../Logger';
@@ -54,8 +55,15 @@ import {
 	RETRY_ERROR_CODES,
 } from '../Util/Constants';
 
-const logger = new Logger('AWSCloudWatch');
+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;
@@ -65,15 +73,25 @@ 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 },
+			};
 
-	constructor(config?: AWSCloudWatchProviderOptions) {
-		this.configure(config);
-		this._dataTracker = {
-			eventUploadInProgress: false,
-			logEvents: [],
-		};
-		this._currentLogBatch = [];
-		this._initiateLogPushInterval();
+			this._currentLogBatch = [];
+			this._initiateLogPushInterval();
+			this._initialized = true;
+		}
 	}
 
 	public getProviderName(): string {
@@ -88,9 +106,13 @@ class AWSCloudWatchProvider implements LoggingProvider {
 		return this._dataTracker.logEvents;
 	}
 
-	public configure(
-		config?: AWSCloudWatchProviderOptions
-	): AWSCloudWatchProviderOptions {
+	public setPreFlightCheck(cb): void {
+		if (typeof cb === 'function') {
+			this._preFlightCheck = cb;
+		}
+	}
+
+	public configure(config?: AmplifyConfigure): AWSCloudWatchProviderOptions {
 		if (!config) return this._config || {};
 
 		const conf = Object.assign(
@@ -217,8 +239,25 @@ class AWSCloudWatchProvider implements LoggingProvider {
 	}
 
 	public pushLogs(logs: InputLogEvent[]): void {
-		logger.debug('pushing log events to Cloudwatch...');
-		this._dataTracker.logEvents = [...this._dataTracker.logEvents, ...logs];
+		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 = [];
 	}
 
 	private async _validateLogGroupExistsAndCreate(
@@ -394,6 +433,11 @@ 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
@@ -431,6 +475,47 @@ 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.
@@ -444,20 +529,28 @@ class AWSCloudWatchProvider implements LoggingProvider {
 		let totalByteSize = 0;
 
 		while (currentEventIdx < this._dataTracker.logEvents.length) {
-			const currentEvent = this._dataTracker.logEvents[currentEventIdx];
-			const eventSize = currentEvent
+			let currentEvent = this._dataTracker.logEvents[currentEventIdx];
+
+			let 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.message = currentEvent.message.substring(0, eventSize);
+				currentEvent = this.truncateOversizedEvent(currentEvent);
+				this._dataTracker.logEvents[currentEventIdx] = currentEvent;
+
+				eventSize =
+					new TextEncoder().encode(currentEvent.message).length +
+					AWS_CLOUDWATCH_BASE_BUFFER_SIZE;
 			}
 
 			if (totalByteSize + eventSize > AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE)
 				break;
+
 			totalByteSize += eventSize;
 			currentEventIdx++;
 		}
@@ -509,8 +602,9 @@ class AWSCloudWatchProvider implements LoggingProvider {
 				logger.error(
 					`error when calling _safeUploadLogEvents in the timer interval - ${err}`
 				);
+				this.pause();
 			}
-		}, 2000);
+		}, INTERVAL);
 	}
 
 	private _getDocUploadPermissibility(): boolean {

package/src/Providers/AmazonKinesisLoggingProvider.ts

@@ -0,0 +1,43 @@
+import { AmazonKinesisLoggerOptions, LoggingProvider } from '../types/types';
+import { ConsoleLogger as Logger } from '../Logger';
+import {
+	AMAZON_KINESIS_LOGGING_PROVIDER_NAME,
+	AMAZON_KINESIS_LOGGING_CATEGORY,
+	NO_CREDS_ERROR_STRING,
+	RETRY_ERROR_CODES,
+} from '../Util/Constants';
+
+const logger = new Logger('AmazonKinesisLoggingProvider');
+
+export class AmazonKinesisLoggingProvider implements LoggingProvider {
+	static readonly PROVIDER_NAME = AMAZON_KINESIS_LOGGING_PROVIDER_NAME;
+	static readonly CATEGORY = AMAZON_KINESIS_LOGGING_CATEGORY;
+
+	private _config: AmazonKinesisLoggerOptions;
+
+	constructor(config?: AmazonKinesisLoggerOptions) {}
+
+	public getProviderName(): string {
+		return AmazonKinesisLoggingProvider.PROVIDER_NAME;
+	}
+
+	public getCategoryName(): string {
+		return AmazonKinesisLoggingProvider.CATEGORY;
+	}
+
+	public configure(
+		config?: AmazonKinesisLoggerOptions
+	): AmazonKinesisLoggerOptions {
+		if (!config) return this._config || {};
+
+		return this._config;
+	}
+
+	public pushLogs(logs: any[]): void {
+		logger.debug('pushing log events to Kinesis...');
+	}
+
+	public pause() {}
+
+	public resume() {}
+}

package/src/Util/Constants.ts

@@ -12,11 +12,16 @@
  */
 
 // 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',
@@ -31,4 +36,6 @@ 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,9 +28,8 @@ export async function retry(
 		throw Error('functionToRetry must be a function');
 	}
 	logger.debug(
-		`${
-			functionToRetry.name
-		} attempt #${attempt} with this vars: ${JSON.stringify(args)}`
+		`${functionToRetry.name} attempt #${attempt} with this vars:`,
+		args
 	);
 
 	try {
@@ -57,7 +56,13 @@ export async function retry(
 
 const MAX_DELAY_MS = 5 * 60 * 1000;
 
-function jitteredBackoff(maxDelayMs: number): DelayFunction {
+/**
+ * @private
+ * Internal use of Amplify only
+ */
+export function jitteredBackoff(
+	maxDelayMs: number = MAX_DELAY_MS
+): DelayFunction {
 	const BASE_TIME_MS = 100;
 	const JITTER_FACTOR = 100;
 

package/src/constants.ts

@@ -18,6 +18,9 @@
 const hasSymbol =
 	typeof Symbol !== 'undefined' && typeof Symbol.for === 'function';
 
+/**
+ * @deprecated Unused, all usecases have migrated to INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER
+ */
 export const INTERNAL_AWS_APPSYNC_PUBSUB_PROVIDER = hasSymbol
 	? Symbol.for('INTERNAL_AWS_APPSYNC_PUBSUB_PROVIDER')
 	: '@@INTERNAL_AWS_APPSYNC_PUBSUB_PROVIDER';

package/src/types/types.ts

@@ -1,62 +1,79 @@
-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;
-}
+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;
+}