@contrast/agent-bundle 5.46.0 → 5.48.0

package/node_modules/pino/docs/web.md

@@ -12,6 +12,7 @@ web framework ecosystem.
   - [Pino with Node core `http`](#pino-with-node-core-http)
   - [Pino with Nest](#pino-with-nest)
   - [Pino with H3](#pino-with-h3)
+  - [Pino with Hono](#pino-with-hono)
 
 <a id="fastify"></a>
 ## Pino with Fastify
@@ -236,24 +237,73 @@ See the [nestjs-pino README](https://npm.im/nestjs-pino) for more info.
 ## Pino with H3
 
 ```sh
-npm install pino-http
+npm install pino-http h3
 ```
 
+Save as `server.mjs`:
+
 ```js
-import { createServer } from 'http'
-import { createApp } from 'h3'
+import { createApp, createRouter, eventHandler, fromNodeMiddleware } from "h3";
 import pino from 'pino-http'
 
-const app = createApp()
+export const app = createApp();
 
-app.use(pino())
+const router = createRouter();
+app.use(router);
+app.use(fromNodeMiddleware(pino()))
 
-app.use('/', (req) => {
-  req.log.info('something')
+app.use(eventHandler((event) => {
+  event.node.req.log.info('something')
   return 'hello world'
-})
+}))
+
+router.get(
+  "/",
+  eventHandler((event) => {
+    return { path: event.path, message: "Hello World!" };
+  }),
+);
+```
+
+Execute `npx --yes listhen -w --open ./server.mjs`.
+
+See the [pino-http README](https://npm.im/pino-http) for more info.
+
+
+<a id="hono"></a>
+## Pino with Hono
+
+```sh
+npm install pino pino-http hono
+```
+
+```js
+import { serve } from '@hono/node-server';
+import { Hono } from 'hono';
+import { requestId } from 'hono/request-id';
+import { pinoHttp } from 'pino-http';
+
+const app = new Hono();
+app.use(requestId());
+app.use(async (c, next) => {
+  // pass hono's request-id to pino-http
+  c.env.incoming.id = c.var.requestId;
+
+  // map express style middleware to hono
+  await new Promise((resolve) => pinoHttp()(c.env.incoming, c.env.outgoing, () => resolve()));
+
+  c.set('logger', c.env.incoming.log);
+
+  await next();
+});
+
+app.get('/', (c) => {
+  c.var.logger.info('something');
+
+  return c.text('Hello Node.js!');
+});
 
-createServer(app).listen(process.env.PORT || 3000)
+serve(app);
 ```
 
 See the [pino-http README](https://npm.im/pino-http) for more info.

package/node_modules/pino/eslint.config.js

@@ -0,0 +1,19 @@
+'use strict'
+
+const { defineConfig, globalIgnores } = require('eslint/config')
+const neostandard = require('neostandard')
+
+module.exports = defineConfig([
+  neostandard({}),
+  globalIgnores([
+    'pino.d.ts',
+    'test/types/pino.test-d.ts',
+    'test/fixtures/syntax-error-esm.mjs',
+    'test/fixtures/ts/*cjs',
+  ]),
+  {
+    rules: {
+      'no-var': 'off',
+    },
+  },
+])

package/node_modules/pino/examples/transport.js

@@ -1,8 +1,8 @@
 'use strict'
 
 const pino = require('..')
-const { tmpdir } = require('os')
-const { join } = require('path')
+const { tmpdir } = require('node:os')
+const { join } = require('node:path')
 
 const file = join(tmpdir(), `pino-${process.pid}-example`)
 

package/node_modules/pino/file.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const pino = require('./pino')
-const { once } = require('events')
+const { once } = require('node:events')
 
 module.exports = async function (opts = {}) {
   const destOpts = Object.assign({}, opts, { dest: opts.destination || 1, sync: false })

package/node_modules/pino/lib/meta.js

@@ -1,3 +1,3 @@
 'use strict'
 
-module.exports = { version: '8.21.0' }
+module.exports = { version: '10.1.0' }

package/node_modules/pino/lib/multistream.js

@@ -6,7 +6,6 @@ const { DEFAULT_LEVELS } = require('./constants')
 const DEFAULT_INFO_LEVEL = DEFAULT_LEVELS.info
 
 function multistream (streamsArray, opts) {
-  let counter = 0
   streamsArray = streamsArray || []
   opts = opts || { dedupe: false }
 
@@ -21,10 +20,12 @@ function multistream (streamsArray, opts) {
   const res = {
     write,
     add,
+    remove,
     emit,
     flushSync,
     end,
     minLevel: 0,
+    lastId: 0,
     streams: [],
     clone,
     [metadata]: true,
@@ -126,7 +127,7 @@ function multistream (streamsArray, opts) {
       stream: stream_,
       level,
       levelVal: undefined,
-      id: counter++
+      id: ++res.lastId
     }
 
     streams.unshift(dest_)
@@ -137,6 +138,19 @@ function multistream (streamsArray, opts) {
     return res
   }
 
+  function remove (id) {
+    const { streams } = this
+    const index = streams.findIndex(s => s.id === id)
+
+    if (index >= 0) {
+      streams.splice(index, 1)
+      streams.sort(compareByLevel)
+      this.minLevel = streams.length > 0 ? streams[0].level : -1
+    }
+
+    return res
+  }
+
   function end () {
     for (const { stream } of this.streams) {
       if (typeof stream.flushSync === 'function') {
@@ -159,6 +173,7 @@ function multistream (streamsArray, opts) {
     return {
       write,
       add,
+      remove,
       minLevel: level,
       streams,
       clone,

package/node_modules/pino/lib/proto.js

@@ -2,14 +2,13 @@
 
 /* eslint no-prototype-builtins: 0 */
 
-const { EventEmitter } = require('events')
+const { EventEmitter } = require('node:events')
 const {
   lsCacheSym,
   levelValSym,
   setLevelSym,
   getLevelSym,
   chindingsSym,
-  parsedChindingsSym,
   mixinSym,
   asJsonSym,
   writeSym,
@@ -27,7 +26,8 @@ const {
   stringifySym,
   formatOptsSym,
   stringifiersSym,
-  msgPrefixSym
+  msgPrefixSym,
+  hooksSym
 } = require('./symbols')
 const {
   getLevel,
@@ -42,7 +42,8 @@ const {
   asChindings,
   asJson,
   buildFormatters,
-  stringify
+  stringify,
+  noop
 } = require('./tools')
 const {
   version
@@ -64,6 +65,8 @@ const prototype = {
   set level (lvl) { this[setLevelSym](lvl) },
   get levelVal () { return this[levelValSym] },
   set levelVal (n) { throw Error('levelVal is read-only') },
+  get msgPrefix () { return this[msgPrefixSym] },
+  get [Symbol.toStringTag] () { return 'Pino' },
   [lsCacheSym]: initialLsCache,
   [writeSym]: write,
   [asJsonSym]: asJson,
@@ -83,11 +86,32 @@ function child (bindings, options) {
   if (!bindings) {
     throw Error('missing bindings for child Pino')
   }
-  options = options || {} // default options to empty object
   const serializers = this[serializersSym]
   const formatters = this[formattersSym]
   const instance = Object.create(this)
 
+  // If an `options` object was not supplied, we can improve
+  // the performance of child creation by skipping
+  // the checks for set options and simply return
+  // a baseline instance.
+  if (options == null) {
+    if (instance[formattersSym].bindings !== resetChildingsFormatter) {
+      instance[formattersSym] = buildFormatters(
+        formatters.level,
+        resetChildingsFormatter,
+        formatters.log
+      )
+    }
+
+    instance[chindingsSym] = asChindings(instance, bindings)
+
+    if (this.onChild !== noop) {
+      this.onChild(instance)
+    }
+
+    return instance
+  }
+
   if (options.hasOwnProperty('serializers') === true) {
     instance[serializersSym] = Object.create(null)
 
@@ -145,8 +169,10 @@ function child (bindings, options) {
   }
 
   instance[chindingsSym] = asChindings(instance, bindings)
-  const childLevel = options.level || this.level
-  instance[setLevelSym](childLevel)
+  if ((options.level !== undefined && options.level !== this.level) || options.hasOwnProperty('customLevels')) {
+    const childLevel = options.level || this.level
+    instance[setLevelSym](childLevel)
+  }
   this.onChild(instance)
   return instance
 }
@@ -163,7 +189,6 @@ function bindings () {
 function setBindings (newBindings) {
   const chindings = asChindings(this, newBindings)
   this[chindingsSym] = chindings
-  delete this[parsedChindingsSym]
 }
 
 /**
@@ -185,6 +210,7 @@ function write (_obj, msg, num) {
   const messageKey = this[messageKeySym]
   const mixinMergeStrategy = this[mixinMergeStrategySym] || defaultMixinMergeStrategy
   let obj
+  const streamWriteHook = this[hooksSym].streamWrite
 
   if (_obj === undefined || _obj === null) {
     obj = {}
@@ -214,11 +240,9 @@ function write (_obj, msg, num) {
     stream.lastTime = t.slice(this[timeSliceIndexSym])
     stream.lastLogger = this // for child loggers
   }
-  stream.write(s)
+  stream.write(streamWriteHook ? streamWriteHook(s) : s)
 }
 
-function noop () {}
-
 function flush (cb) {
   if (cb != null && typeof cb !== 'function') {
     throw Error('callback must be a function')

package/node_modules/pino/lib/redaction.js

@@ -1,19 +1,16 @@
 'use strict'
 
-const fastRedact = require('fast-redact')
+const Redact = require('@pinojs/redact')
 const { redactFmtSym, wildcardFirstSym } = require('./symbols')
-const { rx, validator } = fastRedact
 
-const validate = validator({
-  ERR_PATHS_MUST_BE_STRINGS: () => 'pino – redacted paths must be strings',
-  ERR_INVALID_PATH: (s) => `pino – redact paths array contains an invalid path (${s})`
-})
+// Custom rx regex equivalent to fast-redact's rx
+const rx = /[^.[\]]+|\[([^[\]]*?)\]/g
 
 const CENSOR = '[Redacted]'
 const strict = false // TODO should this be configurable?
 
 function redaction (opts, serialize) {
-  const { paths, censor } = handle(opts)
+  const { paths, censor, remove } = handle(opts)
 
   const shape = paths.reduce((o, str) => {
     rx.lastIndex = 0
@@ -73,7 +70,7 @@ function redaction (opts, serialize) {
   // provides top level redaction for instances where
   // an object is interpolated into the msg string
   const result = {
-    [redactFmtSym]: fastRedact({ paths, censor, serialize, strict })
+    [redactFmtSym]: Redact({ paths, censor, serialize, strict, remove })
   }
 
   const topCensor = (...args) => {
@@ -90,11 +87,12 @@ function redaction (opts, serialize) {
             return censor(value, [k, ...path])
           }
         : censor
-      o[k] = fastRedact({
+      o[k] = Redact({
         paths: shape[k],
         censor: wrappedCensor,
         serialize,
-        strict
+        strict,
+        remove
       })
     }
     return o
@@ -104,15 +102,13 @@ function redaction (opts, serialize) {
 function handle (opts) {
   if (Array.isArray(opts)) {
     opts = { paths: opts, censor: CENSOR }
-    validate(opts)
     return opts
   }
   let { paths, censor = CENSOR, remove } = opts
   if (Array.isArray(paths) === false) { throw Error('pino – redact must contain an array of strings') }
   if (remove === true) censor = undefined
-  validate({ paths, censor })
 
-  return { paths, censor }
+  return { paths, censor, remove }
 }
 
 module.exports = redaction

package/node_modules/pino/lib/time.js

@@ -8,4 +8,32 @@ const unixTime = () => `,"time":${Math.round(Date.now() / 1000.0)}`
 
 const isoTime = () => `,"time":"${new Date(Date.now()).toISOString()}"` // using Date.now() for testability
 
-module.exports = { nullTime, epochTime, unixTime, isoTime }
+const NS_PER_MS = 1_000_000n
+const NS_PER_SEC = 1_000_000_000n
+
+const startWallTimeNs = BigInt(Date.now()) * NS_PER_MS
+const startHrTime = process.hrtime.bigint()
+
+const isoTimeNano = () => {
+  const elapsedNs = process.hrtime.bigint() - startHrTime
+  const currentTimeNs = startWallTimeNs + elapsedNs
+
+  const secondsSinceEpoch = currentTimeNs / NS_PER_SEC
+  const nanosWithinSecond = currentTimeNs % NS_PER_SEC
+
+  const msSinceEpoch = Number(secondsSinceEpoch * 1000n + nanosWithinSecond / 1_000_000n)
+  const date = new Date(msSinceEpoch)
+
+  const year = date.getUTCFullYear()
+  const month = (date.getUTCMonth() + 1).toString().padStart(2, '0')
+  const day = date.getUTCDate().toString().padStart(2, '0')
+  const hours = date.getUTCHours().toString().padStart(2, '0')
+  const minutes = date.getUTCMinutes().toString().padStart(2, '0')
+  const seconds = date.getUTCSeconds().toString().padStart(2, '0')
+
+  return `,"time":"${year}-${month}-${day}T${hours}:${minutes}:${seconds}.${nanosWithinSecond
+    .toString()
+    .padStart(9, '0')}Z"`
+}
+
+module.exports = { nullTime, epochTime, unixTime, isoTime, isoTimeNano }

package/node_modules/pino/lib/tools.js

@@ -2,6 +2,7 @@
 
 /* eslint no-prototype-builtins: 0 */
 
+const diagChan = require('node:diagnostics_channel')
 const format = require('quick-format-unescaped')
 const { mapHttpRequest, mapHttpResponse } = require('pino-std-serializers')
 const SonicBoom = require('sonic-boom')
@@ -27,6 +28,8 @@ const {
 const { isMainThread } = require('worker_threads')
 const transport = require('./transport')
 
+const asJsonChan = diagChan.tracingChannel('pino_asJson')
+
 function noop () {
 }
 
@@ -103,7 +106,38 @@ function asString (str) {
   return point < 32 ? JSON.stringify(str) : '"' + result + '"'
 }
 
+/**
+ * `asJson` wraps `_asJson` in order to facilitate generating diagnostics.
+ *
+ * @param {object} obj The merging object passed to the log method.
+ * @param {string} msg The log message passed to the log method.
+ * @param {number} num The log level number.
+ * @param {number} time The log time in milliseconds.
+ *
+ * @returns {string}
+ */
 function asJson (obj, msg, num, time) {
+  if (asJsonChan.hasSubscribers === false) {
+    return _asJson.call(this, obj, msg, num, time)
+  }
+
+  const store = { instance: this, arguments }
+  return asJsonChan.traceSync(_asJson, store, this, obj, msg, num, time)
+}
+
+/**
+ * `_asJson` parses all collected data and generates the finalized newline
+ * delimited JSON string.
+ *
+ * @param {object} obj The merging object passed to the log method.
+ * @param {string} msg The log message passed to the log method.
+ * @param {number} num The log level number.
+ * @param {number} time The log time in milliseconds.
+ *
+ * @returns {string} The finalized log string terminated with a newline.
+ * @private
+ */
+function _asJson (obj, msg, num, time) {
   const stringify = this[stringifySym]
   const stringifySafe = this[stringifySafeSym]
   const stringifiers = this[stringifiersSym]
@@ -170,7 +204,6 @@ function asJson (obj, msg, num, time) {
       case 'function':
         break
       case 'number':
-        /* eslint no-fallthrough: "off" */
         if (Number.isFinite(value) === false) {
           value = null
         }
@@ -211,10 +244,10 @@ function asChindings (instance, bindings) {
 
   for (const key in bindings) {
     value = bindings[key]
-    const valid = key !== 'level' &&
+    const valid = (key.length < 5 || (key !== 'level' &&
       key !== 'serializers' &&
       key !== 'formatters' &&
-      key !== 'customLevels' &&
+      key !== 'customLevels')) &&
       bindings.hasOwnProperty(key) &&
       value !== undefined
     if (valid === true) {
@@ -231,15 +264,11 @@ function hasBeenTampered (stream) {
   return stream.write !== stream.constructor.prototype.write
 }
 
-const hasNodeCodeCoverage = process.env.NODE_V8_COVERAGE || process.env.V8_COVERAGE
-
 function buildSafeSonicBoom (opts) {
   const stream = new SonicBoom(opts)
   stream.on('error', filterBrokenPipe)
   // If we are sync: false, we must flush on exit
-  // We must disable this if there is node code coverage due to
-  // https://github.com/nodejs/node/issues/49344#issuecomment-1741776308.
-  if (!hasNodeCodeCoverage && !opts.sync && isMainThread) {
+  if (!opts.sync && isMainThread) {
     onExit.register(stream, autoEnd)
 
     stream.on('close', function () {

package/node_modules/pino/lib/transport-stream.js

@@ -7,13 +7,13 @@ module.exports = loadTransportStreamBuilder
 /**
  * Loads & returns a function to build transport streams
  * @param {string} target
- * @returns {function(object): Promise<import('stream').Writable>}
+ * @returns {Promise<function(object): Promise<import('node:stream').Writable>>}
  * @throws {Error} In case the target module does not export a function
  */
 async function loadTransportStreamBuilder (target) {
   let fn
   try {
-    const toLoad = 'file://' + target
+    const toLoad = target.startsWith('file://') ? target : 'file://' + target
 
     if (toLoad.endsWith('.ts') || toLoad.endsWith('.cts')) {
       // TODO: add support for the TSM modules loader ( https://github.com/lukeed/tsm ).
@@ -31,9 +31,15 @@ async function loadTransportStreamBuilder (target) {
     // See this PR for details: https://github.com/pinojs/thread-stream/pull/34
     if ((error.code === 'ENOTDIR' || error.code === 'ERR_MODULE_NOT_FOUND')) {
       fn = realRequire(target)
-    } else if (error.code === undefined) {
+    } else if (error.code === undefined || error.code === 'ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING') {
       // When bundled with pkg, an undefined error is thrown when called with realImport
-      fn = realRequire(decodeURIComponent(target))
+      // When bundled with pkg and using node v20, an ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING error is thrown when called with realImport
+      // More info at: https://github.com/pinojs/thread-stream/issues/143
+      try {
+        fn = realRequire(decodeURIComponent(target))
+      } catch {
+        throw error
+      }
     } else {
       throw error
     }

package/node_modules/pino/lib/transport.js

@@ -2,7 +2,7 @@
 
 const { createRequire } = require('module')
 const getCallers = require('./caller')
-const { join, isAbsolute, sep } = require('path')
+const { join, isAbsolute, sep } = require('node:path')
 const sleep = require('atomic-sleep')
 const onExit = require('on-exit-leak-free')
 const ThreadStream = require('thread-stream')
@@ -17,11 +17,12 @@ function setupOnExit (stream) {
   })
 }
 
-function buildStream (filename, workerData, workerOpts) {
+function buildStream (filename, workerData, workerOpts, sync) {
   const stream = new ThreadStream({
     filename,
     workerData,
-    workerOpts
+    workerOpts,
+    sync
   })
 
   stream.on('ready', onReady)
@@ -71,7 +72,11 @@ function flush (stream) {
 }
 
 function transport (fullOptions) {
-  const { pipeline, targets, levels, dedupe, options = {}, worker = {}, caller = getCallers() } = fullOptions
+  const { pipeline, targets, levels, dedupe, worker = {}, caller = getCallers(), sync = false } = fullOptions
+
+  const options = {
+    ...fullOptions.options
+  }
 
   // Backwards compatibility
   const callers = typeof caller === 'string' ? [caller] : caller
@@ -87,20 +92,29 @@ function transport (fullOptions) {
 
   if (targets) {
     target = bundlerOverrides['pino-worker'] || join(__dirname, 'worker.js')
-    options.targets = targets.map((dest) => {
+    options.targets = targets.filter(dest => dest.target).map((dest) => {
       return {
         ...dest,
         target: fixTarget(dest.target)
       }
     })
+    options.pipelines = targets.filter(dest => dest.pipeline).map((dest) => {
+      return dest.pipeline.map((t) => {
+        return {
+          ...t,
+          level: dest.level, // duplicate the pipeline `level` property defined in the upper level
+          target: fixTarget(t.target)
+        }
+      })
+    })
   } else if (pipeline) {
-    target = bundlerOverrides['pino-pipeline-worker'] || join(__dirname, 'worker-pipeline.js')
-    options.targets = pipeline.map((dest) => {
+    target = bundlerOverrides['pino-worker'] || join(__dirname, 'worker.js')
+    options.pipelines = [pipeline.map((dest) => {
       return {
         ...dest,
         target: fixTarget(dest.target)
       }
-    })
+    })]
   }
 
   if (levels) {
@@ -113,7 +127,7 @@ function transport (fullOptions) {
 
   options.pinoWillSendConfig = true
 
-  return buildStream(fixTarget(target), options, worker)
+  return buildStream(fixTarget(target), options, worker, sync)
 
   function fixTarget (origin) {
     origin = bundlerOverrides[origin] || origin