chore: add test-services scripts per package

CONTRIBUTING.md

@@ -117,7 +117,7 @@ The required steps to start development on a pacakge are:
 
 - `npm ci` from root folder to install dependencies ([see npm-ci docs](https://docs.npmjs.com/cli/v10/commands/npm-ci))
 - `cd` into the pacakge you want to apply changes.
-- `npm run setup:dev` compiles the TypeScript files for this package and its dependencies within the repository.
+- `npm run compile:with-dependencies` compiles the TypeScript files for this package and its dependencies within the repository.
 
 Then you can proceed to do apply the changes and use the scripts below for development workflow
 
@@ -146,23 +146,21 @@ npm test
 However, some instrumentations require test-services to be running (e.g. the `instrumentation-mongodb` package requires a MongoDB server). Use the `test-services`-related npm scripts to start all required services in Docker and then run the tests with the appropriate configuration to use those services:
 
 ```sh
-npm run test-services:start       # starts services in Docker
-npm run test:with-services-config # runs 'npm test' with envvars from test/test-services.env
-npm run test-services:stop        # stops services in Docker
+npm run test-services:start    # starts services in Docker
+npm run test:with-services-env # runs 'npm test' with envvars from test/test-services.env
+npm run test-services:stop     # stops services in Docker
 ```
 
-If you only want to test a single package (e.g. the `instrumentation-mongodb`) you can `cd` into it and run the tests after you started the services.
+If you only want to test a single package that dfepends on a service (e.g. the `instrumentation-mongodb`) you can `cd` into it and
+use the same scripts for testing. In this case the script will only start the services needed to test the package.
 
 ```sh
-npm run test-services:start             # starts services in Docker
-cd packages/instrumentation-mongodb     # get into the instrumenation folder
-RUN_MONGODB_TESTS=1 npm test            # run the test with the proper config (check each package)
-cd ../../..                             # go back to root folder
-npm run test-services:stop              # stops services in Docker
+cd packages/instrumentation-mongodb # get into the instrumenation folder
+npm run test-services:start         # start the MongoDB service in Docker
+npm run test:with-services-env      # runs 'npm test' with envvars from test/test-services.env
+npm run test-services:stop          # stop MongoDB service in Docker
 ```
 
-NOTE: scripts for each package will be added to avoid extra consumption of resources and improve the development experience.
-
 ### Benchmarks
 
 When two or more approaches must be compared, please write a benchmark in the benchmark/index.js module so that we can keep track of the most efficient algorithm.

incubator/opentelemetry-sampler-aws-xray/package.json

@@ -28,11 +28,11 @@
   ],
   "repository": "open-telemetry/opentelemetry-js-contrib",
   "scripts": {
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/sampler-aws-xray",
+    "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
     "compile": "tsc -p .",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/sampler-aws-xray",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
-    "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
     "prepublishOnly": "npm run compile",
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "test": "nyc mocha 'test/**/*.test.ts'",

packages/auto-configuration-propagators/package.json

@@ -20,8 +20,8 @@
   },
   "scripts": {
     "clean": "rimraf build/*",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/auto-configuration-propagators",
     "compile": "tsc -p .",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/auto-configuration-propagators",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
     "prepublishOnly": "npm run compile",

packages/auto-instrumentations-node/package.json

@@ -24,8 +24,8 @@
   },
   "scripts": {
     "clean": "rimraf build/*",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/auto-instrumentations-node",
     "compile": "tsc -p .",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/auto-instrumentations-node",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
     "prepublishOnly": "npm run compile",

packages/auto-instrumentations-web/package.json

@@ -22,8 +22,8 @@
   },
   "scripts": {
     "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/auto-instrumentations-web",
     "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/auto-instrumentations-web",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
     "prepublishOnly": "npm run compile",

packages/baggage-log-record-processor/package.json

@@ -11,8 +11,8 @@
   },
   "scripts": {
     "clean": "rimraf build/*",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/baggage-log-record-processor",
     "compile": "tsc -p .",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/baggage-log-record-processor",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
     "prewatch": "npm run precompile",

packages/baggage-span-processor/package.json

@@ -11,8 +11,8 @@
   },
   "scripts": {
     "clean": "rimraf build/*",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/baggage-span-processor",
     "compile": "tsc -p .",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/baggage-span-processor",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
     "prepublishOnly": "npm run compile",

packages/contrib-test-utils/package.json

@@ -8,10 +8,10 @@
     "access": "public"
   },
   "scripts": {
+    "compile": "tsc -p .",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/contrib-test-utils",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/contrib-test-utils",
-    "compile": "tsc -p .",
     "prepublishOnly": "npm run compile",
     "watch": "tsc -w"
   },

packages/host-metrics/package.json

@@ -11,8 +11,8 @@
   },
   "scripts": {
     "clean": "rimraf build/*",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/host-metrics",
     "compile": "tsc -p .",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/host-metrics",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
     "prepublishOnly": "npm run compile",

packages/id-generator-aws-xray/package.json

@@ -19,9 +19,9 @@
     "directory": "packages/id-generator-aws-xray"
   },
   "scripts": {
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/id-generator-aws-xray",
-    "compile": "tsc --build tsconfig.json tsconfig.esm.json",
     "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
+    "compile": "tsc --build tsconfig.json tsconfig.esm.json",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/id-generator-aws-xray",
     "test": "nyc mocha test/**/*.test.ts",
     "test:browser": "nyc karma start --single-run",
     "lint": "eslint . --ext .ts",

packages/instrumentation-amqplib/package.json

@@ -31,18 +31,21 @@
   },
   "scripts": {
     "clean": "rimraf build/*",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-amqplib",
     "compile": "tsc -p .",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/instrumentation-amqplib",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
     "lint:readme": "node ../../scripts/lint-readme.js",
     "prepublishOnly": "npm run compile",
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "test": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'",
+    "test:with-services-env": "cross-env NODE_OPTIONS='-r dotenv/config' DOTENV_CONFIG_PATH=../../test/test-services.env npm test",
     "test-all-versions": "tav",
+    "test-all-versions:with-services-env": "cross-env NODE_OPTIONS='-r dotenv/config' DOTENV_CONFIG_PATH=../../test/test-services.env npm run test-all-versions",
+    "test-services:start": "cd ../.. && npm run test-services:start rabbitmq",
+    "test-services:stop": "cd ../.. && npm run test-services:stop rabbitmq",
     "version:update": "node ../../scripts/version-update.js",
-    "watch": "tsc -w",
-    "test:docker:run": "docker run -d --hostname demo-amqplib-rabbit --name amqplib-unittests -p 22221:5672 --env RABBITMQ_DEFAULT_USER=username --env RABBITMQ_DEFAULT_PASS=password rabbitmq:3"
+    "watch": "tsc -w"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.3.0"

packages/instrumentation-aws-lambda/package.json

@@ -18,7 +18,7 @@
     "lint:readme": "node ../../scripts/lint-readme.js",
     "prepublishOnly": "npm run compile",
     "version:update": "node ../../scripts/version-update.js",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-aws-lambda",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/instrumentation-aws-lambda",
     "compile": "tsc -p ."
   },
   "keywords": [

packages/instrumentation-aws-sdk/package.json

@@ -32,7 +32,7 @@
   },
   "scripts": {
     "clean": "rimraf build/*",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-aws-sdk",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/instrumentation-aws-sdk",
     "compile": "tsc -p .",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",

packages/instrumentation-bunyan/package.json

@@ -11,7 +11,7 @@
   },
   "scripts": {
     "clean": "rimraf build/*",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-bunyan",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/instrumentation-bunyan",
     "compile": "tsc -p .",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",

packages/instrumentation-cassandra-driver/package.json

@@ -10,16 +10,22 @@
     "directory": "packages/instrumentation-cassandra-driver"
   },
   "scripts": {
-    "test": "nyc mocha 'test/**/*.test.ts'",
-    "tdd": "npm run test -- --watch-extensions ts --watch",
     "clean": "rimraf build/*",
+    "compile": "tsc -p .",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/instrumentation-cassandra-driver",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
     "lint:readme": "node ../../scripts/lint-readme.js",
     "prepublishOnly": "npm run compile",
-    "version:update": "node ../../scripts/version-update.js",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-cassandra-driver",
-    "compile": "tsc -p ."
+    "tdd": "npm run test -- --watch-extensions ts --watch",
+    "test": "nyc mocha 'test/**/*.test.ts'",
+    "test:with-services-env": "cross-env NODE_OPTIONS='-r dotenv/config' DOTENV_CONFIG_PATH=../../test/test-services.env npm test",
+    "//todo": "echo test all versions should be configured",
+    "test-all-versions": "tav",
+    "test-all-versions:with-services-env": "cross-env NODE_OPTIONS='-r dotenv/config' DOTENV_CONFIG_PATH=../../test/test-services.env npm run test-all-versions",
+    "test-services:start": "cd ../.. && npm run test-services:start cassandra",
+    "test-services:stop": "cd ../.. && npm run test-services:stop cassandra",
+    "version:update": "node ../../scripts/version-update.js"
   },
   "keywords": [
     "cassandra-driver",

packages/instrumentation-cassandra-driver/test/cassandra-driver.test.ts

@@ -56,13 +56,11 @@ const provider = new NodeTracerProvider({
 context.setGlobalContextManager(new AsyncLocalStorageContextManager());
 
 const testCassandra = process.env.RUN_CASSANDRA_TESTS;
-const testCassandraLocally = process.env.RUN_CASSANDRA_TESTS_LOCAL;
-const shouldTest = testCassandra || testCassandraLocally;
+const shouldTest = testCassandra;
 const cassandraTimeoutMs = 60000;
-const cassandraContactPoint =
-  process.env.CASSANDRA_HOST ?? testCassandraLocally
-    ? '127.0.0.1'
-    : 'cassandra';
+const cassandraContactPoint = process.env.CASSANDRA_HOST
+  ? '127.0.0.1'
+  : 'cassandra';
 
 function assertSpan(
   span: ReadableSpan,
@@ -155,15 +153,7 @@ describe('CassandraDriverInstrumentation', () => {
       this.skip();
     }
 
-    // Cassandra takes a long time to boot up - 20 seconds easily.
-    this.timeout(cassandraTimeoutMs);
-
-    if (testCassandraLocally) {
-      testUtils.startDocker('cassandra');
-    }
-
     instrumentation = new CassandraDriverInstrumentation();
-
     instrumentation.setTracerProvider(provider);
 
     const cassandra = require('cassandra-driver');
@@ -193,11 +183,7 @@ describe('CassandraDriverInstrumentation', () => {
   });
 
   after(async function () {
-    this.timeout(60000);
     await client?.shutdown?.();
-    if (testCassandraLocally) {
-      testUtils.cleanUpDocker('cassandra');
-    }
   });
 
   describe('execute', () => {

packages/instrumentation-connect/package.json

@@ -11,7 +11,7 @@
   },
   "scripts": {
     "clean": "rimraf build/*",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-connect",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/instrumentation-connect",
     "compile": "tsc -p .",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",

packages/instrumentation-cucumber/package.json

@@ -19,7 +19,7 @@
     "lint:readme": "node ../../scripts/lint-readme.js",
     "prepublishOnly": "npm run compile",
     "version:update": "node ../../scripts/version-update.js",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-cucumber",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/instrumentation-cucumber",
     "compile": "tsc -p ."
   },
   "keywords": [

packages/instrumentation-dataloader/package.json

@@ -11,7 +11,7 @@
   },
   "scripts": {
     "clean": "rimraf build/*",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-dataloader",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/instrumentation-dataloader",
     "compile": "tsc -p .",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",

packages/instrumentation-dns/package.json

@@ -18,7 +18,7 @@
     "prepublishOnly": "npm run compile",
     "version:update": "node ../../scripts/version-update.js",
     "lint:readme": "node ../../scripts/lint-readme",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-dns",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/instrumentation-dns",
     "compile": "tsc -p ."
   },
   "keywords": [

packages/instrumentation-document-load/package.json

@@ -17,7 +17,7 @@
     "lint:fix": "eslint . --ext .ts --fix",
     "lint:readme": "node ../../scripts/lint-readme.js",
     "version:update": "node ../../scripts/version-update.js",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-document-load",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/instrumentation-document-load",
     "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
     "prepublishOnly": "npm run compile",
     "tdd": "wtr --watch",

packages/instrumentation-express/package.json

@@ -18,7 +18,7 @@
     "lint:fix": "eslint . --ext .ts --fix",
     "lint:readme": "node ../../scripts/lint-readme.js",
     "version:update": "node ../../scripts/version-update.js",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-express",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/instrumentation-express",
     "compile": "tsc -p .",
     "prepublishOnly": "npm run compile",
     "watch": "tsc -w"

packages/instrumentation-fastify/package.json

@@ -11,7 +11,7 @@
   },
   "scripts": {
     "clean": "rimraf build/*",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-fastify",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/instrumentation-fastify",
     "compile": "tsc -p .",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",

packages/instrumentation-fs/package.json

@@ -18,7 +18,7 @@
     "lint:readme": "node ../../scripts/lint-readme.js",
     "prepublishOnly": "npm run compile",
     "version:update": "node ../../scripts/version-update.js",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-fs",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/instrumentation-fs",
     "compile": "tsc -p ."
   },
   "keywords": [

packages/instrumentation-generic-pool/package.json

@@ -17,7 +17,7 @@
     "lint:fix": "eslint . --ext .ts --fix",
     "lint:readme": "node ../../scripts/lint-readme.js",
     "version:update": "node ../../scripts/version-update.js",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-generic-pool",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/instrumentation-generic-pool",
     "compile": "tsc -p .",
     "prepublishOnly": "npm run compile",
     "watch": "tsc -w"

packages/instrumentation-graphql/package.json

@@ -11,7 +11,7 @@
   },
   "scripts": {
     "clean": "rimraf build/*",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-graphql",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/instrumentation-graphql",
     "compile": "tsc -p .",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",

packages/instrumentation-hapi/package.json

@@ -18,7 +18,7 @@
     "lint:fix": "eslint . --ext .ts --fix",
     "lint:readme": "node ../../scripts/lint-readme.js",
     "version:update": "node ../../scripts/version-update.js",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-hapi",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/instrumentation-hapi",
     "compile": "tsc -p .",
     "prepublishOnly": "npm run compile"
   },

packages/instrumentation-ioredis/package.json

@@ -10,20 +10,22 @@
     "directory": "packages/instrumentation-ioredis"
   },
   "scripts": {
-    "test": "nyc mocha 'test/**/*.test.ts'",
-    "test:debug": "cross-env RUN_REDIS_TESTS_LOCAL=true mocha --inspect-brk --no-timeouts 'test/**/*.test.ts'",
-    "test:local": "cross-env RUN_REDIS_TESTS_LOCAL=true npm run test",
-    "test-all-versions": "tav",
-    "test-all-versions:local": "cross-env RUN_REDIS_TESTS_LOCAL=true npm run test-all-versions",
-    "tdd": "npm run test -- --watch-extensions ts --watch",
     "clean": "rimraf build/*",
+    "compile": "tsc -p .",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/instrumentation-ioredis",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
     "lint:readme": "node ../../scripts/lint-readme.js",
-    "version:update": "node ../../scripts/version-update.js",
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-ioredis",
-    "compile": "tsc -p .",
-    "prepublishOnly": "npm run compile"
+    "prepublishOnly": "npm run compile",
+    "tdd": "npm run test -- --watch-extensions ts --watch",
+    "test": "nyc mocha 'test/**/*.test.ts'",
+    "test:debug": "cross-env RUN_REDIS_TESTS=true mocha --inspect-brk --no-timeouts 'test/**/*.test.ts'",
+    "test:with-services-env": "cross-env NODE_OPTIONS='-r dotenv/config' DOTENV_CONFIG_PATH=../../test/test-services.env npm test",
+    "test-all-versions": "tav",
+    "test-all-versions:with-services-env": "cross-env NODE_OPTIONS='-r dotenv/config' DOTENV_CONFIG_PATH=../../test/test-services.env npm run test-all-versions",
+    "test-services:start": "cd ../.. && npm run test-services:start redis",
+    "test-services:stop": "cd ../.. && npm run test-services:stop redis",
+    "version:update": "node ../../scripts/version-update.js"
   },
   "keywords": [
     "instrumentation",