@backstage/backend-app-api 0.7.4 → 0.7.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @backstage/backend-app-api
 
+## 0.7.5
+
+### Patch Changes
+
+- da155d1: Fixing issue with log meta fields possibly being circular refs
+
 ## 0.7.4
 
 ### Patch Changes

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-app-api",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "main": "../dist/alpha.cjs.js",
   "types": "../dist/alpha.d.ts"
 }

package/dist/index.cjs.js

@@ -20,6 +20,7 @@ var minimatch = require('minimatch');
 var errors = require('@backstage/errors');
 var crypto = require('crypto');
 var winston = require('winston');
+var tripleBeam = require('triple-beam');
 var backendPluginApi = require('@backstage/backend-plugin-api');
 var alpha = require('@backstage/backend-plugin-api/alpha');
 var luxon = require('luxon');
@@ -844,8 +845,8 @@ const _WinstonLogger = class _WinstonLogger {
     let logger = winston.createLogger({
       level: process.env.LOG_LEVEL || options.level || "info",
       format: winston.format.combine(
-        redacter.format,
-        (_a = options.format) != null ? _a : defaultFormatter
+        (_a = options.format) != null ? _a : defaultFormatter,
+        redacter.format
       ),
       transports: (_b = options.transports) != null ? _b : new winston.transports.Console()
     });
@@ -860,24 +861,15 @@ const _WinstonLogger = class _WinstonLogger {
   static redacter() {
     const redactionSet = /* @__PURE__ */ new Set();
     let redactionPattern = void 0;
-    const replace = (obj) => {
-      var _a;
-      for (const key in obj) {
-        if (Object.hasOwn(obj, key)) {
-          if (typeof obj[key] === "object") {
-            obj[key] = replace(obj[key]);
-          } else if (typeof obj[key] === "string") {
-            try {
-              obj[key] = (_a = obj[key]) == null ? void 0 : _a.replace(redactionPattern, "[REDACTED]");
-            } catch {
-            }
-          }
-        }
-      }
-      return obj;
-    };
     return {
-      format: winston.format(replace)(),
+      format: winston.format((obj) => {
+        var _a, _b;
+        if (!redactionPattern || !obj) {
+          return obj;
+        }
+        obj[tripleBeam.MESSAGE] = (_b = (_a = obj[tripleBeam.MESSAGE]) == null ? void 0 : _a.replace) == null ? void 0 : _b.call(_a, redactionPattern, "[REDACTED]");
+        return obj;
+      })(),
       add(newRedactions) {
         let added = 0;
         for (const redactionToTrim of newRedactions) {