@contrast/agent-bundle 5.46.0 → 5.48.0

package/node_modules/pino/test/http.test.js

@@ -1,21 +1,23 @@
 'use strict'
 
-const http = require('http')
-const os = require('os')
-const semver = require('semver')
-const { test, skip } = require('tap')
+const test = require('node:test')
+const http = require('node:http')
+const os = require('node:os')
+const tspl = require('@matteo.collina/tspl')
+
 const { sink, once } = require('./helper')
 const pino = require('../')
 
 const { pid } = process
 const hostname = os.hostname()
 
-test('http request support', async ({ ok, same, error, teardown }) => {
+test('http request support', async (t) => {
+  const plan = tspl(t, { plan: 3 })
   let originalReq
   const instance = pino(sink((chunk, enc) => {
-    ok(new Date(chunk.time) <= new Date(), 'time is greater than Date.now()')
+    plan.ok(new Date(chunk.time) <= new Date(), 'time is greater than Date.now()')
     delete chunk.time
-    same(chunk, {
+    plan.deepEqual(chunk, {
       pid,
       hostname,
       level: 30,
@@ -38,22 +40,25 @@ test('http request support', async ({ ok, same, error, teardown }) => {
   server.unref()
   server.listen()
   const err = await once(server, 'listening')
-  error(err)
+  plan.equal(err, undefined)
   const res = await once(http.get('http://localhost:' + server.address().port), 'response')
   res.resume()
   server.close()
+
+  await plan
 })
 
-test('http request support via serializer', async ({ ok, same, error, teardown }) => {
+test('http request support via serializer', async (t) => {
+  const plan = tspl(t, { plan: 3 })
   let originalReq
   const instance = pino({
     serializers: {
       req: pino.stdSerializers.req
     }
   }, sink((chunk, enc) => {
-    ok(new Date(chunk.time) <= new Date(), 'time is greater than Date.now()')
+    plan.ok(new Date(chunk.time) <= new Date(), 'time is greater than Date.now()')
     delete chunk.time
-    same(chunk, {
+    plan.deepEqual(chunk, {
       pid,
       hostname,
       level: 30,
@@ -76,63 +81,22 @@ test('http request support via serializer', async ({ ok, same, error, teardown }
   server.unref()
   server.listen()
   const err = await once(server, 'listening')
-  error(err)
+  plan.equal(err, undefined)
 
   const res = await once(http.get('http://localhost:' + server.address().port), 'response')
   res.resume()
   server.close()
-})
 
-// skipped because request connection is deprecated since v13, and request socket is always available
-skip('http request support via serializer without request connection', async ({ ok, same, error, teardown }) => {
-  let originalReq
-  const instance = pino({
-    serializers: {
-      req: pino.stdSerializers.req
-    }
-  }, sink((chunk, enc) => {
-    ok(new Date(chunk.time) <= new Date(), 'time is greater than Date.now()')
-    delete chunk.time
-    const expected = {
-      pid,
-      hostname,
-      level: 30,
-      msg: 'my request',
-      req: {
-        method: originalReq.method,
-        url: originalReq.url,
-        headers: originalReq.headers
-      }
-    }
-    if (semver.gte(process.version, '13.0.0')) {
-      expected.req.remoteAddress = originalReq.socket.remoteAddress
-      expected.req.remotePort = originalReq.socket.remotePort
-    }
-    same(chunk, expected)
-  }))
-
-  const server = http.createServer(function (req, res) {
-    originalReq = req
-    delete req.connection
-    instance.info({ req }, 'my request')
-    res.end('hello')
-  })
-  server.unref()
-  server.listen()
-  const err = await once(server, 'listening')
-  error(err)
-
-  const res = await once(http.get('http://localhost:' + server.address().port), 'response')
-  res.resume()
-  server.close()
+  await plan
 })
 
-test('http response support', async ({ ok, same, error, teardown }) => {
+test('http response support', async (t) => {
+  const plan = tspl(t, { plan: 3 })
   let originalRes
   const instance = pino(sink((chunk, enc) => {
-    ok(new Date(chunk.time) <= new Date(), 'time is greater than Date.now()')
+    plan.ok(new Date(chunk.time) <= new Date(), 'time is greater than Date.now()')
     delete chunk.time
-    same(chunk, {
+    plan.deepEqual(chunk, {
       pid,
       hostname,
       level: 30,
@@ -153,22 +117,25 @@ test('http response support', async ({ ok, same, error, teardown }) => {
   server.listen()
   const err = await once(server, 'listening')
 
-  error(err)
+  plan.equal(err, undefined)
 
   const res = await once(http.get('http://localhost:' + server.address().port), 'response')
   res.resume()
   server.close()
+
+  await plan
 })
 
-test('http response support via a serializer', async ({ ok, same, error, teardown }) => {
+test('http response support via a serializer', async (t) => {
+  const plan = tspl(t, { plan: 3 })
   const instance = pino({
     serializers: {
       res: pino.stdSerializers.res
     }
   }, sink((chunk, enc) => {
-    ok(new Date(chunk.time) <= new Date(), 'time is greater than Date.now()')
+    plan.ok(new Date(chunk.time) <= new Date(), 'time is greater than Date.now()')
     delete chunk.time
-    same(chunk, {
+    plan.deepEqual(chunk, {
       pid,
       hostname,
       level: 30,
@@ -193,23 +160,26 @@ test('http response support via a serializer', async ({ ok, same, error, teardow
   server.unref()
   server.listen()
   const err = await once(server, 'listening')
-  error(err)
+  plan.equal(err, undefined)
 
   const res = await once(http.get('http://localhost:' + server.address().port), 'response')
   res.resume()
   server.close()
+
+  await plan
 })
 
-test('http request support via serializer in a child', async ({ ok, same, error, teardown }) => {
+test('http request support via serializer in a child', async (t) => {
+  const plan = tspl(t, { plan: 3 })
   let originalReq
   const instance = pino({
     serializers: {
       req: pino.stdSerializers.req
     }
   }, sink((chunk, enc) => {
-    ok(new Date(chunk.time) <= new Date(), 'time is greater than Date.now()')
+    plan.ok(new Date(chunk.time) <= new Date(), 'time is greater than Date.now()')
     delete chunk.time
-    same(chunk, {
+    plan.deepEqual(chunk, {
       pid,
       hostname,
       level: 30,
@@ -234,9 +204,11 @@ test('http request support via serializer in a child', async ({ ok, same, error,
   server.unref()
   server.listen()
   const err = await once(server, 'listening')
-  error(err)
+  plan.equal(err, undefined)
 
   const res = await once(http.get('http://localhost:' + server.address().port), 'response')
   res.resume()
   server.close()
+
+  await plan
 })

package/node_modules/pino/test/internals/version.test.js

@@ -1,15 +1,17 @@
 'use strict'
 
-const fs = require('fs')
-const path = require('path')
-const t = require('tap')
-const test = t.test
-const pino = require('../..')()
+const test = require('node:test')
+const assert = require('node:assert')
+const fs = require('node:fs')
+const path = require('node:path')
 
-test('should be the same as package.json', t => {
-  t.plan(1)
+const pino = require('../..')()
 
-  const json = JSON.parse(fs.readFileSync(path.join(__dirname, '..', '..', 'package.json')).toString('utf8'))
+test('should be the same as package.json', () => {
+  const json = JSON.parse(
+    fs.readFileSync(path.join(__dirname, '..', '..', 'package.json'))
+      .toString('utf8')
+  )
 
-  t.equal(pino.version, json.version)
+  assert.equal(pino.version, json.version)
 })

package/node_modules/pino/test/is-level-enabled.test.js

@@ -1,6 +1,8 @@
 'use strict'
 
-const { test } = require('tap')
+const { describe, test } = require('node:test')
+const assert = require('node:assert')
+
 const pino = require('../')
 
 const descLevels = {
@@ -21,165 +23,157 @@ const ascLevels = {
   fatal: 60
 }
 
-test('Default levels suite', ({ test, end }) => {
-  test('can check if current level enabled', async ({ equal }) => {
+describe('Default levels suite', () => {
+  test('can check if current level enabled', async () => {
     const log = pino({ level: 'debug' })
-    equal(true, log.isLevelEnabled('debug'))
+    assert.equal(true, log.isLevelEnabled('debug'))
   })
 
-  test('can check if level enabled after level set', async ({ equal }) => {
+  test('can check if level enabled after level set', async () => {
     const log = pino()
-    equal(false, log.isLevelEnabled('debug'))
+    assert.equal(false, log.isLevelEnabled('debug'))
     log.level = 'debug'
-    equal(true, log.isLevelEnabled('debug'))
+    assert.equal(true, log.isLevelEnabled('debug'))
   })
 
-  test('can check if higher level enabled', async ({ equal }) => {
+  test('can check if higher level enabled', async () => {
     const log = pino({ level: 'debug' })
-    equal(true, log.isLevelEnabled('error'))
+    assert.equal(true, log.isLevelEnabled('error'))
   })
 
-  test('can check if lower level is disabled', async ({ equal }) => {
+  test('can check if lower level is disabled', async () => {
     const log = pino({ level: 'error' })
-    equal(false, log.isLevelEnabled('trace'))
+    assert.equal(false, log.isLevelEnabled('trace'))
   })
 
-  test('ASC: can check if child has current level enabled', async ({ equal }) => {
+  test('ASC: can check if child has current level enabled', async () => {
     const log = pino().child({}, { level: 'debug' })
-    equal(true, log.isLevelEnabled('debug'))
-    equal(true, log.isLevelEnabled('error'))
-    equal(false, log.isLevelEnabled('trace'))
+    assert.equal(true, log.isLevelEnabled('debug'))
+    assert.equal(true, log.isLevelEnabled('error'))
+    assert.equal(false, log.isLevelEnabled('trace'))
   })
 
-  test('can check if custom level is enabled', async ({ equal }) => {
+  test('can check if custom level is enabled', async () => {
     const log = pino({
       customLevels: { foo: 35 },
       level: 'debug'
     })
-    equal(true, log.isLevelEnabled('foo'))
-    equal(true, log.isLevelEnabled('error'))
-    equal(false, log.isLevelEnabled('trace'))
+    assert.equal(true, log.isLevelEnabled('foo'))
+    assert.equal(true, log.isLevelEnabled('error'))
+    assert.equal(false, log.isLevelEnabled('trace'))
   })
-
-  end()
 })
 
-test('Ascending levels suite', ({ test, end }) => {
+describe('Ascending levels suite', () => {
   const customLevels = ascLevels
   const levelComparison = 'ASC'
 
-  test('can check if current level enabled', async ({ equal }) => {
+  test('can check if current level enabled', async () => {
     const log = pino({ level: 'debug', levelComparison, customLevels, useOnlyCustomLevels: true })
-    equal(true, log.isLevelEnabled('debug'))
+    assert.equal(true, log.isLevelEnabled('debug'))
   })
 
-  test('can check if level enabled after level set', async ({ equal }) => {
+  test('can check if level enabled after level set', async () => {
     const log = pino({ levelComparison, customLevels, useOnlyCustomLevels: true })
-    equal(false, log.isLevelEnabled('debug'))
+    assert.equal(false, log.isLevelEnabled('debug'))
     log.level = 'debug'
-    equal(true, log.isLevelEnabled('debug'))
+    assert.equal(true, log.isLevelEnabled('debug'))
   })
 
-  test('can check if higher level enabled', async ({ equal }) => {
+  test('can check if higher level enabled', async () => {
     const log = pino({ level: 'debug', levelComparison, customLevels, useOnlyCustomLevels: true })
-    equal(true, log.isLevelEnabled('error'))
+    assert.equal(true, log.isLevelEnabled('error'))
   })
 
-  test('can check if lower level is disabled', async ({ equal }) => {
+  test('can check if lower level is disabled', async () => {
     const log = pino({ level: 'error', customLevels, useOnlyCustomLevels: true })
-    equal(false, log.isLevelEnabled('trace'))
+    assert.equal(false, log.isLevelEnabled('trace'))
   })
 
-  test('can check if child has current level enabled', async ({ equal }) => {
+  test('can check if child has current level enabled', async () => {
     const log = pino().child({ levelComparison, customLevels, useOnlyCustomLevels: true }, { level: 'debug' })
-    equal(true, log.isLevelEnabled('debug'))
-    equal(true, log.isLevelEnabled('error'))
-    equal(false, log.isLevelEnabled('trace'))
+    assert.equal(true, log.isLevelEnabled('debug'))
+    assert.equal(true, log.isLevelEnabled('error'))
+    assert.equal(false, log.isLevelEnabled('trace'))
   })
 
-  test('can check if custom level is enabled', async ({ equal }) => {
+  test('can check if custom level is enabled', async () => {
     const log = pino({
       levelComparison,
       useOnlyCustomLevels: true,
       customLevels: { foo: 35, ...customLevels },
       level: 'debug'
     })
-    equal(true, log.isLevelEnabled('foo'))
-    equal(true, log.isLevelEnabled('error'))
-    equal(false, log.isLevelEnabled('trace'))
+    assert.equal(true, log.isLevelEnabled('foo'))
+    assert.equal(true, log.isLevelEnabled('error'))
+    assert.equal(false, log.isLevelEnabled('trace'))
   })
-
-  end()
 })
 
-test('Descending levels suite', ({ test, end }) => {
+describe('Descending levels suite', () => {
   const customLevels = descLevels
   const levelComparison = 'DESC'
 
-  test('can check if current level enabled', async ({ equal }) => {
+  test('can check if current level enabled', async () => {
     const log = pino({ level: 'debug', levelComparison, customLevels, useOnlyCustomLevels: true })
-    equal(true, log.isLevelEnabled('debug'))
+    assert.equal(true, log.isLevelEnabled('debug'))
   })
 
-  test('can check if level enabled after level set', async ({ equal }) => {
+  test('can check if level enabled after level set', async () => {
     const log = pino({ levelComparison, customLevels, useOnlyCustomLevels: true })
-    equal(false, log.isLevelEnabled('debug'))
+    assert.equal(false, log.isLevelEnabled('debug'))
     log.level = 'debug'
-    equal(true, log.isLevelEnabled('debug'))
+    assert.equal(true, log.isLevelEnabled('debug'))
   })
 
-  test('can check if higher level enabled', async ({ equal }) => {
+  test('can check if higher level enabled', async () => {
     const log = pino({ level: 'debug', levelComparison, customLevels, useOnlyCustomLevels: true })
-    equal(true, log.isLevelEnabled('error'))
+    assert.equal(true, log.isLevelEnabled('error'))
   })
 
-  test('can check if lower level is disabled', async ({ equal }) => {
+  test('can check if lower level is disabled', async () => {
     const log = pino({ level: 'error', levelComparison, customLevels, useOnlyCustomLevels: true })
-    equal(false, log.isLevelEnabled('trace'))
+    assert.equal(false, log.isLevelEnabled('trace'))
   })
 
-  test('can check if child has current level enabled', async ({ equal }) => {
+  test('can check if child has current level enabled', async () => {
     const log = pino({ levelComparison, customLevels, useOnlyCustomLevels: true }).child({}, { level: 'debug' })
-    equal(true, log.isLevelEnabled('debug'))
-    equal(true, log.isLevelEnabled('error'))
-    equal(false, log.isLevelEnabled('trace'))
+    assert.equal(true, log.isLevelEnabled('debug'))
+    assert.equal(true, log.isLevelEnabled('error'))
+    assert.equal(false, log.isLevelEnabled('trace'))
   })
 
-  test('can check if custom level is enabled', async ({ equal }) => {
+  test('can check if custom level is enabled', async () => {
     const log = pino({
       levelComparison,
       customLevels: { foo: 35, ...customLevels },
       useOnlyCustomLevels: true,
       level: 'debug'
     })
-    equal(true, log.isLevelEnabled('foo'))
-    equal(true, log.isLevelEnabled('error'))
-    equal(false, log.isLevelEnabled('trace'))
+    assert.equal(true, log.isLevelEnabled('foo'))
+    assert.equal(true, log.isLevelEnabled('error'))
+    assert.equal(false, log.isLevelEnabled('trace'))
   })
-
-  end()
 })
 
-test('Custom levels comparison', async ({ test, end }) => {
-  test('Custom comparison returns true cause level is enabled', async ({ equal }) => {
+describe('Custom levels comparison', () => {
+  test('Custom comparison returns true cause level is enabled', async () => {
     const log = pino({ level: 'error', levelComparison: () => true })
-    equal(true, log.isLevelEnabled('debug'))
+    assert.equal(true, log.isLevelEnabled('debug'))
   })
 
-  test('Custom comparison returns false cause level is disabled', async ({ equal }) => {
+  test('Custom comparison returns false cause level is disabled', async () => {
     const log = pino({ level: 'error', levelComparison: () => false })
-    equal(false, log.isLevelEnabled('debug'))
+    assert.equal(false, log.isLevelEnabled('debug'))
   })
 
-  test('Custom comparison returns true cause child level is enabled', async ({ equal }) => {
+  test('Custom comparison returns true cause child level is enabled', async () => {
     const log = pino({ levelComparison: () => true }).child({ level: 'error' })
-    equal(true, log.isLevelEnabled('debug'))
+    assert.equal(true, log.isLevelEnabled('debug'))
   })
 
-  test('Custom comparison returns false cause child level is disabled', async ({ equal }) => {
+  test('Custom comparison returns false cause child level is disabled', async () => {
     const log = pino({ levelComparison: () => false }).child({ level: 'error' })
-    equal(false, log.isLevelEnabled('debug'))
+    assert.equal(false, log.isLevelEnabled('debug'))
   })
-
-  end()
 })