@aws-amplify/core 4.4.2-api-logging.2 → 4.4.2-api-logging.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/aws-amplify-core.js +105 -168
- package/dist/aws-amplify-core.js.map +1 -1
- package/dist/aws-amplify-core.min.js +2 -2
- package/dist/aws-amplify-core.min.js.map +1 -1
- package/lib/Logger/ConsoleLogger.d.ts +2 -2
- package/lib/Logger/ConsoleLogger.js +16 -8
- package/lib/Logger/ConsoleLogger.js.map +1 -1
- package/lib/Providers/APIProvider/APILoggingProvider.d.ts +3 -3
- package/lib/Providers/APIProvider/APILoggingProvider.js +45 -36
- package/lib/Providers/APIProvider/APILoggingProvider.js.map +1 -1
- package/lib/Providers/APIProvider/CloudWatchEventFormatter.js +2 -2
- package/lib/Providers/APIProvider/CloudWatchEventFormatter.js.map +1 -1
- package/lib/Providers/APIProvider/Fetch.js +1 -1
- package/lib/Providers/APIProvider/Fetch.js.map +1 -1
- package/lib/Providers/AWSCloudWatchProvider.js +8 -1
- package/lib/Providers/AWSCloudWatchProvider.js.map +1 -1
- package/lib/types/types.d.ts +20 -8
- package/lib/types/types.js +4 -5
- package/lib/types/types.js.map +1 -1
- package/lib-esm/Logger/ConsoleLogger.d.ts +2 -2
- package/lib-esm/Logger/ConsoleLogger.js +16 -8
- package/lib-esm/Logger/ConsoleLogger.js.map +1 -1
- package/lib-esm/Providers/APIProvider/APILoggingProvider.d.ts +3 -3
- package/lib-esm/Providers/APIProvider/APILoggingProvider.js +46 -37
- package/lib-esm/Providers/APIProvider/APILoggingProvider.js.map +1 -1
- package/lib-esm/Providers/APIProvider/CloudWatchEventFormatter.js +2 -2
- package/lib-esm/Providers/APIProvider/CloudWatchEventFormatter.js.map +1 -1
- package/lib-esm/Providers/APIProvider/Fetch.js +1 -1
- package/lib-esm/Providers/APIProvider/Fetch.js.map +1 -1
- package/lib-esm/Providers/AWSCloudWatchProvider.js +8 -1
- package/lib-esm/Providers/AWSCloudWatchProvider.js.map +1 -1
- package/lib-esm/types/types.d.ts +20 -8
- package/lib-esm/types/types.js +3 -5
- package/lib-esm/types/types.js.map +1 -1
- package/package.json +2 -2
- package/src/Logger/ConsoleLogger.ts +19 -10
- package/src/Providers/APIProvider/APILoggingProvider.ts +45 -45
- package/src/Providers/APIProvider/CloudWatchEventFormatter.ts +5 -2
- package/src/Providers/APIProvider/Fetch.ts +1 -1
- package/src/Providers/AWSCloudWatchProvider.ts +9 -1
- package/src/types/types.ts +28 -10
|
@@ -1,3 +1,14 @@
|
|
|
1
|
+
var __assign = (this && this.__assign) || function () {
|
|
2
|
+
__assign = Object.assign || function(t) {
|
|
3
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
4
|
+
s = arguments[i];
|
|
5
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
6
|
+
t[p] = s[p];
|
|
7
|
+
}
|
|
8
|
+
return t;
|
|
9
|
+
};
|
|
10
|
+
return __assign.apply(this, arguments);
|
|
11
|
+
};
|
|
1
12
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
13
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
14
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -56,9 +67,8 @@ var __spread = (this && this.__spread) || function () {
|
|
|
56
67
|
};
|
|
57
68
|
import { ConsoleLogger as Logger, LOG_LEVELS, LOG_TYPE } from '../../Logger';
|
|
58
69
|
import LoggerConnectivity from './loggerConnectivity';
|
|
59
|
-
import {
|
|
70
|
+
import { isLoggerEvent, } from '../../types/types';
|
|
60
71
|
import { jitteredExponentialRetry, NonRetryableError } from '../../../';
|
|
61
|
-
import { cloudWatchEventFromGeneric, cloudWatchLogEventBatch, } from './CloudWatchEventFormatter';
|
|
62
72
|
import { postOptions } from './Fetch';
|
|
63
73
|
import { API_LOGGING_PROVIDER_NAME, API_LOGGING_PROVIDER_CATEGORY, } from '../../Util/Constants';
|
|
64
74
|
import { getStringByteSize } from '../../Util/StringUtils';
|
|
@@ -105,24 +115,36 @@ var APILoggingProvider = /** @class */ (function () {
|
|
|
105
115
|
logger.error('Unable to start: ', error);
|
|
106
116
|
}
|
|
107
117
|
};
|
|
108
|
-
APILoggingProvider.prototype.
|
|
118
|
+
APILoggingProvider.prototype.pushLogs = function (events) {
|
|
119
|
+
var _this = this;
|
|
109
120
|
var _a;
|
|
110
121
|
if (((_a = this.config) === null || _a === void 0 ? void 0 : _a.enabled) === false) {
|
|
111
122
|
return;
|
|
112
123
|
}
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
124
|
+
events.forEach(function (event) {
|
|
125
|
+
if (!isLoggerEvent(event)) {
|
|
126
|
+
return;
|
|
127
|
+
}
|
|
128
|
+
var message = event.message, timestamp = event.timestamp, _a = event.loggerInfo, level = _a.level, data = _a.data, name = _a.name, _b = _a.error, _c = _b === void 0 ? {} : _b, errorMessage = _c.message, errorName = _c.name;
|
|
129
|
+
var error = errorName &&
|
|
130
|
+
errorMessage && {
|
|
131
|
+
errorMessage: errorMessage,
|
|
132
|
+
errorName: errorName,
|
|
133
|
+
};
|
|
134
|
+
var combinedEvent = {
|
|
135
|
+
level: level,
|
|
136
|
+
error: error,
|
|
137
|
+
message: message,
|
|
138
|
+
context: {
|
|
139
|
+
category: name,
|
|
140
|
+
data: __assign(__assign({}, data), _this.config.metadata),
|
|
141
|
+
logTime: timestamp,
|
|
142
|
+
},
|
|
143
|
+
};
|
|
144
|
+
if (_this.verifyEvent(combinedEvent)) {
|
|
145
|
+
_this.eventBuffer.push(combinedEvent);
|
|
146
|
+
}
|
|
147
|
+
});
|
|
126
148
|
};
|
|
127
149
|
APILoggingProvider.prototype.validateConfig = function (config) {
|
|
128
150
|
if (typeof (config === null || config === void 0 ? void 0 : config.endpoint) !== 'string') {
|
|
@@ -136,15 +158,14 @@ var APILoggingProvider = /** @class */ (function () {
|
|
|
136
158
|
}
|
|
137
159
|
};
|
|
138
160
|
APILoggingProvider.prototype.normalizeConfig = function (config) {
|
|
139
|
-
var _a, _b, _c
|
|
161
|
+
var _a, _b, _c;
|
|
140
162
|
var normalizedConfig = {
|
|
141
163
|
endpoint: config.endpoint,
|
|
142
164
|
apiKey: config.apiKey,
|
|
143
165
|
metadata: config.metadata,
|
|
144
166
|
enabled: (_a = config.enabled) !== null && _a !== void 0 ? _a : true,
|
|
145
167
|
level: (_b = config.level) !== null && _b !== void 0 ? _b : LOG_TYPE.WARN,
|
|
146
|
-
|
|
147
|
-
bufferInterval: (_d = config.bufferInterval) !== null && _d !== void 0 ? _d : DEFAULT_INTERVAL,
|
|
168
|
+
bufferInterval: (_c = config.bufferInterval) !== null && _c !== void 0 ? _c : DEFAULT_INTERVAL,
|
|
148
169
|
excludeClassList: config.excludeClassList instanceof Array
|
|
149
170
|
? __spread(DEFAULT_CLASS_EXCLUDE_LIST, config.excludeClassList) : DEFAULT_CLASS_EXCLUDE_LIST,
|
|
150
171
|
};
|
|
@@ -214,13 +235,13 @@ var APILoggingProvider = /** @class */ (function () {
|
|
|
214
235
|
Filter out events that don't adhere to config settings
|
|
215
236
|
*/
|
|
216
237
|
APILoggingProvider.prototype.verifyEvent = function (event) {
|
|
217
|
-
var level = event.level,
|
|
238
|
+
var level = event.level, context = event.context;
|
|
218
239
|
var configLevelValue = LOG_LEVELS[this.config.level];
|
|
219
240
|
var eventLevelValue = LOG_LEVELS[level];
|
|
220
241
|
if (eventLevelValue < configLevelValue) {
|
|
221
242
|
return false;
|
|
222
243
|
}
|
|
223
|
-
if (this.config.excludeClassList.includes(
|
|
244
|
+
if (this.config.excludeClassList.includes(context.category)) {
|
|
224
245
|
return false;
|
|
225
246
|
}
|
|
226
247
|
return true;
|
|
@@ -232,26 +253,23 @@ var APILoggingProvider = /** @class */ (function () {
|
|
|
232
253
|
return __generator(this, function (_a) {
|
|
233
254
|
switch (_a.label) {
|
|
234
255
|
case 0:
|
|
235
|
-
eventBatch = this.
|
|
256
|
+
eventBatch = this.genericLogEventBatch(this.eventBuffer);
|
|
236
257
|
if (eventBatch.length < 1) {
|
|
237
258
|
return [2 /*return*/];
|
|
238
259
|
}
|
|
239
260
|
body = {
|
|
240
|
-
|
|
241
|
-
metadata: this.config.metadata,
|
|
261
|
+
logs: eventBatch,
|
|
242
262
|
};
|
|
243
263
|
options = postOptions(body);
|
|
244
264
|
return [4 /*yield*/, jitteredExponentialRetry(function (endpoint, options) { return __awaiter(_this, void 0, void 0, function () {
|
|
245
|
-
var
|
|
265
|
+
var error_2;
|
|
246
266
|
return __generator(this, function (_a) {
|
|
247
267
|
switch (_a.label) {
|
|
248
268
|
case 0:
|
|
249
269
|
_a.trys.push([0, 2, , 3]);
|
|
250
270
|
return [4 /*yield*/, fetch(endpoint, options)];
|
|
251
271
|
case 1:
|
|
252
|
-
|
|
253
|
-
if (!res.ok)
|
|
254
|
-
throw new Error("Request Failed. Status: " + res.status + " - " + res.statusText);
|
|
272
|
+
_a.sent(); // fetch doesnt return info for no-cors request
|
|
255
273
|
return [3 /*break*/, 3];
|
|
256
274
|
case 2:
|
|
257
275
|
error_2 = _a.sent();
|
|
@@ -275,15 +293,6 @@ var APILoggingProvider = /** @class */ (function () {
|
|
|
275
293
|
});
|
|
276
294
|
});
|
|
277
295
|
};
|
|
278
|
-
APILoggingProvider.prototype.generateEventBatch = function (buffer) {
|
|
279
|
-
switch (this.config.eventFormat) {
|
|
280
|
-
case EVENT_FORMAT.CLOUDWATCH:
|
|
281
|
-
return cloudWatchLogEventBatch(buffer);
|
|
282
|
-
case EVENT_FORMAT.GENERIC:
|
|
283
|
-
default:
|
|
284
|
-
return this.genericLogEventBatch(buffer);
|
|
285
|
-
}
|
|
286
|
-
};
|
|
287
296
|
APILoggingProvider.prototype.genericLogEventBatch = function (buffer) {
|
|
288
297
|
var totalByteSize = 0;
|
|
289
298
|
var currentEventIdx = 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"APILoggingProvider.js","sourceRoot":"","sources":["../../../src/Providers/APIProvider/APILoggingProvider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"APILoggingProvider.js","sourceRoot":"","sources":["../../../src/Providers/APIProvider/APILoggingProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,10 +14,10 @@ import { ConsoleLogger as Logger, getStringByteSize } from '../../';
|
|
|
14
14
|
var logger = new Logger('APILoggingProvider');
|
|
15
15
|
var TRUNCATE_MAX_LENGTH = 5000;
|
|
16
16
|
export var cloudWatchEventFromGeneric = function (event) {
|
|
17
|
-
var timestamp = event.
|
|
17
|
+
var timestamp = event.context.logTime, message = __rest(event, ["context"]);
|
|
18
18
|
return {
|
|
19
19
|
timestamp: timestamp,
|
|
20
|
-
message: JSON.stringify(
|
|
20
|
+
message: JSON.stringify(event),
|
|
21
21
|
};
|
|
22
22
|
};
|
|
23
23
|
export var truncateOversizedEvent = function (event) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CloudWatchEventFormatter.js","sourceRoot":"","sources":["../../../src/Providers/APIProvider/CloudWatchEventFormatter.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,EACN,+BAA+B,EAC/B,mCAAmC,EACnC,6BAA6B,GAC7B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,aAAa,IAAI,MAAM,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAEpE,IAAM,MAAM,GAAG,IAAI,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAChD,IAAM,mBAAmB,GAAG,IAAI,CAAC;AAEjC,MAAM,CAAC,IAAM,0BAA0B,GAAG,UACzC,KAAsB;
|
|
1
|
+
{"version":3,"file":"CloudWatchEventFormatter.js","sourceRoot":"","sources":["../../../src/Providers/APIProvider/CloudWatchEventFormatter.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,EACN,+BAA+B,EAC/B,mCAAmC,EACnC,6BAA6B,GAC7B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,aAAa,IAAI,MAAM,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAEpE,IAAM,MAAM,GAAG,IAAI,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAChD,IAAM,mBAAmB,GAAG,IAAI,CAAC;AAEjC,MAAM,CAAC,IAAM,0BAA0B,GAAG,UACzC,KAAsB;IAGV,IAAA,iCAAkB,EAC7B,oCAAU,CACD;IAEV,OAAO;QACN,SAAS,WAAA;QACT,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;KAC9B,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,sBAAsB,GAAG,UAAC,KAAoB;IAClD,IAAA,2BAAS,EAAE,uBAAO,CAAW;IAErC,IAAI;QACH,IAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAExC,IAAM,YAAY,GAAG;YACpB,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,mBAAmB,CAAC;SAC9D,CAAC;QAEF,IAAI,WAAW,CAAC,IAAI,IAAI,IAAI,EAAE;YAC7B,YAAY,CACX,MAAM,CACN,GAAG,4DAA0D,IAAI,CAAC,SAAS,CAC3E,WAAW,CAAC,IAAI,CAChB,CAAC,SAAS,CAAC,CAAC,EAAE,mBAAmB,CAAG,CAAC;SACtC;QAED,OAAO;YACN,SAAS,WAAA;YACT,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC;SACrC,CAAC;KACF;IAAC,OAAO,KAAK,EAAE;QACf,MAAM,CAAC,IAAI,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;QAEzD,IAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YAChC,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,SAAS;YAChB,OAAO,EACN,+EAA+E;SAChF,CAAC,CAAC;QAEH,OAAO;YACN,SAAS,WAAA;YACT,OAAO,EAAE,SAAS;SAClB,CAAC;KACF;AACF,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,uBAAuB,GAAG,UACtC,MAAuB;IAEvB,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,IAAI,eAAe,GAAG,CAAC,CAAC;IAExB,OAAO,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE;QACvC,IAAI,YAAY,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,SAAS,GACZ,iBAAiB,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,+BAA+B,CAAC;QAE3E,IAAI,SAAS,GAAG,6BAA6B,EAAE;YAC9C,IAAM,SAAS,GAAG,mEAAiE,SAAS,8BAA2B,CAAC;YACxH,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAExB,YAAY,GAAG,sBAAsB,CAAC,YAAY,CAAC,CAAC;YACpD,MAAM,CAAC,eAAe,CAAC,GAAG,YAAY,CAAC;YAEvC,SAAS;gBACR,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM;oBACrD,+BAA+B,CAAC;SACjC;QAED,IAAI,aAAa,GAAG,SAAS,GAAG,mCAAmC,EAAE;YACpE,MAAM;SACN;QAED,aAAa,IAAI,SAAS,CAAC;QAC3B,eAAe,IAAI,CAAC,CAAC;KACrB;IAED,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;AACzC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Fetch.js","sourceRoot":"","sources":["../../../src/Providers/APIProvider/Fetch.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,IAAM,WAAW,GAAG,UAAC,IAAY,IAAK,OAAA,CAAC;IAC7C,MAAM,EAAE,MAAM;IACd,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"Fetch.js","sourceRoot":"","sources":["../../../src/Providers/APIProvider/Fetch.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,IAAM,WAAW,GAAG,UAAC,IAAY,IAAK,OAAA,CAAC;IAC7C,MAAM,EAAE,MAAM;IACd,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,UAAU;IACjB,WAAW,EAAE,aAAa;IAC1B,OAAO,EAAE;QACR,cAAc,EAAE,kBAAkB;KAClC;IACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;CAC1B,CAAC,EAT2C,CAS3C,CAAC"}
|
|
@@ -256,7 +256,14 @@ var AWSCloudWatchProvider = /** @class */ (function () {
|
|
|
256
256
|
};
|
|
257
257
|
AWSCloudWatchProvider.prototype.pushLogs = function (logs) {
|
|
258
258
|
logger.debug('pushing log events to Cloudwatch...');
|
|
259
|
-
|
|
259
|
+
var formattedLogs = logs.map(function (_a) {
|
|
260
|
+
var message = _a.message, timestamp = _a.timestamp;
|
|
261
|
+
return ({
|
|
262
|
+
message: message,
|
|
263
|
+
timestamp: timestamp,
|
|
264
|
+
});
|
|
265
|
+
});
|
|
266
|
+
this._dataTracker.logEvents = __spread(this._dataTracker.logEvents, formattedLogs);
|
|
260
267
|
};
|
|
261
268
|
AWSCloudWatchProvider.prototype._validateLogGroupExistsAndCreate = function (logGroupName) {
|
|
262
269
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AWSCloudWatchProvider.js","sourceRoot":"","sources":["../../src/Providers/AWSCloudWatchProvider.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"AWSCloudWatchProvider.js","sourceRoot":"","sources":["../../src/Providers/AWSCloudWatchProvider.ts"],"names":[],"mappings":"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"}
|
package/lib-esm/types/types.d.ts
CHANGED
|
@@ -29,7 +29,6 @@ export interface LoggingProvider {
|
|
|
29
29
|
getCategoryName(): string;
|
|
30
30
|
configure(config?: object): object;
|
|
31
31
|
pushLogs?(logs: InputLogEvent[]): void;
|
|
32
|
-
pushLog?(log: GenericLogEvent): void;
|
|
33
32
|
}
|
|
34
33
|
export interface AWSCloudWatchProviderOptions {
|
|
35
34
|
logGroupName?: string;
|
|
@@ -52,17 +51,30 @@ export interface APILoggingProviderOptions {
|
|
|
52
51
|
metadata?: {
|
|
53
52
|
[key: string]: any;
|
|
54
53
|
};
|
|
55
|
-
eventFormat?: EVENT_FORMAT;
|
|
56
54
|
bufferInterval?: number;
|
|
57
55
|
}
|
|
58
|
-
export
|
|
59
|
-
|
|
60
|
-
|
|
56
|
+
export interface LoggerEvent extends InputLogEvent {
|
|
57
|
+
loggerInfo?: {
|
|
58
|
+
level: string;
|
|
59
|
+
name: string;
|
|
60
|
+
data?: object;
|
|
61
|
+
error?: {
|
|
62
|
+
message: string;
|
|
63
|
+
name: string;
|
|
64
|
+
};
|
|
65
|
+
};
|
|
61
66
|
}
|
|
67
|
+
export declare function isLoggerEvent(inputLogEvent: any): inputLogEvent is LoggerEvent;
|
|
62
68
|
export interface GenericLogEvent {
|
|
63
69
|
level: string;
|
|
64
|
-
source: string;
|
|
65
|
-
timestamp: number;
|
|
66
70
|
message?: string;
|
|
67
|
-
|
|
71
|
+
context: {
|
|
72
|
+
category: string;
|
|
73
|
+
logTime: number;
|
|
74
|
+
data?: object;
|
|
75
|
+
};
|
|
76
|
+
error?: {
|
|
77
|
+
errorMessage: string;
|
|
78
|
+
errorName: string;
|
|
79
|
+
};
|
|
68
80
|
}
|
package/lib-esm/types/types.js
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
export
|
|
2
|
-
(function (
|
|
3
|
-
|
|
4
|
-
EVENT_FORMAT["CLOUDWATCH"] = "CLOUDWATCH";
|
|
5
|
-
})(EVENT_FORMAT || (EVENT_FORMAT = {}));
|
|
1
|
+
export function isLoggerEvent(inputLogEvent) {
|
|
2
|
+
return (inputLogEvent && !!Object.keys(inputLogEvent).find(function (k) { return k === 'loggerInfo'; }));
|
|
3
|
+
}
|
|
6
4
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types/types.ts"],"names":[],"mappings":"AAqFA,MAAM,UAAU,aAAa,CAC5B,aAAkB;IAElB,OAAO,CACN,aAAa,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,KAAK,YAAY,EAAlB,CAAkB,CAAC,CAC3E,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-amplify/core",
|
|
3
|
-
"version": "4.4.2-api-logging.
|
|
3
|
+
"version": "4.4.2-api-logging.4+87ef5e7f2",
|
|
4
4
|
"description": "Core category of aws-amplify",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"module": "./lib-esm/index.js",
|
|
@@ -108,5 +108,5 @@
|
|
|
108
108
|
"lib-esm"
|
|
109
109
|
]
|
|
110
110
|
},
|
|
111
|
-
"gitHead": "
|
|
111
|
+
"gitHead": "87ef5e7f21831dc7c299a062dda3dea242b9de23"
|
|
112
112
|
}
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
*/
|
|
13
13
|
|
|
14
14
|
import { InputLogEvent } from '@aws-sdk/client-cloudwatch-logs';
|
|
15
|
-
import {
|
|
15
|
+
import { LoggerEvent, LoggingProvider } from '../types';
|
|
16
16
|
import { AWS_CLOUDWATCH_CATEGORY } from '../Util/Constants';
|
|
17
17
|
import { Logger } from './logger-interface';
|
|
18
18
|
|
|
@@ -84,14 +84,14 @@ export class ConsoleLogger implements Logger {
|
|
|
84
84
|
|
|
85
85
|
_logGlobal(type: LOG_TYPE | string, ...msg) {
|
|
86
86
|
for (const pluggable of ConsoleLogger.pluggables) {
|
|
87
|
-
|
|
88
|
-
pluggable.pushLog(event);
|
|
87
|
+
pluggable.pushLogs([this._generateLoggerEvent(type, msg)]);
|
|
89
88
|
}
|
|
90
89
|
}
|
|
91
90
|
|
|
92
|
-
|
|
91
|
+
_generateLoggerEvent(type: LOG_TYPE | string, msg: any[]): LoggerEvent {
|
|
93
92
|
let strMessage = '';
|
|
94
93
|
let data;
|
|
94
|
+
let error: LoggerEvent['loggerInfo']['error'];
|
|
95
95
|
|
|
96
96
|
if (msg.length === 1 && typeof msg[0] === 'string') {
|
|
97
97
|
strMessage = msg[0];
|
|
@@ -103,20 +103,29 @@ export class ConsoleLogger implements Logger {
|
|
|
103
103
|
obj = obj[0];
|
|
104
104
|
}
|
|
105
105
|
strMessage = msg[0];
|
|
106
|
+
|
|
107
|
+
if (obj instanceof Error) {
|
|
108
|
+
error = {
|
|
109
|
+
message: obj.message,
|
|
110
|
+
name: obj.name,
|
|
111
|
+
};
|
|
112
|
+
}
|
|
113
|
+
|
|
106
114
|
data = obj;
|
|
107
115
|
} else {
|
|
108
116
|
data = msg;
|
|
109
117
|
}
|
|
110
118
|
|
|
111
|
-
|
|
112
|
-
data,
|
|
113
|
-
level: type,
|
|
119
|
+
return {
|
|
114
120
|
message: strMessage,
|
|
115
|
-
source: this.name,
|
|
116
121
|
timestamp: Date.now(),
|
|
122
|
+
loggerInfo: {
|
|
123
|
+
level: type.toLowerCase(),
|
|
124
|
+
name: this.name,
|
|
125
|
+
data,
|
|
126
|
+
error,
|
|
127
|
+
},
|
|
117
128
|
};
|
|
118
|
-
|
|
119
|
-
return event;
|
|
120
129
|
}
|
|
121
130
|
/**
|
|
122
131
|
* Write log
|
|
@@ -1,23 +1,19 @@
|
|
|
1
|
-
import { InputLogEvent } from '@aws-sdk/client-cloudwatch-logs';
|
|
2
1
|
import { ConsoleLogger as Logger, LOG_LEVELS, LOG_TYPE } from '../../Logger';
|
|
3
2
|
import LoggerConnectivity from './loggerConnectivity';
|
|
4
3
|
import {
|
|
5
|
-
EVENT_FORMAT,
|
|
6
4
|
LoggingProvider,
|
|
7
5
|
GenericLogEvent,
|
|
8
6
|
APILoggingProviderOptions,
|
|
7
|
+
isLoggerEvent,
|
|
9
8
|
} from '../../types/types';
|
|
10
9
|
import { jitteredExponentialRetry, NonRetryableError } from '../../../';
|
|
11
|
-
import {
|
|
12
|
-
cloudWatchEventFromGeneric,
|
|
13
|
-
cloudWatchLogEventBatch,
|
|
14
|
-
} from './CloudWatchEventFormatter';
|
|
15
10
|
import { postOptions } from './Fetch';
|
|
16
11
|
import {
|
|
17
12
|
API_LOGGING_PROVIDER_NAME,
|
|
18
13
|
API_LOGGING_PROVIDER_CATEGORY,
|
|
19
14
|
} from '../../Util/Constants';
|
|
20
15
|
import { getStringByteSize } from '../../Util/StringUtils';
|
|
16
|
+
import { InputLogEvent } from '@aws-sdk/client-cloudwatch-logs';
|
|
21
17
|
|
|
22
18
|
const logger = new Logger('APILoggingProvider');
|
|
23
19
|
const HTTPS = 'https';
|
|
@@ -44,7 +40,7 @@ class APILoggingProvider implements LoggingProvider {
|
|
|
44
40
|
private connectivity: LoggerConnectivity;
|
|
45
41
|
private online: boolean = false;
|
|
46
42
|
private bufferInterval: ReturnType<typeof setInterval>;
|
|
47
|
-
private eventBuffer: GenericLogEvent[]
|
|
43
|
+
private eventBuffer: GenericLogEvent[] = [];
|
|
48
44
|
|
|
49
45
|
constructor(config?: APILoggingProviderOptions) {
|
|
50
46
|
this.configure(config);
|
|
@@ -77,25 +73,48 @@ class APILoggingProvider implements LoggingProvider {
|
|
|
77
73
|
}
|
|
78
74
|
}
|
|
79
75
|
|
|
80
|
-
public
|
|
76
|
+
public pushLogs(events: InputLogEvent[]): void {
|
|
81
77
|
if (this.config?.enabled === false) {
|
|
82
78
|
return;
|
|
83
79
|
}
|
|
84
80
|
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
81
|
+
events.forEach(event => {
|
|
82
|
+
if (!isLoggerEvent(event)) {
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
88
85
|
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
86
|
+
const {
|
|
87
|
+
message,
|
|
88
|
+
timestamp,
|
|
89
|
+
loggerInfo: {
|
|
90
|
+
level,
|
|
91
|
+
data,
|
|
92
|
+
name,
|
|
93
|
+
error: { message: errorMessage, name: errorName } = {},
|
|
94
|
+
},
|
|
95
|
+
} = event;
|
|
96
|
+
|
|
97
|
+
const error = errorName &&
|
|
98
|
+
errorMessage && {
|
|
99
|
+
errorMessage,
|
|
100
|
+
errorName,
|
|
101
|
+
};
|
|
102
|
+
|
|
103
|
+
const combinedEvent: GenericLogEvent = {
|
|
104
|
+
level,
|
|
105
|
+
error,
|
|
106
|
+
message,
|
|
107
|
+
context: {
|
|
108
|
+
category: name,
|
|
109
|
+
data: { ...data, ...this.config.metadata },
|
|
110
|
+
logTime: timestamp,
|
|
111
|
+
},
|
|
112
|
+
};
|
|
113
|
+
|
|
114
|
+
if (this.verifyEvent(combinedEvent)) {
|
|
115
|
+
this.eventBuffer.push(combinedEvent);
|
|
116
|
+
}
|
|
117
|
+
});
|
|
99
118
|
}
|
|
100
119
|
|
|
101
120
|
private validateConfig(config: APILoggingProviderOptions): void {
|
|
@@ -126,7 +145,6 @@ class APILoggingProvider implements LoggingProvider {
|
|
|
126
145
|
metadata: config.metadata,
|
|
127
146
|
enabled: config.enabled ?? true,
|
|
128
147
|
level: config.level ?? LOG_TYPE.WARN,
|
|
129
|
-
eventFormat: config.eventFormat ?? EVENT_FORMAT.CLOUDWATCH,
|
|
130
148
|
bufferInterval: config.bufferInterval ?? DEFAULT_INTERVAL,
|
|
131
149
|
excludeClassList:
|
|
132
150
|
config.excludeClassList instanceof Array
|
|
@@ -195,7 +213,7 @@ class APILoggingProvider implements LoggingProvider {
|
|
|
195
213
|
Filter out events that don't adhere to config settings
|
|
196
214
|
*/
|
|
197
215
|
private verifyEvent(event: GenericLogEvent): boolean {
|
|
198
|
-
const { level,
|
|
216
|
+
const { level, context } = event;
|
|
199
217
|
|
|
200
218
|
const configLevelValue = LOG_LEVELS[this.config.level];
|
|
201
219
|
const eventLevelValue = LOG_LEVELS[level];
|
|
@@ -204,7 +222,7 @@ class APILoggingProvider implements LoggingProvider {
|
|
|
204
222
|
return false;
|
|
205
223
|
}
|
|
206
224
|
|
|
207
|
-
if (this.config.excludeClassList.includes(
|
|
225
|
+
if (this.config.excludeClassList.includes(context.category)) {
|
|
208
226
|
return false;
|
|
209
227
|
}
|
|
210
228
|
|
|
@@ -212,15 +230,14 @@ class APILoggingProvider implements LoggingProvider {
|
|
|
212
230
|
}
|
|
213
231
|
|
|
214
232
|
private async uploadEvents(): Promise<void> {
|
|
215
|
-
const eventBatch = this.
|
|
233
|
+
const eventBatch = this.genericLogEventBatch(this.eventBuffer);
|
|
216
234
|
|
|
217
235
|
if (eventBatch.length < 1) {
|
|
218
236
|
return;
|
|
219
237
|
}
|
|
220
238
|
|
|
221
239
|
const body = {
|
|
222
|
-
|
|
223
|
-
metadata: this.config.metadata,
|
|
240
|
+
logs: eventBatch,
|
|
224
241
|
};
|
|
225
242
|
|
|
226
243
|
const options = postOptions(body);
|
|
@@ -228,11 +245,7 @@ class APILoggingProvider implements LoggingProvider {
|
|
|
228
245
|
await jitteredExponentialRetry(
|
|
229
246
|
async (endpoint, options) => {
|
|
230
247
|
try {
|
|
231
|
-
|
|
232
|
-
if (!res.ok)
|
|
233
|
-
throw new Error(
|
|
234
|
-
`Request Failed. Status: ${res.status} - ${res.statusText}`
|
|
235
|
-
);
|
|
248
|
+
await fetch(endpoint, options); // fetch doesnt return info for no-cors request
|
|
236
249
|
} catch (error) {
|
|
237
250
|
// fetch will only fail in the event of a network error. Don't retry
|
|
238
251
|
if (error.message === 'Failed to fetch') {
|
|
@@ -250,19 +263,6 @@ class APILoggingProvider implements LoggingProvider {
|
|
|
250
263
|
this.eventBuffer.splice(0, eventBatch.length);
|
|
251
264
|
}
|
|
252
265
|
|
|
253
|
-
private generateEventBatch(
|
|
254
|
-
buffer: GenericLogEvent[] | InputLogEvent[]
|
|
255
|
-
): GenericLogEvent[] | InputLogEvent[] {
|
|
256
|
-
switch (this.config.eventFormat) {
|
|
257
|
-
case EVENT_FORMAT.CLOUDWATCH:
|
|
258
|
-
return cloudWatchLogEventBatch(buffer as InputLogEvent[]);
|
|
259
|
-
|
|
260
|
-
case EVENT_FORMAT.GENERIC:
|
|
261
|
-
default:
|
|
262
|
-
return this.genericLogEventBatch(buffer as GenericLogEvent[]);
|
|
263
|
-
}
|
|
264
|
-
}
|
|
265
|
-
|
|
266
266
|
private genericLogEventBatch(buffer: GenericLogEvent[]): GenericLogEvent[] {
|
|
267
267
|
let totalByteSize = 0;
|
|
268
268
|
let currentEventIdx = 0;
|
|
@@ -13,11 +13,14 @@ const TRUNCATE_MAX_LENGTH = 5000;
|
|
|
13
13
|
export const cloudWatchEventFromGeneric = (
|
|
14
14
|
event: GenericLogEvent
|
|
15
15
|
): InputLogEvent => {
|
|
16
|
-
const {
|
|
16
|
+
const {
|
|
17
|
+
context: { logTime: timestamp },
|
|
18
|
+
...message
|
|
19
|
+
} = event;
|
|
17
20
|
|
|
18
21
|
return {
|
|
19
22
|
timestamp,
|
|
20
|
-
message: JSON.stringify(
|
|
23
|
+
message: JSON.stringify(event),
|
|
21
24
|
};
|
|
22
25
|
};
|
|
23
26
|
|