From 38e47d9d7ffadbea3103c77686e031c4cf954d2c Mon Sep 17 00:00:00 2001 From: James Sumners Date: Tue, 16 Apr 2024 12:19:06 -0400 Subject: [PATCH] chore: Updated versioned tests to support upcoming tooling (#2147) --- test/versioned/Readme.md | 102 ++++++++++++++++++ test/versioned/amqplib/package.json | 1 + test/versioned/bluebird/package.json | 5 +- test/versioned/bunyan/package.json | 1 + test/versioned/cassandra-driver/package.json | 1 + test/versioned/connect/package.json | 1 + test/versioned/director/package.json | 3 +- test/versioned/elastic/package.json | 3 + test/versioned/express-esm/package.json | 1 + test/versioned/express/package.json | 1 + test/versioned/fastify/package.json | 1 + test/versioned/generic-pool/package.json | 1 + test/versioned/grpc-esm/package.json | 1 + test/versioned/grpc/package.json | 1 + test/versioned/hapi/package.json | 1 + test/versioned/ioredis/package.json | 3 +- test/versioned/langchain/package.json | 1 + test/versioned/mongodb-esm/package.json | 1 + test/versioned/mongodb/package.json | 1 + test/versioned/mysql/package.json | 1 + test/versioned/mysql2/package.json | 1 + test/versioned/nestjs/package.json | 1 + test/versioned/openai/package.json | 1 + test/versioned/pg-esm/package.json | 5 +- test/versioned/pg/package.json | 5 +- test/versioned/pino/package.json | 1 + test/versioned/prisma/package.json | 1 + test/versioned/redis/package.json | 5 +- .../async-handlers.tap.js | 4 +- .../capture-params.tap.js | 6 +- .../restify/{restify-post-7 => }/common.js | 2 +- .../{restify-post-7 => }/ignoring.tap.js | 4 +- .../restify/{restify-post-7 => }/newrelic.js | 0 .../restify/{restify-post-7 => }/package.json | 24 ++++- .../capture-params.tap.js | 0 .../{restify-pre-7 => pre-7}/ignoring.tap.js | 0 .../{restify-pre-7 => pre-7}/newrelic.js | 0 .../{restify-pre-7 => pre-7}/restify.tap.js | 0 .../{restify-pre-7 => pre-7}/router.tap.js | 0 .../{restify-post-7 => pre-7}/rum.tap.js | 0 .../transaction-naming.tap.js | 0 .../restify/restify-pre-7/package.json | 29 ----- .../{restify-post-7 => }/restify.tap.js | 4 +- .../{restify-post-7 => }/router.tap.js | 2 +- .../restify/{restify-pre-7 => }/rum.tap.js | 4 +- .../transaction-naming.tap.js | 2 +- .../{restify-post-7 => }/with-express.tap.js | 2 +- test/versioned/superagent/package.json | 1 + test/versioned/undici/package.json | 1 + test/versioned/winston-esm/package.json | 5 +- test/versioned/winston/package.json | 3 +- 51 files changed, 183 insertions(+), 61 deletions(-) create mode 100644 test/versioned/Readme.md rename test/versioned/restify/{restify-post-7 => }/async-handlers.tap.js (98%) rename test/versioned/restify/{restify-post-7 => }/capture-params.tap.js (96%) rename test/versioned/restify/{restify-post-7 => }/common.js (94%) rename test/versioned/restify/{restify-post-7 => }/ignoring.tap.js (95%) rename test/versioned/restify/{restify-post-7 => }/newrelic.js (100%) rename test/versioned/restify/{restify-post-7 => }/package.json (67%) rename test/versioned/restify/{restify-pre-7 => pre-7}/capture-params.tap.js (100%) rename test/versioned/restify/{restify-pre-7 => pre-7}/ignoring.tap.js (100%) rename test/versioned/restify/{restify-pre-7 => pre-7}/newrelic.js (100%) rename test/versioned/restify/{restify-pre-7 => pre-7}/restify.tap.js (100%) rename test/versioned/restify/{restify-pre-7 => pre-7}/router.tap.js (100%) rename test/versioned/restify/{restify-post-7 => pre-7}/rum.tap.js (100%) rename test/versioned/restify/{restify-pre-7 => pre-7}/transaction-naming.tap.js (100%) delete mode 100644 test/versioned/restify/restify-pre-7/package.json rename test/versioned/restify/{restify-post-7 => }/restify.tap.js (98%) rename test/versioned/restify/{restify-post-7 => }/router.tap.js (99%) rename test/versioned/restify/{restify-pre-7 => }/rum.tap.js (92%) rename test/versioned/restify/{restify-post-7 => }/transaction-naming.tap.js (99%) rename test/versioned/restify/{restify-post-7 => }/with-express.tap.js (97%) diff --git a/test/versioned/Readme.md b/test/versioned/Readme.md new file mode 100644 index 0000000000..b5ab2a825e --- /dev/null +++ b/test/versioned/Readme.md @@ -0,0 +1,102 @@ +# Versioned Tests + +The subdirectories within this directory represent test suites that verify +our agent compatibility across multiple versions of our supported modules. +When these tests are run, through our versioned test runner tool, each suite +is run multiple times utilizing different versions of the module that satisfy +configured version constraints. + +For example, if a supported module has releases `1.0.0` through `1.10.0`, with +a version for each minor between `0` and `10`, then our versioned test runner +will run the test suite across a sampling of versions in that range, e.g. +versions `1.0.0`, `1.3.0`, and `1.10.0`. + +## Versioned Tests `package.json` + +The versioned test runner reads a `package.json` in each test suite. This +`package.json` describes the constraints for the suite and has a few properties +that are specific to our versioned test runner. The following is a +[jsonc](https://en.wikipedia.org/wiki/JSON#JSONC) representation of such a +`package.json` that describes the unique properties: + +```jsonc +{ + // `name` is typically ignored. + "name": "module-tests", + + // `targets` indicates which modules are being verified by the test suite. + // This is utilized by tooling to build a compatibility document. There _must_ + // be at least one value that matches a dependency name in a subsequent + // `tests` block. If this suite is verifying the compatibility of multiple + // modules, include all such module names in the array. + // + // If this property is omitted, the tool used to build our compatibility + // document(s) will not include any modules from this versioned test suite. + "targets": ["module"], + + // `version` is ignored. + "version": "0.0.0", + + // `private` should be set to `true`. + "private": true, + + // `tests` contains blocks that describe the tests the versioned test runner + // should run for this suite and under what constraints. Each block will + // result in at least one test run by the test runner. + "tests": [ + { + // `engines` is a typical package.json engines block. + "engines": { + // `node` indicates which versions of Node.js should be used to run + // this test block. Typically, a basic `>=` qualifier will be used, but + // a static version is also likely. If the version of Node.js being + // used to run the suite does not match the contraint, then the test + // block will be skipped. + "node": ">= 18" + }, + + // `dependencies` lists dependencies that a needed in order to execute + // the test block. In most cases, only the module under test will be + // present. + "dependencies": { + // For the dependency named "module-name", run the suite with samples + // from the provided semver range (https://docs.npmjs.com/cli/v6/using-npm/semver#advanced-range-syntax). + // + // The minimum version across all test blocks will be utilized to + // indicate the minimum supported version of a module by our agent + // if that module name is listed in the top-level `targets` property. + // + // Note: this may also be an object with a special format. See the next + // example block. + "module-name": ">=1.0.0 <2.0.0" + }, + + // `files` lists out the test files that comprise the test suite for the + // current block. + "files": [ + "test-one.tap.js", + "test-two.tap.js" + ] + }, + + // This example block will only run on Node.js 20.x. Pay attention + // to the "dependencies" section for a special depedency declaration + // supported by our versioned test runner. + { + "engines": { "node": "20" }, + "dependencies": { + "module-name": { + // Again, a standard semver range to indicate the versions of the + // module to sample from. + "versions": ">=1.0.0 <2.0.0", + + // How many samples, across the provided versions range, to conduct + // when testing with this test block. It should be a string value, + // although some of our tooling will likely coerce it to an integer. + "samples": "2" + } + } + } + ] +} +``` diff --git a/test/versioned/amqplib/package.json b/test/versioned/amqplib/package.json index 926f9843b0..26dc269d15 100644 --- a/test/versioned/amqplib/package.json +++ b/test/versioned/amqplib/package.json @@ -1,5 +1,6 @@ { "name": "ampqlib-tests", + "targets": ["amqplib"], "version": "0.0.0", "private": true, "tests": [ diff --git a/test/versioned/bluebird/package.json b/test/versioned/bluebird/package.json index 8f12923b84..a3b88e1382 100644 --- a/test/versioned/bluebird/package.json +++ b/test/versioned/bluebird/package.json @@ -1,5 +1,6 @@ { "name": "bluebird-tests", + "targets": ["bluebird"], "version": "0.0.0", "private": true, "tests": [ @@ -8,7 +9,7 @@ "node": ">=16" }, "dependencies": { - "bluebird": ">=2" + "bluebird": ">=2.0.0" }, "files": [ "regressions.tap.js", @@ -20,7 +21,7 @@ "node": ">=16" }, "dependencies": { - "bluebird": ">=3" + "bluebird": ">=3.0.0" }, "files": [ "methods.tap.js" diff --git a/test/versioned/bunyan/package.json b/test/versioned/bunyan/package.json index 49cb09cc90..02fc10c27e 100644 --- a/test/versioned/bunyan/package.json +++ b/test/versioned/bunyan/package.json @@ -1,5 +1,6 @@ { "name": "bunyan-tests", + "targets": ["bunyan"], "version": "0.0.0", "private": true, "tests": [ diff --git a/test/versioned/cassandra-driver/package.json b/test/versioned/cassandra-driver/package.json index eb4e0dd702..bc5b0b3131 100644 --- a/test/versioned/cassandra-driver/package.json +++ b/test/versioned/cassandra-driver/package.json @@ -1,5 +1,6 @@ { "name": "cassandra-driver-tests", + "targets": ["cassandra-driver"], "version": "0.0.0", "private": true, "tests": [ diff --git a/test/versioned/connect/package.json b/test/versioned/connect/package.json index 987bf307c6..89c3a946f6 100644 --- a/test/versioned/connect/package.json +++ b/test/versioned/connect/package.json @@ -1,5 +1,6 @@ { "name": "connect-tests", + "targets": ["connect"], "version": "0.0.0", "private": true, "tests": [ diff --git a/test/versioned/director/package.json b/test/versioned/director/package.json index b29db54113..d3222cca66 100644 --- a/test/versioned/director/package.json +++ b/test/versioned/director/package.json @@ -1,5 +1,6 @@ { "name": "director-tests", + "targets": ["director"], "version": "0.0.0", "private": true, "tests": [ @@ -8,7 +9,7 @@ "node": ">=16" }, "dependencies": { - "director": ">=1.2", + "director": ">=1.2.0", "express": "4.16" }, "files": [ diff --git a/test/versioned/elastic/package.json b/test/versioned/elastic/package.json index f214058d0b..09bc966a26 100644 --- a/test/versioned/elastic/package.json +++ b/test/versioned/elastic/package.json @@ -1,5 +1,6 @@ { "name": "elasticsearch-tests", + "targets": ["@elastic/elasticsearch"], "version": "0.0.0", "private": true, "engines": { @@ -7,6 +8,8 @@ }, "tests": [ { + "supported": false, + "comment": "Used to assert our instrumentation does not get loaded on old versions.", "engines": { "node": ">=16" }, diff --git a/test/versioned/express-esm/package.json b/test/versioned/express-esm/package.json index 61c7fa2bbc..078093f870 100644 --- a/test/versioned/express-esm/package.json +++ b/test/versioned/express-esm/package.json @@ -1,5 +1,6 @@ { "name": "express-esm-tests", + "targets": ["express"], "version": "0.0.0", "type": "module", "private": true, diff --git a/test/versioned/express/package.json b/test/versioned/express/package.json index d02a9e80c7..04047aeb30 100644 --- a/test/versioned/express/package.json +++ b/test/versioned/express/package.json @@ -1,5 +1,6 @@ { "name": "express-tests", + "targets": ["express"], "version": "0.0.0", "private": true, "tests": [ diff --git a/test/versioned/fastify/package.json b/test/versioned/fastify/package.json index 7f63b3ea82..0b05eb8b35 100644 --- a/test/versioned/fastify/package.json +++ b/test/versioned/fastify/package.json @@ -1,5 +1,6 @@ { "name": "fastify-tests", + "targets": ["fastify"], "version": "0.0.0", "private": true, "tests": [ diff --git a/test/versioned/generic-pool/package.json b/test/versioned/generic-pool/package.json index 3eda4c10e7..d8f0c407b5 100644 --- a/test/versioned/generic-pool/package.json +++ b/test/versioned/generic-pool/package.json @@ -1,5 +1,6 @@ { "name": "generic-pool-tests", + "targets": ["generic-pool"], "version": "0.0.0", "private": true, "tests": [ diff --git a/test/versioned/grpc-esm/package.json b/test/versioned/grpc-esm/package.json index 6f364d0902..03acc78475 100644 --- a/test/versioned/grpc-esm/package.json +++ b/test/versioned/grpc-esm/package.json @@ -1,5 +1,6 @@ { "name": "grpc-esm-tests", + "targets": ["@grpc/grpc-js"], "version": "0.0.0", "type": "module", "private": true, diff --git a/test/versioned/grpc/package.json b/test/versioned/grpc/package.json index b775e99859..12c0c4b6cd 100644 --- a/test/versioned/grpc/package.json +++ b/test/versioned/grpc/package.json @@ -1,5 +1,6 @@ { "name": "grpc-tests", + "targets": ["@grpc/grpc-js"], "version": "0.0.0", "private": true, "tests": [ diff --git a/test/versioned/hapi/package.json b/test/versioned/hapi/package.json index c1b8e3f65a..20501fbb40 100644 --- a/test/versioned/hapi/package.json +++ b/test/versioned/hapi/package.json @@ -1,5 +1,6 @@ { "name": "hapi-tests", + "targets": ["@hapi/hapi"], "version": "0.0.0", "private": true, "tests": [ diff --git a/test/versioned/ioredis/package.json b/test/versioned/ioredis/package.json index 5077553002..6b5afd2e64 100644 --- a/test/versioned/ioredis/package.json +++ b/test/versioned/ioredis/package.json @@ -1,5 +1,6 @@ { "name": "ioredis-test", + "targets": ["ioredis"], "version": "0.0.0", "private": true, "tests": [ @@ -19,7 +20,7 @@ "node": ">=16" }, "dependencies": { - "ioredis": ">=4" + "ioredis": ">=4.0.0" }, "files": [ "ioredis.tap.js" diff --git a/test/versioned/langchain/package.json b/test/versioned/langchain/package.json index 669c21f129..c84fee80c6 100644 --- a/test/versioned/langchain/package.json +++ b/test/versioned/langchain/package.json @@ -1,5 +1,6 @@ { "name": "langchain-tests", + "targets": ["@langchain/core"], "version": "0.0.0", "private": true, "engines": { diff --git a/test/versioned/mongodb-esm/package.json b/test/versioned/mongodb-esm/package.json index 9b58ac5a9d..bf72a827c8 100644 --- a/test/versioned/mongodb-esm/package.json +++ b/test/versioned/mongodb-esm/package.json @@ -1,5 +1,6 @@ { "name": "mongodb-esm-tests", + "targets": ["mongodb"], "version": "0.0.0", "type": "module", "private": true, diff --git a/test/versioned/mongodb/package.json b/test/versioned/mongodb/package.json index 5cf4f951e8..bc41de391f 100644 --- a/test/versioned/mongodb/package.json +++ b/test/versioned/mongodb/package.json @@ -1,5 +1,6 @@ { "name": "mongodb-tests", + "targets": ["mongodb"], "version": "0.0.0", "private": true, "tests": [ diff --git a/test/versioned/mysql/package.json b/test/versioned/mysql/package.json index c08d24c663..449506394c 100644 --- a/test/versioned/mysql/package.json +++ b/test/versioned/mysql/package.json @@ -1,5 +1,6 @@ { "name": "mysql-tests", + "targets": ["mysql"], "version": "0.0.0", "private": true, "tests": [ diff --git a/test/versioned/mysql2/package.json b/test/versioned/mysql2/package.json index ad3992bb1d..c2edae5ecf 100644 --- a/test/versioned/mysql2/package.json +++ b/test/versioned/mysql2/package.json @@ -1,5 +1,6 @@ { "name": "mysql2-tests", + "targets": ["mysql2"], "version": "0.0.0", "private": true, "tests": [ diff --git a/test/versioned/nestjs/package.json b/test/versioned/nestjs/package.json index 42febf9d6b..57ac60c123 100644 --- a/test/versioned/nestjs/package.json +++ b/test/versioned/nestjs/package.json @@ -1,5 +1,6 @@ { "name": "nestjs-tests", + "targets": ["@nestjs/cli"], "version": "0.0.0", "private": true, "tests": [ diff --git a/test/versioned/openai/package.json b/test/versioned/openai/package.json index c2c92316bf..11433ba632 100644 --- a/test/versioned/openai/package.json +++ b/test/versioned/openai/package.json @@ -1,5 +1,6 @@ { "name": "openai-tests", + "targets": ["openai"], "version": "0.0.0", "private": true, "engines": { diff --git a/test/versioned/pg-esm/package.json b/test/versioned/pg-esm/package.json index 60c6e2ec19..f79e7ced91 100644 --- a/test/versioned/pg-esm/package.json +++ b/test/versioned/pg-esm/package.json @@ -1,5 +1,6 @@ { "name": "pg-esm-tests", + "targets": ["pg"], "type": "module", "version": "0.0.0", "private": true, @@ -9,7 +10,7 @@ "node": ">=16.12.0" }, "dependencies": { - "pg": ">=8.2 <8.8", + "pg": ">=8.2.0 <8.8.0", "pg-native": ">=2" }, "files": [ @@ -23,7 +24,7 @@ "node": ">=16.12.0" }, "dependencies": { - "pg": ">=8.8", + "pg": ">=8.8.0", "pg-native": ">=3" }, "files": [ diff --git a/test/versioned/pg/package.json b/test/versioned/pg/package.json index 4ea63cfd52..89bfe1909b 100644 --- a/test/versioned/pg/package.json +++ b/test/versioned/pg/package.json @@ -1,5 +1,6 @@ { "name": "pg-tests", + "targets": ["pg"], "version": "0.0.0", "private": true, "tests": [ @@ -8,7 +9,7 @@ "node": ">=16" }, "dependencies": { - "pg": ">=8.2 <8.8", + "pg": ">=8.2.0 <8.8.0", "pg-native": ">=2" }, "files": [ @@ -22,7 +23,7 @@ "node": ">=16" }, "dependencies": { - "pg": ">=8.8", + "pg": ">=8.8.0", "pg-native": ">=3" }, "files": [ diff --git a/test/versioned/pino/package.json b/test/versioned/pino/package.json index dd288538c4..f29624245e 100644 --- a/test/versioned/pino/package.json +++ b/test/versioned/pino/package.json @@ -1,5 +1,6 @@ { "name": "pino-tests", + "targets": ["pino"], "version": "0.0.0", "private": true, "tests": [ diff --git a/test/versioned/prisma/package.json b/test/versioned/prisma/package.json index f76b1d4bf6..8e923f2df9 100644 --- a/test/versioned/prisma/package.json +++ b/test/versioned/prisma/package.json @@ -1,5 +1,6 @@ { "name": "prisma-tests", + "targets": ["@prisma/client"], "version": "0.0.0", "private": true, "engines": { diff --git a/test/versioned/redis/package.json b/test/versioned/redis/package.json index 84bcd0fe89..2bc88144a8 100644 --- a/test/versioned/redis/package.json +++ b/test/versioned/redis/package.json @@ -1,5 +1,6 @@ { "name": "redis-tests", + "targets": ["redis"], "version": "0.0.0", "private": true, "tests": [ @@ -41,7 +42,7 @@ "node": ">=16" }, "dependencies": { - "redis": ">=2.6.0 < 4" + "redis": ">=2.6.0 < 4.0.0" }, "files": [ "redis.tap.js" @@ -52,7 +53,7 @@ "node": ">=16" }, "dependencies": { - "redis": ">=4" + "redis": ">=4.0.0" }, "files": [ "redis-v4.tap.js" diff --git a/test/versioned/restify/restify-post-7/async-handlers.tap.js b/test/versioned/restify/async-handlers.tap.js similarity index 98% rename from test/versioned/restify/restify-post-7/async-handlers.tap.js rename to test/versioned/restify/async-handlers.tap.js index cfd3ac7ce3..43dd2920f3 100644 --- a/test/versioned/restify/restify-post-7/async-handlers.tap.js +++ b/test/versioned/restify/async-handlers.tap.js @@ -7,8 +7,8 @@ const tap = require('tap') -const helper = require('../../../lib/agent_helper') -require('../../../lib/metrics_helper') +const helper = require('../../lib/agent_helper') +require('../../lib/metrics_helper') const { runTest } = require('./common') const simulateAsyncWork = async () => { diff --git a/test/versioned/restify/restify-post-7/capture-params.tap.js b/test/versioned/restify/capture-params.tap.js similarity index 96% rename from test/versioned/restify/restify-post-7/capture-params.tap.js rename to test/versioned/restify/capture-params.tap.js index 0af0df5977..d02062b9be 100644 --- a/test/versioned/restify/restify-post-7/capture-params.tap.js +++ b/test/versioned/restify/capture-params.tap.js @@ -5,11 +5,11 @@ 'use strict' -const DESTINATIONS = require('../../../../lib/config/attribute-filter').DESTINATIONS +const DESTINATIONS = require('../../../lib/config/attribute-filter').DESTINATIONS const test = require('tap').test -const helper = require('../../../lib/agent_helper') -const HTTP_ATTS = require('../../../lib/fixtures').httpAttributes +const helper = require('../../lib/agent_helper') +const HTTP_ATTS = require('../../lib/fixtures').httpAttributes test('Restify capture params introspection', function (t) { t.autoend() diff --git a/test/versioned/restify/restify-post-7/common.js b/test/versioned/restify/common.js similarity index 94% rename from test/versioned/restify/restify-post-7/common.js rename to test/versioned/restify/common.js index 5e07ee1ef3..1b4c4f9b92 100644 --- a/test/versioned/restify/restify-post-7/common.js +++ b/test/versioned/restify/common.js @@ -5,7 +5,7 @@ 'use strict' const common = module.exports -const helper = require('../../../lib/agent_helper') +const helper = require('../../lib/agent_helper') /** * @param {object} cfg diff --git a/test/versioned/restify/restify-post-7/ignoring.tap.js b/test/versioned/restify/ignoring.tap.js similarity index 95% rename from test/versioned/restify/restify-post-7/ignoring.tap.js rename to test/versioned/restify/ignoring.tap.js index b5c5cd4012..3429c12c1c 100644 --- a/test/versioned/restify/restify-post-7/ignoring.tap.js +++ b/test/versioned/restify/ignoring.tap.js @@ -7,8 +7,8 @@ const test = require('tap').test -const helper = require('../../../lib/agent_helper') -const API = require('../../../../api') +const helper = require('../../lib/agent_helper') +const API = require('../../../api') test('Restify router introspection', function (t) { t.plan(7) diff --git a/test/versioned/restify/restify-post-7/newrelic.js b/test/versioned/restify/newrelic.js similarity index 100% rename from test/versioned/restify/restify-post-7/newrelic.js rename to test/versioned/restify/newrelic.js diff --git a/test/versioned/restify/restify-post-7/package.json b/test/versioned/restify/package.json similarity index 67% rename from test/versioned/restify/restify-post-7/package.json rename to test/versioned/restify/package.json index 3c44ace13e..54bffbea47 100644 --- a/test/versioned/restify/restify-post-7/package.json +++ b/test/versioned/restify/package.json @@ -1,8 +1,27 @@ { "name": "restify-tests", + "targets": ["restify"], "version": "0.0.0", "private": true, "tests": [ + { + "engines": { + "node": ">=16" + }, + "dependencies": { + "restify": ">=5.0.0 <7", + "express": "4.16", + "restify-errors": "6.1" + }, + "files": [ + "pre-7/capture-params.tap.js", + "pre-7/ignoring.tap.js", + "pre-7/restify.tap.js", + "pre-7/router.tap.js", + "pre-7/rum.tap.js", + "pre-7/transaction-naming.tap.js" + ] + }, { "engines": { "node": ">=16 < 18" @@ -43,8 +62,5 @@ ] } ], - "dependencies": { - "express": "4.16", - "restify-errors": "6.1" - } + "dependencies": {} } diff --git a/test/versioned/restify/restify-pre-7/capture-params.tap.js b/test/versioned/restify/pre-7/capture-params.tap.js similarity index 100% rename from test/versioned/restify/restify-pre-7/capture-params.tap.js rename to test/versioned/restify/pre-7/capture-params.tap.js diff --git a/test/versioned/restify/restify-pre-7/ignoring.tap.js b/test/versioned/restify/pre-7/ignoring.tap.js similarity index 100% rename from test/versioned/restify/restify-pre-7/ignoring.tap.js rename to test/versioned/restify/pre-7/ignoring.tap.js diff --git a/test/versioned/restify/restify-pre-7/newrelic.js b/test/versioned/restify/pre-7/newrelic.js similarity index 100% rename from test/versioned/restify/restify-pre-7/newrelic.js rename to test/versioned/restify/pre-7/newrelic.js diff --git a/test/versioned/restify/restify-pre-7/restify.tap.js b/test/versioned/restify/pre-7/restify.tap.js similarity index 100% rename from test/versioned/restify/restify-pre-7/restify.tap.js rename to test/versioned/restify/pre-7/restify.tap.js diff --git a/test/versioned/restify/restify-pre-7/router.tap.js b/test/versioned/restify/pre-7/router.tap.js similarity index 100% rename from test/versioned/restify/restify-pre-7/router.tap.js rename to test/versioned/restify/pre-7/router.tap.js diff --git a/test/versioned/restify/restify-post-7/rum.tap.js b/test/versioned/restify/pre-7/rum.tap.js similarity index 100% rename from test/versioned/restify/restify-post-7/rum.tap.js rename to test/versioned/restify/pre-7/rum.tap.js diff --git a/test/versioned/restify/restify-pre-7/transaction-naming.tap.js b/test/versioned/restify/pre-7/transaction-naming.tap.js similarity index 100% rename from test/versioned/restify/restify-pre-7/transaction-naming.tap.js rename to test/versioned/restify/pre-7/transaction-naming.tap.js diff --git a/test/versioned/restify/restify-pre-7/package.json b/test/versioned/restify/restify-pre-7/package.json deleted file mode 100644 index ada8c84ead..0000000000 --- a/test/versioned/restify/restify-pre-7/package.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "restify-tests", - "version": "0.0.0", - "private": true, - "tests": [ - { - "engines": { - "node": ">=16" - }, - "dependencies": { - "restify": ">=5.0.0 <7", - "express": "4.16", - "restify-errors": "6.1" - }, - "files": [ - "capture-params.tap.js", - "ignoring.tap.js", - "restify.tap.js", - "router.tap.js", - "rum.tap.js", - "transaction-naming.tap.js" - ] - } - ], - "dependencies": { - "express": "4.16", - "restify-errors": "6.1" - } -} diff --git a/test/versioned/restify/restify-post-7/restify.tap.js b/test/versioned/restify/restify.tap.js similarity index 98% rename from test/versioned/restify/restify-post-7/restify.tap.js rename to test/versioned/restify/restify.tap.js index 84c72a8666..8088d0eb4d 100644 --- a/test/versioned/restify/restify-post-7/restify.tap.js +++ b/test/versioned/restify/restify.tap.js @@ -7,8 +7,8 @@ const tap = require('tap') -const helper = require('../../../lib/agent_helper') -require('../../../lib/metrics_helper') +const helper = require('../../lib/agent_helper') +require('../../lib/metrics_helper') const METRIC = 'WebTransaction/Restify/GET//hello/:name' diff --git a/test/versioned/restify/restify-post-7/router.tap.js b/test/versioned/restify/router.tap.js similarity index 99% rename from test/versioned/restify/restify-post-7/router.tap.js rename to test/versioned/restify/router.tap.js index 75c4442b9b..0f80d8d391 100644 --- a/test/versioned/restify/restify-post-7/router.tap.js +++ b/test/versioned/restify/router.tap.js @@ -7,7 +7,7 @@ const tap = require('tap') -const helper = require('../../../lib/agent_helper') +const helper = require('../../lib/agent_helper') const { version: pkgVersion } = require('restify/package') const semver = require('semver') diff --git a/test/versioned/restify/restify-pre-7/rum.tap.js b/test/versioned/restify/rum.tap.js similarity index 92% rename from test/versioned/restify/restify-pre-7/rum.tap.js rename to test/versioned/restify/rum.tap.js index b342d187c8..d629f77cee 100644 --- a/test/versioned/restify/restify-pre-7/rum.tap.js +++ b/test/versioned/restify/rum.tap.js @@ -7,8 +7,8 @@ const tap = require('tap') -const helper = require('../../../lib/agent_helper') -const API = require('../../../../api') +const helper = require('../../lib/agent_helper') +const API = require('../../../api') tap.test('Restify router introspection', function (t) { t.plan(3) diff --git a/test/versioned/restify/restify-post-7/transaction-naming.tap.js b/test/versioned/restify/transaction-naming.tap.js similarity index 99% rename from test/versioned/restify/restify-post-7/transaction-naming.tap.js rename to test/versioned/restify/transaction-naming.tap.js index 83817aec33..bc8fce62f3 100644 --- a/test/versioned/restify/restify-post-7/transaction-naming.tap.js +++ b/test/versioned/restify/transaction-naming.tap.js @@ -5,7 +5,7 @@ 'use strict' -const helper = require('../../../lib/agent_helper') +const helper = require('../../lib/agent_helper') const tap = require('tap') const semver = require('semver') const { runTest } = require('./common') diff --git a/test/versioned/restify/restify-post-7/with-express.tap.js b/test/versioned/restify/with-express.tap.js similarity index 97% rename from test/versioned/restify/restify-post-7/with-express.tap.js rename to test/versioned/restify/with-express.tap.js index 84248bde2c..298659b79a 100644 --- a/test/versioned/restify/restify-post-7/with-express.tap.js +++ b/test/versioned/restify/with-express.tap.js @@ -7,7 +7,7 @@ const tap = require('tap') -const helper = require('../../../lib/agent_helper') +const helper = require('../../lib/agent_helper') const MAX_PORT_ATTEMPTS = 5 diff --git a/test/versioned/superagent/package.json b/test/versioned/superagent/package.json index 0edc7014c6..cf15131db5 100644 --- a/test/versioned/superagent/package.json +++ b/test/versioned/superagent/package.json @@ -1,5 +1,6 @@ { "name": "superagent-tests", + "targets": ["superagent"], "version": "0.0.0", "private": true, "tests": [{ diff --git a/test/versioned/undici/package.json b/test/versioned/undici/package.json index 9da425a013..5a2fb97b35 100644 --- a/test/versioned/undici/package.json +++ b/test/versioned/undici/package.json @@ -1,5 +1,6 @@ { "name": "undici-tests", + "targets": ["undici"], "version": "0.0.0", "private": true, "tests": [ diff --git a/test/versioned/winston-esm/package.json b/test/versioned/winston-esm/package.json index 4cc132fed2..6cfefe7976 100644 --- a/test/versioned/winston-esm/package.json +++ b/test/versioned/winston-esm/package.json @@ -1,5 +1,6 @@ { "name": "winston-esm-tests", + "targets": ["winston"], "version": "0.0.0", "type": "module", "private": true, @@ -9,8 +10,8 @@ "node": ">=16" }, "dependencies": { - "winston": ">=3", - "winston-transport": ">=4" + "winston": ">=3.0.0", + "winston-transport": ">=4.0.0" }, "files": [ "winston.tap.mjs" diff --git a/test/versioned/winston/package.json b/test/versioned/winston/package.json index 5ea911214b..999ed4c13b 100644 --- a/test/versioned/winston/package.json +++ b/test/versioned/winston/package.json @@ -1,5 +1,6 @@ { "name": "winston-tests", + "targets": ["winston"], "version": "0.0.0", "private": true, "tests": [ @@ -8,7 +9,7 @@ "node": ">=16" }, "dependencies": { - "winston": ">=3" + "winston": ">=3.0.0" }, "files": [ "winston.tap.js"