@contrast/agent-bundle 5.46.0 → 5.48.0

package/node_modules/pino/test/fixtures/syncfalse-exit.js

@@ -1,6 +1,6 @@
 global.process = { __proto__: process, pid: 123456 }
 Date.now = function () { return 1459875739796 }
-require('os').hostname = function () { return 'abcdefghijklmnopqr' }
+require('node:os').hostname = function () { return 'abcdefghijklmnopqr' }
 const pino = require(require.resolve('./../../'))
 const dest = pino.destination({ dest: 1, minLength: 4096, sync: false })
 const logger = pino({}, dest)

package/node_modules/pino/test/fixtures/syncfalse-flush-exit.js

@@ -1,6 +1,6 @@
 global.process = { __proto__: process, pid: 123456 }
 Date.now = function () { return 1459875739796 }
-require('os').hostname = function () { return 'abcdefghijklmnopqr' }
+require('node:os').hostname = function () { return 'abcdefghijklmnopqr' }
 const pino = require(require.resolve('./../../'))
 const dest = pino.destination({ dest: 1, minLength: 4096, sync: false })
 const logger = pino({}, dest)

package/node_modules/pino/test/fixtures/syncfalse.js

@@ -1,6 +1,6 @@
 global.process = { __proto__: process, pid: 123456 }
 Date.now = function () { return 1459875739796 }
-require('os').hostname = function () { return 'abcdefghijklmnopqr' }
+require('node:os').hostname = function () { return 'abcdefghijklmnopqr' }
 const pino = require(require.resolve('./../../'))
 const asyncLogger = pino(pino.destination({ minLength: 4096, sync: false }))
 asyncLogger.info('h')

package/node_modules/pino/test/fixtures/syntax-error-esm.mjs

@@ -0,0 +1,2 @@
+// This is a syntax error
+import

package/node_modules/pino/test/fixtures/to-file-transport-with-transform.js

@@ -1,8 +1,8 @@
 'use strict'
 
-const fs = require('fs')
-const { once } = require('events')
-const { Transform } = require('stream')
+const fs = require('node:fs')
+const { once } = require('node:events')
+const { Transform } = require('node:stream')
 
 async function run (opts) {
   if (!opts.destination) throw new Error('kaboom')

package/node_modules/pino/test/fixtures/to-file-transport.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const fs = require('fs')
-const { once } = require('events')
+const fs = require('node:fs')
+const { once } = require('node:events')
 
 async function run (opts) {
   if (!opts.destination) throw new Error('kaboom')

package/node_modules/pino/test/fixtures/to-file-transport.mjs

@@ -1,5 +1,5 @@
-import { createWriteStream } from 'fs'
-import { once } from 'events'
+import { createWriteStream } from 'node:fs'
+import { once } from 'node:events'
 
 export default async function run (opts) {
   const stream = createWriteStream(opts.destination)

package/node_modules/pino/test/fixtures/transport/index.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const fs = require('fs')
-const { once } = require('events')
+const fs = require('node:fs')
+const { once } = require('node:events')
 
 async function run (opts) {
   const stream = fs.createWriteStream(opts.destination)

package/node_modules/pino/test/fixtures/transport-main.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { join } = require('path')
+const { join } = require('node:path')
 const pino = require('../..')
 const transport = pino.transport({
   target: join(__dirname, 'transport-worker.js')

package/node_modules/pino/test/fixtures/transport-transform.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const build = require('pino-abstract-transport')
-const { pipeline, Transform } = require('stream')
+const { pipeline, Transform } = require('node:stream')
 module.exports = (options) => {
   return build(function (source) {
     const myTransportStream = new Transform({

package/node_modules/pino/test/fixtures/transport-uses-pino-config.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const build = require('pino-abstract-transport')
-const { pipeline, Transform } = require('stream')
+const { pipeline, Transform } = require('node:stream')
 module.exports = () => {
   return build(function (source) {
     const myTransportStream = new Transform({

package/node_modules/pino/test/fixtures/transport-worker-data.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { parentPort, workerData } = require('worker_threads')
-const { Writable } = require('stream')
+const { Writable } = require('node:stream')
 
 module.exports = (options) => {
   const myTransportStream = new Writable({

package/node_modules/pino/test/fixtures/transport-worker.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const { Writable } = require('stream')
-const fs = require('fs')
+const { Writable } = require('node:stream')
+const fs = require('node:fs')
 module.exports = (options) => {
   const myTransportStream = new Writable({
     autoDestroy: true,

package/node_modules/pino/test/fixtures/ts/to-file-transport-with-transform.ts

@@ -1,6 +1,6 @@
-import * as fs from 'fs'
-import { once } from 'events'
-import { Transform } from 'stream'
+import * as fs from 'node:fs'
+import { once } from 'node:events'
+import { Transform } from 'node:stream'
 
 async function run (opts: {  destination?: fs.PathLike }): Promise<Transform> {
   if (!opts.destination) throw new Error('kaboom')

package/node_modules/pino/test/fixtures/ts/to-file-transport.ts

@@ -1,5 +1,5 @@
-import * as fs from 'fs'
-import { once } from 'events'
+import * as fs from 'node:fs'
+import { once } from 'node:events'
 
 async function run (opts: { destination?: fs.PathLike }): Promise<fs.WriteStream> {
   if (!opts.destination) throw new Error('kaboom')

package/node_modules/pino/test/fixtures/ts/transpile.cjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const execa = require('execa')
-const fs = require('fs')
+const fs = require('node:fs')
 
 const existsSync = fs.existsSync
 const stat = fs.promises.stat

package/node_modules/pino/test/fixtures/ts/transport-exit-immediately-with-async-dest.ts

@@ -1,5 +1,5 @@
 import pino from '../../..'
-import { join } from 'path'
+import { join } from 'node:path'
 
 const transport = pino.transport({
   target: join(__dirname, 'to-file-transport-with-transform.ts'),

package/node_modules/pino/test/fixtures/ts/transport-main.ts

@@ -1,4 +1,4 @@
-import { join } from 'path'
+import { join } from 'node:path'
 import pino from '../../..'
 
 const transport = pino.transport({

package/node_modules/pino/test/fixtures/ts/transport-worker.ts

@@ -1,4 +1,4 @@
-import { Writable } from 'stream'
+import { Writable } from 'node:stream'
 
 export default (): Writable => {
   const myTransportStream = new Writable({

package/node_modules/pino/test/formatters.test.js

@@ -1,14 +1,17 @@
 'use strict'
 /* eslint no-prototype-builtins: 0 */
 
-const { hostname } = require('os')
-const { join } = require('path')
-const { readFile } = require('fs').promises
-const { test } = require('tap')
-const { sink, once, watchFileCreated, file } = require('./helper')
+const test = require('node:test')
+const assert = require('node:assert')
+const { hostname } = require('node:os')
+const { join } = require('node:path')
+const { readFile } = require('node:fs').promises
+const tspl = require('@matteo.collina/tspl')
+
+const { sink, match, once, watchFileCreated, file } = require('./helper')
 const pino = require('../')
 
-test('level formatter', async ({ match }) => {
+test('level formatter', async () => {
   const stream = sink()
   const logger = pino({
     formatters: {
@@ -31,7 +34,7 @@ test('level formatter', async ({ match }) => {
   })
 })
 
-test('bindings formatter', async ({ match }) => {
+test('bindings formatter', async () => {
   const stream = sink()
   const logger = pino({
     formatters: {
@@ -60,7 +63,7 @@ test('bindings formatter', async ({ match }) => {
   })
 })
 
-test('no bindings formatter', async ({ match, notOk }) => {
+test('no bindings formatter', async () => {
   const stream = sink()
   const logger = pino({
     formatters: {
@@ -73,17 +76,18 @@ test('no bindings formatter', async ({ match, notOk }) => {
   const o = once(stream, 'data')
   logger.info('hello world')
   const log = await o
-  notOk(log.hasOwnProperty('pid'))
-  notOk(log.hasOwnProperty('hostname'))
+  assert.equal(log.hasOwnProperty('pid'), false)
+  assert.equal(log.hasOwnProperty('hostname'), false)
   match(log, { msg: 'hello world' })
 })
 
-test('log formatter', async ({ match, equal }) => {
+test('log formatter', async (t) => {
+  const plan = tspl(t, { plan: 1 })
   const stream = sink()
   const logger = pino({
     formatters: {
       log (obj) {
-        equal(obj.hasOwnProperty('msg'), false)
+        plan.equal(obj.hasOwnProperty('msg'), false)
         return { hello: 'world', ...obj }
       }
     }
@@ -96,9 +100,11 @@ test('log formatter', async ({ match, equal }) => {
     foo: 'bar',
     nested: { object: true }
   })
+
+  await plan
 })
 
-test('Formatters combined', async ({ match }) => {
+test('Formatters combined', async () => {
   const stream = sink()
   const logger = pino({
     formatters: {
@@ -143,7 +149,7 @@ test('Formatters combined', async ({ match }) => {
   })
 })
 
-test('Formatters in child logger', async ({ match }) => {
+test('Formatters in child logger', async () => {
   const stream = sink()
   const logger = pino({
     formatters: {
@@ -200,7 +206,7 @@ test('Formatters in child logger', async ({ match }) => {
   })
 })
 
-test('Formatters without bindings in child logger', async ({ match }) => {
+test('Formatters without bindings in child logger', async () => {
   const stream = sink()
   const logger = pino({
     formatters: {
@@ -256,7 +262,7 @@ test('Formatters without bindings in child logger', async ({ match }) => {
   })
 })
 
-test('elastic common schema format', async ({ match, type }) => {
+test('elastic common schema format', async () => {
   const stream = sink()
   const ecs = {
     formatters: {
@@ -291,7 +297,7 @@ test('elastic common schema format', async ({ match, type }) => {
   const o = once(stream, 'data')
   logger.info({ foo: 'bar' }, 'hello world')
   const log = await o
-  type(log['@timestamp'], 'string')
+  assert.equal(typeof log['@timestamp'], 'string')
   match(log, {
     log: { level: 'info', logger: 'pino' },
     process: { pid: process.pid },
@@ -302,12 +308,13 @@ test('elastic common schema format', async ({ match, type }) => {
   })
 })
 
-test('formatter with transport', async ({ match, equal }) => {
+test('formatter with transport', async (t) => {
+  const plan = tspl(t, { plan: 1 })
   const destination = file()
   const logger = pino({
     formatters: {
       log (obj) {
-        equal(obj.hasOwnProperty('msg'), false)
+        plan.equal(obj.hasOwnProperty('msg'), false)
         return { hello: 'world', ...obj }
       }
     },
@@ -332,24 +339,26 @@ test('formatter with transport', async ({ match, equal }) => {
   })
 })
 
-test('throws when custom level formatter is used with transport.targets', async ({ throws }) => {
-  throws(() => {
-    pino({
-      formatters: {
-        level (label) {
-          return label
-        }
-      },
-      transport: {
-        targets: [
-          {
-            target: 'pino/file',
-            options: { destination: 'foo.log' }
+test('throws when custom level formatter is used with transport.targets', async () => {
+  assert.throws(
+    () => {
+      pino({
+        formatters: {
+          level (label) {
+            return label
           }
-        ]
+        },
+        transport: {
+          targets: [
+            {
+              target: 'pino/file',
+              options: { destination: 'foo.log' }
+            }
+          ]
+        }
       }
-    }
-    )
-  },
-  Error('option.transport.targets do not allow custom level formatters'))
+      )
+    },
+    Error('option.transport.targets do not allow custom level formatters')
+  )
 })

package/node_modules/pino/test/helper.d.ts

@@ -1,4 +1,4 @@
-import { PathLike } from 'fs'
+import { PathLike } from 'node:fs'
 
 export declare function watchFileCreated(filename: PathLike): Promise<void>
 export declare function watchForWrite(filename: PathLike, testString: string): Promise<void>

package/node_modules/pino/test/helper.js

@@ -1,14 +1,14 @@
 'use strict'
 
-const crypto = require('crypto')
-const os = require('os')
+const crypto = require('node:crypto')
+const { join } = require('node:path')
+const os = require('node:os')
+const { existsSync, readFileSync, statSync, unlinkSync } = require('node:fs')
 const writer = require('flush-write-stream')
 const split = require('split2')
-const { existsSync, readFileSync, statSync, unlinkSync } = require('fs')
+
 const pid = process.pid
 const hostname = os.hostname()
-const t = require('tap')
-const { join } = require('path')
 const { tmpdir } = os
 
 const isWin = process.platform === 'win32'
@@ -112,17 +112,44 @@ function file () {
 
 process.on('beforeExit', () => {
   if (files.length === 0) return
-  t.comment('unlink files')
   for (const file of files) {
     try {
-      t.comment(`unliking ${file}`)
       unlinkSync(file)
     } catch (e) {
-      console.log(e)
     }
   }
   files = []
-  t.comment('unlink completed')
 })
 
-module.exports = { getPathToNull, sink, check, once, sleep, watchFileCreated, watchForWrite, isWin, isYarnPnp, file }
+/**
+ * match is a bare-bones object shape matcher. We should be able to replace
+ * this with `assert.partialDeepStrictEqual` when v22 is our minimum.
+ *
+ * @param {object} found
+ * @param {object} expected
+ */
+function match (found, expected) {
+  for (const [key, value] of Object.entries(expected)) {
+    if (Object.prototype.toString.call(value) === '[object Object]') {
+      match(found[key], value)
+      continue
+    }
+    if (value !== found[key]) {
+      throw Error(`expected "${value}" but found "${found[key]}"`)
+    }
+  }
+}
+
+module.exports = {
+  check,
+  file,
+  getPathToNull,
+  isWin,
+  isYarnPnp,
+  match,
+  once,
+  sink,
+  sleep,
+  watchFileCreated,
+  watchForWrite
+}

package/node_modules/pino/test/hooks.test.js

@@ -1,25 +1,27 @@
 'use strict'
 
-const tap = require('tap')
-const { sink, once } = require('./helper')
+const { describe, test } = require('node:test')
+const tspl = require('@matteo.collina/tspl')
+
+const { sink, match, once } = require('./helper')
 const pino = require('../')
 
-tap.test('log method hook', t => {
-  t.test('gets invoked', async t => {
-    t.plan(8)
+describe('log method hook', () => {
+  test('gets invoked', async t => {
+    const plan = tspl(t, { plan: 7 })
 
     const stream = sink()
     const logger = pino({
       hooks: {
         logMethod (args, method, level) {
-          t.type(args, Array)
-          t.type(level, 'number')
-          t.equal(args.length, 3)
-          t.equal(level, this.levels.values.info)
-          t.same(args, ['a', 'b', 'c'])
+          plan.equal(Array.isArray(args), true)
+          plan.equal(typeof level, 'number')
+          plan.equal(args.length, 3)
+          plan.equal(level, this.levels.values.info)
+          plan.deepEqual(args, ['a', 'b', 'c'])
 
-          t.type(method, Function)
-          t.equal(method.name, 'LOG')
+          plan.equal(typeof method, 'function')
+          plan.equal(method.name, 'LOG')
 
           method.apply(this, [args.join('-')])
         }
@@ -28,17 +30,17 @@ tap.test('log method hook', t => {
 
     const o = once(stream, 'data')
     logger.info('a', 'b', 'c')
-    t.match(await o, { msg: 'a-b-c' })
+    match(await o, { msg: 'a-b-c' })
   })
 
-  t.test('fatal method invokes hook', async t => {
-    t.plan(2)
+  test('fatal method invokes hook', async t => {
+    const plan = tspl(t, { plan: 1 })
 
     const stream = sink()
     const logger = pino({
       hooks: {
         logMethod (args, method) {
-          t.pass()
+          plan.ok(true)
           method.apply(this, [args.join('-')])
         }
       }
@@ -46,17 +48,17 @@ tap.test('log method hook', t => {
 
     const o = once(stream, 'data')
     logger.fatal('a')
-    t.match(await o, { msg: 'a' })
+    match(await o, { msg: 'a' })
   })
 
-  t.test('children get the hook', async t => {
-    t.plan(4)
+  test('children get the hook', async t => {
+    const plan = tspl(t, { plan: 2 })
 
     const stream = sink()
     const root = pino({
       hooks: {
         logMethod (args, method) {
-          t.pass()
+          plan.ok(true)
           method.apply(this, [args.join('-')])
         }
       }
@@ -66,22 +68,22 @@ tap.test('log method hook', t => {
 
     let o = once(stream, 'data')
     child.info('a', 'b')
-    t.match(await o, { msg: 'a-b' })
+    match(await o, { msg: 'a-b' })
 
     o = once(stream, 'data')
     grandchild.info('c', 'd')
-    t.match(await o, { msg: 'c-d' })
+    match(await o, { msg: 'c-d' })
   })
 
-  t.test('get log level', async t => {
-    t.plan(3)
+  test('get log level', async t => {
+    const plan = tspl(t, { plan: 2 })
 
     const stream = sink()
     const logger = pino({
       hooks: {
         logMethod (args, method, level) {
-          t.type(level, 'number')
-          t.equal(level, this.levels.values.error)
+          plan.equal(typeof level, 'number')
+          plan.equal(level, this.levels.values.error)
 
           method.apply(this, [args.join('-')])
         }
@@ -90,8 +92,23 @@ tap.test('log method hook', t => {
 
     const o = once(stream, 'data')
     logger.error('a')
-    t.match(await o, { msg: 'a' })
+    match(await o, { msg: 'a' })
   })
+})
 
-  t.end()
+describe('streamWrite hook', () => {
+  test('gets invoked', async () => {
+    const stream = sink()
+    const logger = pino({
+      hooks: {
+        streamWrite (s) {
+          return s.replaceAll('redact-me', 'XXX')
+        }
+      }
+    }, stream)
+
+    const o = once(stream, 'data')
+    logger.info('hide redact-me in this string')
+    match(await o, { msg: 'hide XXX in this string' })
+  })
 })