Add support for server-side logFieldMaxLength

Author: eliangcs

packages/core/src/tools/create-logger.js

@@ -284,27 +284,38 @@ const sendLog = async (logStreamFactory, options, event, message, data) => {
     data.input = truncateData(data.input, MAX_LENGTH);
     data.output = truncateData(data.output, MAX_LENGTH);
   }
+
   // scrub throws an error if there are no secrets
-  const safeMessage = truncateString(
-    sensitiveValues.length ? scrub(message, sensitiveValues) : message
-  );
-  const safeData = recurseReplace(
-    sensitiveValues.length ? scrub(data, sensitiveValues) : data,
-    truncateString
-  );
-  const unsafeData = recurseReplace(data, truncateString);
+  let safeMessage, safeData;
+  if (sensitiveValues.length) {
+    safeMessage = scrub(message, sensitiveValues);
+    safeData = scrub(data, sensitiveValues);
+  } else {
+    safeMessage = message;
+    safeData = data;
+  }
+
+  let safeKeyData = _.pick(data, SAFE_LOG_KEYS);
+
+  if (event.logFieldMaxLength != null && event.logFieldMaxLength >= 0) {
+    const truncate = (s) =>
+      simpleTruncate(s, event.logFieldMaxLength, ' [...]');
+
+    safeMessage = truncate(safeMessage);
+    safeData = recurseReplace(safeData, truncate);
+    safeKeyData = recurseReplace(safeKeyData, truncate);
+  }
+
   // Keep safe log keys uncensored
-  Object.keys(safeData).forEach((key) => {
-    if (SAFE_LOG_KEYS.includes(key)) {
-      safeData[key] = unsafeData[key];
-    }
+  Object.entries(safeKeyData).forEach(([key, value]) => {
+    safeData[key] = value;
   });
 
   safeData.request_headers = formatHeaders(safeData.request_headers);
   safeData.response_headers = formatHeaders(safeData.response_headers);
 
   if (event.logToStdout) {
-    toStdout(event, message, unsafeData);
+    toStdout(event, message, safeData);
   }
 
   if (options.logBuffer && data.log_type === 'console') {

packages/core/test/logger.js

@@ -505,6 +505,37 @@ describe('logger', () => {
     ]);
   });
 
+  it('should honor logFieldMaxLength from server', async () => {
+    const bundle = {
+      authData: {
+        password: 'secret',
+        key: '123456789',
+      },
+    };
+    const logger = createlogger({ bundle, logFieldMaxLength: 40 }, options);
+
+    const data = {
+      log_type: 'http',
+      response_content: '9876543210-98765443210-9876543210-9876543210',
+      request_data: '0123456789-0123456789-0123456789-0123456789',
+    };
+
+    logger('200 GET https://example.com/test', data);
+    const response = await logger.end(1000);
+    response.status.should.eql(200);
+    response.content.token.should.eql(options.token);
+    response.content.logs.should.deepEqual([
+      {
+        message: '200 GET https://example.com/test',
+        data: {
+          log_type: 'http',
+          response_content: '9876543210-98765443210-9876543210- [...]',
+          request_data: '0:censored:9:f0d5b7b789:-0:censore [...]',
+        },
+      },
+    ]);
+  });
+
   it('should send multiple logs in a request', async () => {
     const logger = createlogger({}, options);