@aws-amplify/core 4.4.2-api-logging.2 → 4.4.2-api-logging.4

package/src/Providers/AWSCloudWatchProvider.ts

@@ -218,7 +218,15 @@ class AWSCloudWatchProvider implements LoggingProvider {
 
 	public pushLogs(logs: InputLogEvent[]): void {
 		logger.debug('pushing log events to Cloudwatch...');
-		this._dataTracker.logEvents = [...this._dataTracker.logEvents, ...logs];
+		const formattedLogs = logs.map(({ message, timestamp }) => ({
+			message,
+			timestamp,
+		}));
+
+		this._dataTracker.logEvents = [
+			...this._dataTracker.logEvents,
+			...formattedLogs,
+		];
 	}
 
 	private async _validateLogGroupExistsAndCreate(

package/src/types/types.ts

@@ -45,9 +45,6 @@ export interface LoggingProvider {
 
 	// take logs and push to provider
 	pushLogs?(logs: InputLogEvent[]): void;
-
-	// push a single log event
-	pushLog?(log: GenericLogEvent): void;
 }
 
 export interface AWSCloudWatchProviderOptions {
@@ -71,18 +68,39 @@ export interface APILoggingProviderOptions {
 	level?: LOG_TYPE;
 	excludeClassList?: string[];
 	metadata?: { [key: string]: any };
-	eventFormat?: EVENT_FORMAT;
 	bufferInterval?: number;
 }
 
-export enum EVENT_FORMAT {
-	GENERIC = 'GENERIC',
-	CLOUDWATCH = 'CLOUDWATCH',
+export interface LoggerEvent extends InputLogEvent {
+	loggerInfo?: {
+		level: string;
+		name: string;
+		data?: object;
+		error?: {
+			message: string;
+			name: string;
+		};
+	};
+}
+
+export function isLoggerEvent(
+	inputLogEvent: any
+): inputLogEvent is LoggerEvent {
+	return (
+		inputLogEvent && !!Object.keys(inputLogEvent).find(k => k === 'loggerInfo')
+	);
 }
+
 export interface GenericLogEvent {
 	level: string;
-	source: string;
-	timestamp: number;
 	message?: string;
-	data?: object;
+	context: {
+		category: string;
+		logTime: number;
+		data?: object;
+	};
+	error?: {
+		errorMessage: string;
+		errorName: string;
+	};
 }