diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index 2f83f0c998..824ad23332 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -15,8 +15,12 @@ "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues" }, "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" @@ -26,19 +30,19 @@ }, "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "clean": "rimraf build/*", - "compile": "tsc -p .", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", - "prewatch": "npm run precompile", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'", + "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", "test-all-versions": "tav", "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 --build --watch tsconfig.json tsconfig.esm.json" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" diff --git a/plugins/node/instrumentation-amqplib/tsconfig.esm.json b/plugins/node/instrumentation-amqplib/tsconfig.esm.json new file mode 100644 index 0000000000..11a1dd35c3 --- /dev/null +++ b/plugins/node/instrumentation-amqplib/tsconfig.esm.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo", + "downlevelIteration": true + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/instrumentation-cucumber/package.json b/plugins/node/instrumentation-cucumber/package.json index 5e7cc412e2..a19b2433e0 100644 --- a/plugins/node/instrumentation-cucumber/package.json +++ b/plugins/node/instrumentation-cucumber/package.json @@ -3,20 +3,22 @@ "version": "0.13.0", "description": "OpenTelemetry instrumentation for `@cucumber/cucumber` automated tests runner", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "test": "nyc mocha 'test/**/*.test.ts'", - "test-all-versions": "tav", - "tdd": "npm run test -- --watch-extensions ts --watch", - "clean": "rimraf build/*", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", - "prewatch": "npm run precompile", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "nyc mocha 'test/**/*.test.ts'", + "test-all-versions": "tav", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p ." + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "cucumber", @@ -32,6 +34,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/instrumentation-cucumber/tsconfig.esm.json b/plugins/node/instrumentation-cucumber/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/instrumentation-cucumber/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/instrumentation-dataloader/package.json b/plugins/node/instrumentation-dataloader/package.json index 27c1490f87..5e2f0c2ede 100644 --- a/plugins/node/instrumentation-dataloader/package.json +++ b/plugins/node/instrumentation-dataloader/package.json @@ -3,19 +3,22 @@ "version": "0.16.0", "description": "OpenTelemetry instrumentation for `dataloader` data fetching layer", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "clean": "rimraf build/*", - "compile": "tsc -p .", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "prewatch": "npm run precompile", + "lint:readme": "node ../../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha 'test/**/*.test.ts'", "test-all-versions": "tav", - "version:update": "node ../../../scripts/version-update.js" + "version:update": "node ../../../scripts/version-update.js", + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "dataloader", @@ -31,6 +34,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/instrumentation-dataloader/tsconfig.esm.json b/plugins/node/instrumentation-dataloader/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/instrumentation-dataloader/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/instrumentation-fs/package.json b/plugins/node/instrumentation-fs/package.json index 65b6a85461..a513f183de 100644 --- a/plugins/node/instrumentation-fs/package.json +++ b/plugins/node/instrumentation-fs/package.json @@ -3,19 +3,21 @@ "version": "0.19.0", "description": "OpenTelemetry instrumentation for `node:fs` file system interactions module", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "test": "mocha 'test/**/*.test.ts'", - "tdd": "npm run test -- --watch-extensions ts --watch", - "clean": "rimraf build/*", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", - "prewatch": "npm run precompile", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "nyc mocha 'test/**/*.test.ts'", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p ." + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "fs", @@ -31,6 +33,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/instrumentation-fs/tsconfig.esm.json b/plugins/node/instrumentation-fs/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/instrumentation-fs/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/instrumentation-kafkajs/package.json b/plugins/node/instrumentation-kafkajs/package.json index 756e39baf9..8d128258cd 100644 --- a/plugins/node/instrumentation-kafkajs/package.json +++ b/plugins/node/instrumentation-kafkajs/package.json @@ -3,19 +3,21 @@ "version": "0.7.0", "description": "OpenTelemetry instrumentation for `kafkajs` messaging client for Apache Kafka", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "test": "mocha --require @opentelemetry/contrib-test-utils 'test/**/*.test.ts'", - "tdd": "npm run test -- --watch-extensions ts --watch", - "clean": "rimraf build/*", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme", - "prewatch": "npm run precompile", + "lint:readme": "node ../../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "mocha --require @opentelemetry/contrib-test-utils 'test/**/*.test.ts'", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p ." + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "kafkajs", @@ -31,6 +33,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/instrumentation-kafkajs/tsconfig.esm.json b/plugins/node/instrumentation-kafkajs/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/instrumentation-kafkajs/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/instrumentation-lru-memoizer/package.json b/plugins/node/instrumentation-lru-memoizer/package.json index 379256452e..3363df9f66 100644 --- a/plugins/node/instrumentation-lru-memoizer/package.json +++ b/plugins/node/instrumentation-lru-memoizer/package.json @@ -3,20 +3,22 @@ "version": "0.44.0", "description": "OpenTelemetry instrumentation for `lru-memoizer` function memoization using lru-cache", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "test": "mocha --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'", - "test-all-versions": "tav", - "tdd": "npm run test -- --watch-extensions ts --watch", - "clean": "rimraf build/*", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", - "prewatch": "npm run precompile", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "mocha --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'", + "test-all-versions": "tav", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p ." + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "lru-memoizer", @@ -31,6 +33,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/instrumentation-lru-memoizer/tsconfig.esm.json b/plugins/node/instrumentation-lru-memoizer/tsconfig.esm.json new file mode 100644 index 0000000000..11a1dd35c3 --- /dev/null +++ b/plugins/node/instrumentation-lru-memoizer/tsconfig.esm.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo", + "downlevelIteration": true + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json index b4e11d95e2..fbe5453307 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/plugins/node/instrumentation-mongoose/package.json @@ -3,23 +3,25 @@ "version": "0.46.0", "description": "OpenTelemetry instrumentation for `mongoose` database object data modeling (ODM) library for MongoDB", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "docker:start": "docker run -e MONGODB_DB=opentelemetry-tests -e MONGODB_PORT=27017 -e MONGODB_HOST=127.0.0.1 -p 27017:27017 --rm mongo", - "test": "npm run test-v5-v6", - "test-v5-v6": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/mongoose-common.test.ts' 'test/**/mongoose-v5-v6.test.ts'", - "test-v7-v8": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/mongoose-common.test.ts' 'test/**/mongoose-v7-v8.test.ts'", - "test-all-versions": "tav", - "tdd": "npm run test -- --watch-extensions ts --watch", - "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", - "prewatch": "npm run precompile", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "npm run test-v5-v6", + "test-all-versions": "tav", + "test-v5-v6": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/mongoose-common.test.ts' 'test/**/mongoose-v5-v6.test.ts'", + "test-v7-v8": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/mongoose-common.test.ts' 'test/**/mongoose-v7-v8.test.ts'", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p ." + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "mongodb", @@ -36,6 +38,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/instrumentation-mongoose/src/mongoose.ts b/plugins/node/instrumentation-mongoose/src/mongoose.ts index 30fbddd661..449ebfad8d 100644 --- a/plugins/node/instrumentation-mongoose/src/mongoose.ts +++ b/plugins/node/instrumentation-mongoose/src/mongoose.ts @@ -319,8 +319,9 @@ export class MongooseInstrumentation extends InstrumentationBase { return function captureSpanContext(this: any) { const currentSpan = trace.getSpan(context.active()); + const _args = arguments; const aggregate = self._callOriginalFunction(() => - original.apply(this, arguments) + original.apply(this, _args) ); if (aggregate) aggregate[_STORED_PARENT_SPAN] = currentSpan; return aggregate; @@ -333,9 +334,8 @@ export class MongooseInstrumentation extends InstrumentationBase { return function captureSpanContext(this: any) { this[_STORED_PARENT_SPAN] = trace.getSpan(context.active()); - return self._callOriginalFunction(() => - original.apply(this, arguments) - ); + const _args = arguments; + return self._callOriginalFunction(() => original.apply(this, _args)); }; }; } diff --git a/plugins/node/instrumentation-mongoose/tsconfig.esm.json b/plugins/node/instrumentation-mongoose/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/instrumentation-mongoose/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/instrumentation-runtime-node/README.md b/plugins/node/instrumentation-runtime-node/README.md index c7c93bb53a..d92a8daae9 100644 --- a/plugins/node/instrumentation-runtime-node/README.md +++ b/plugins/node/instrumentation-runtime-node/README.md @@ -77,5 +77,5 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[npm-url]: https://www.npmjs.com/package/@opentelemetry/instrumentation-pg -[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Finstrumentation-pg.svg +[npm-url]: https://www.npmjs.com/package/@opentelemetry/instrumentation-runtime-node +[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Finstrumentation-runtime-node.svg diff --git a/plugins/node/instrumentation-runtime-node/package.json b/plugins/node/instrumentation-runtime-node/package.json index 035a66f6bc..6a5c8466bd 100644 --- a/plugins/node/instrumentation-runtime-node/package.json +++ b/plugins/node/instrumentation-runtime-node/package.json @@ -3,18 +3,22 @@ "version": "0.12.1", "description": "OpenTelemetry instrumentation for Node.js Performance measurement API", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-runtime-node", "scripts": { - "clean": "rimraf build/*", - "compile": "tsc -p .", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "prewatch": "npm run precompile", + "lint:readme": "node ../../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha 'test/**/*.test.ts'", - "version:update": "node ../../../scripts/version-update.js" + "version:update": "node ../../../scripts/version-update.js", + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "author": "OpenTelemetry Authors", "license": "Apache-2.0", @@ -28,6 +32,9 @@ "opentelemetry" ], "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/plugins/node/instrumentation-runtime-node/tsconfig.esm.json b/plugins/node/instrumentation-runtime-node/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/instrumentation-runtime-node/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/instrumentation-socket.io/package.json b/plugins/node/instrumentation-socket.io/package.json index ec25621c0c..19c2a02673 100644 --- a/plugins/node/instrumentation-socket.io/package.json +++ b/plugins/node/instrumentation-socket.io/package.json @@ -3,20 +3,22 @@ "version": "0.46.0", "description": "OpenTelemetry instrumentation for `socket.io` messaging server implementation for Socket.IO communication", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "test": "mocha --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'", - "test-all-versions": "tav", - "tdd": "npm run test -- --watch-extensions ts --watch", - "clean": "rimraf build/*", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", - "prewatch": "npm run precompile", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "mocha --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'", + "test-all-versions": "tav", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p ." + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "socket.io", @@ -31,6 +33,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/instrumentation-socket.io/src/socket.io.ts b/plugins/node/instrumentation-socket.io/src/socket.io.ts index d2b872dc9e..e20e0d7fc7 100644 --- a/plugins/node/instrumentation-socket.io/src/socket.io.ts +++ b/plugins/node/instrumentation-socket.io/src/socket.io.ts @@ -291,6 +291,7 @@ export class SocketIoInstrumentation extends InstrumentationBase - self.endSpan(() => originalListener.apply(this, arguments), span) + self.endSpan(() => originalListener.apply(this, _args), span) ); }; return original.apply(this, [ev, wrappedListener]); @@ -404,9 +405,10 @@ export class SocketIoInstrumentation extends InstrumentationBase - original.apply(this, arguments) + original.apply(this, _args) ); } catch (error: any) { span.setStatus({ diff --git a/plugins/node/instrumentation-socket.io/tsconfig.esm.json b/plugins/node/instrumentation-socket.io/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/instrumentation-socket.io/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json index 05326ee9ae..48fd2ddf15 100644 --- a/plugins/node/instrumentation-tedious/package.json +++ b/plugins/node/instrumentation-tedious/package.json @@ -3,19 +3,22 @@ "version": "0.18.0", "description": "OpenTelemetry instrumentation for `tedious` database client for Microsoft SQL Server", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "clean": "rimraf build/*", - "compile": "tsc -p .", - "lint:fix": "eslint . --ext .ts --fix", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", - "prewatch": "npm run precompile", + "lint:fix": "eslint . --ext .ts --fix", + "lint:readme": "node ../../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha 'test/**/*.test.ts'", "test-all-versions": "tav", - "version:update": "node ../../../scripts/version-update.js" + "version:update": "node ../../../scripts/version-update.js", + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "instrumentation", @@ -35,6 +38,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/instrumentation-tedious/tsconfig.esm.json b/plugins/node/instrumentation-tedious/tsconfig.esm.json new file mode 100644 index 0000000000..11a1dd35c3 --- /dev/null +++ b/plugins/node/instrumentation-tedious/tsconfig.esm.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo", + "downlevelIteration": true + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/instrumentation-undici/README.md b/plugins/node/instrumentation-undici/README.md index e0d9f8d158..4617ff7615 100644 --- a/plugins/node/instrumentation-undici/README.md +++ b/plugins/node/instrumentation-undici/README.md @@ -8,6 +8,10 @@ This module provides automatic instrumentation for [`undici`](https://undici.nodejs.org/) and Node.js global [`fetch`](https://nodejs.org/docs/latest/api/globals.html#fetch) API. If you're looking the instrumentation for browser's `fetch` API it is located at [https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-fetch/](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-fetch/) +If total installation size is not constrained, it is recommended to use the [`@opentelemetry/auto-instrumentations-node`](https://www.npmjs.com/package/@opentelemetry/auto-instrumentations-node) bundle with [@opentelemetry/sdk-node](`https://www.npmjs.com/package/@opentelemetry/sdk-node`) for the most seamless instrumentation experience. + +Compatible with OpenTelemetry JS API and SDK `1.0+`. + ## Installation ```bash diff --git a/plugins/node/instrumentation-undici/package.json b/plugins/node/instrumentation-undici/package.json index 42b20045ed..2e102b27cf 100644 --- a/plugins/node/instrumentation-undici/package.json +++ b/plugins/node/instrumentation-undici/package.json @@ -3,20 +3,22 @@ "version": "0.10.0", "description": "OpenTelemetry instrumentation for `undici` http client and Node.js fetch()", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc -p .", - "test": "nyc mocha test/**/*.test.ts", - "test-all-versions": "tav", - "tdd": "npm run test -- --watch-extensions ts --watch", - "clean": "rimraf build/*", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "watch": "tsc -w", + "lint:readme": "node ../../../scripts/lint-readme.js", + "prepublishOnly": "npm run compile", "prewatch": "npm run precompile", - "version:update": "node ../../../scripts/version-update.js" + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "nyc mocha 'test/**/*.test.ts'", + "test-all-versions": "tav", + "version:update": "node ../../../scripts/version-update.js", + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "opentelemetry", @@ -32,6 +34,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/instrumentation-undici/tsconfig.esm.json b/plugins/node/instrumentation-undici/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/instrumentation-undici/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 90a9617f6d..a7d9400b31 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -3,19 +3,21 @@ "version": "0.50.1", "description": "OpenTelemetry instrumentation for AWS Lambda function invocations", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "test": "nyc mocha 'test/**/*.test.ts'", - "tdd": "npm run test -- --watch-extensions ts --watch", - "clean": "rimraf build/*", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", - "prewatch": "npm run precompile", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "nyc mocha 'test/**/*.test.ts'", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p ." + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "aws-lambda", @@ -31,6 +33,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index 25d7b2e8bb..926f32397f 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -2,21 +2,39 @@ "name": "@opentelemetry/instrumentation-aws-sdk", "version": "0.49.0", "description": "OpenTelemetry instrumentation for `aws-sdk` and `@aws-sdk/client-*` clients for various AWS services", + "main": "build/src/index.js", + "types": "build/src/index.d.ts", + "module": "build/esm/index.js", + "repository": "open-telemetry/opentelemetry-js-contrib", + "scripts": { + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", + "lint": "eslint . --ext .ts", + "lint:fix": "eslint . --ext .ts --fix", + "lint:readme": "node ../../../scripts/lint-readme.js", + "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'", + "test-all-versions": "tav", + "version:update": "node ../../../scripts/version-update.js", + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" + }, "keywords": [ "aws", "aws-sdk", "nodejs", "opentelemetry" ], - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-aws-sdk#readme", - "license": "Apache-2.0", "author": "OpenTelemetry Authors", - "bugs": { - "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues" + "license": "Apache-2.0", + "engines": { + "node": ">=14" }, - "main": "build/src/index.js", - "types": "build/src/index.d.ts", "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", @@ -25,30 +43,9 @@ "publishConfig": { "access": "public" }, - "repository": "open-telemetry/opentelemetry-js-contrib", - "scripts": { - "clean": "rimraf build/*", - "compile": "tsc -p .", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", - "prewatch": "npm run precompile", - "prepublishOnly": "npm run compile", - "tdd": "npm run test -- --watch-extensions ts --watch", - "test": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'", - "test-all-versions": "tav", - "version:update": "node ../../../scripts/version-update.js", - "watch": "tsc -w" - }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" }, - "dependencies": { - "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.57.0", - "@opentelemetry/propagation-utils": "^0.30.15", - "@opentelemetry/semantic-conventions": "^1.27.0" - }, "devDependencies": { "@aws-sdk/client-dynamodb": "3.85.0", "@aws-sdk/client-kinesis": "3.85.0", @@ -74,7 +71,14 @@ "test-all-versions": "6.1.0", "typescript": "4.4.4" }, - "engines": { - "node": ">=14" + "dependencies": { + "@opentelemetry/core": "^1.8.0", + "@opentelemetry/instrumentation": "^0.57.0", + "@opentelemetry/propagation-utils": "^0.30.15", + "@opentelemetry/semantic-conventions": "^1.27.0" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-aws-sdk#readme", + "bugs": { + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues" } } diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/aws-sdk.ts b/plugins/node/opentelemetry-instrumentation-aws-sdk/src/aws-sdk.ts index a3040a15a9..ccc928eea3 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/aws-sdk.ts +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/src/aws-sdk.ts @@ -664,9 +664,7 @@ export class AwsInstrumentation extends InstrumentationBase { self.servicesExtensions.requestPostSpanHook(normalizedRequest); - return self._callOriginalFunction(() => - original.call(this, arguments) - ); + return self._callOriginalFunction(() => original.apply(this, args)); } ); diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index 9463d2e738..ac0054abe8 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -3,19 +3,22 @@ "version": "0.45.0", "description": "OpenTelemetry instrumentation for `bunyan` logger", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "clean": "rimraf build/*", - "compile": "tsc -p .", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "prewatch": "npm run precompile", + "lint:readme": "node ../../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha 'test/**/*.test.ts'", "test-all-versions": "tav", - "version:update": "node ../../../scripts/version-update.js" + "version:update": "node ../../../scripts/version-update.js", + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "bunyan", @@ -32,6 +35,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-bunyan/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-bunyan/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index 57e8438169..25484b8192 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -3,19 +3,21 @@ "version": "0.45.0", "description": "OpenTelemetry instrumentation for `cassandra-driver` database client library for Apache Cassandra", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "test": "nyc mocha 'test/**/*.test.ts'", - "tdd": "npm run test -- --watch-extensions ts --watch", - "clean": "rimraf build/*", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", - "prewatch": "npm run precompile", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "nyc mocha 'test/**/*.test.ts'", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p ." + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "cassandra-driver", @@ -32,6 +34,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-cassandra/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-cassandra/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json index 22c3502fe2..e170f84839 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/package.json +++ b/plugins/node/opentelemetry-instrumentation-connect/package.json @@ -3,19 +3,21 @@ "version": "0.43.0", "description": "OpenTelemetry instrumentation for `connect` http middleware framework", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "clean": "rimraf build/*", - "compile": "tsc -p .", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", - "prewatch": "npm run precompile", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha 'test/**/*.test.ts'", "version:update": "node ../../../scripts/version-update.js", - "watch": "tsc -w" + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "connect", @@ -31,6 +33,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-connect/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-connect/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-connect/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index cd2ae386d7..289babbb54 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -3,19 +3,21 @@ "version": "0.43.0", "description": "OpenTelemetry instrumentation for `node:dns` name resolution module", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "test": "nyc mocha 'test/**/*.test.ts'", - "tdd": "npm run test -- --watch-extensions ts --watch", - "clean": "rimraf build/*", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "prewatch": "npm run precompile", + "lint:readme": "node ../../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "nyc mocha 'test/**/*.test.ts'", "version:update": "node ../../../scripts/version-update.js", - "lint:readme": "node ../../../scripts/lint-readme", - "compile": "tsc -p ." + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "dns", @@ -31,6 +33,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-dns/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-dns/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-dns/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index 7d9693ebe3..b7c2833aac 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -3,21 +3,22 @@ "version": "0.47.0", "description": "OpenTelemetry instrumentation for `express` http web application framework", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "test-all-versions": "tav", - "test": "nyc mocha 'test/**/*.test.ts'", - "tdd": "yarn test -- --watch-extensions ts --watch", - "clean": "rimraf build/*", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", + "prepublishOnly": "npm run compile", "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "nyc mocha 'test/**/*.test.ts'", + "test-all-versions": "tav", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p .", - "prepublishOnly": "npm run compile", - "watch": "tsc -w" + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "express", @@ -33,6 +34,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-express/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-express/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-express/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-fastify/package.json b/plugins/node/opentelemetry-instrumentation-fastify/package.json index dade9ea581..a4bf47dd0c 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/package.json +++ b/plugins/node/opentelemetry-instrumentation-fastify/package.json @@ -3,20 +3,21 @@ "version": "0.44.0", "description": "OpenTelemetry instrumentation for `fastify` http web application framework", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "clean": "rimraf build/*", - "compile": "tsc -p .", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha 'test/**/*.test.ts'", - "test-all-versions": "tav", "version:update": "node ../../../scripts/version-update.js", - "prewatch": "npm run precompile", - "watch": "tsc -w" + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "fastify", @@ -32,6 +33,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-fastify/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-fastify/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-fastify/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json index d892ba6253..2bc04b1aef 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -3,20 +3,21 @@ "version": "0.43.0", "description": "OpenTelemetry instrumentation for `generic-pool` resource pool for managing expensive resources", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "test": "nyc mocha 'test/**/*.ts'", - "tdd": "yarn test -- --watch-extensions ts --watch", - "clean": "rimraf build/*", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", + "prepublishOnly": "npm run compile", "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "nyc mocha 'test/**/*.test.ts'", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p .", - "prepublishOnly": "npm run compile", - "watch": "tsc -w" + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "generic-pool", @@ -31,6 +32,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-generic-pool/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index 12e5ac1b34..2aad330fc0 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -3,21 +3,22 @@ "version": "0.47.0", "description": "OpenTelemetry instrumentation for `graphql` gql query language and runtime for GraphQL", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "clean": "rimraf build/*", - "compile": "tsc -p .", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", - "prewatch": "npm run precompile", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha 'test/**/*.test.ts'", "test-all-versions": "tav", - "tdd": "npm run test -- --watch-extensions ts --watch", "version:update": "node ../../../scripts/version-update.js", - "watch": "tsc -w" + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "graphql", @@ -33,6 +34,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-graphql/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-graphql/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-graphql/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index c94fa1305e..8a3dab49b6 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -3,20 +3,22 @@ "version": "0.45.1", "description": "OpenTelemetry instrumentation for `@hapi/hapi` http web application framework", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "test": "nyc mocha 'test/**/*.test.ts'", - "test-all-versions": "tav", - "tdd": "yarn test -- --watch-extensions ts --watch", - "clean": "rimraf build/*", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", + "prepublishOnly": "npm run compile", "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "nyc mocha 'test/**/*.test.ts'", + "test-all-versions": "tav", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p .", - "prepublishOnly": "npm run compile" + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "hapi", @@ -32,6 +34,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-hapi/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-hapi/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-hapi/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index 8eb2ea2634..94f70eca6a 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -3,23 +3,25 @@ "version": "0.47.0", "description": "OpenTelemetry instrumentation for `ioredis` database redis client for Redis", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", + "lint": "eslint . --ext .ts", + "lint:fix": "eslint . --ext .ts --fix", + "lint:readme": "node ../../../scripts/lint-readme.js", + "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", "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/*", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", - "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p .", - "prepublishOnly": "npm run compile" + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "instrumentation", @@ -36,6 +38,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-ioredis/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-ioredis/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-knex/package.json b/plugins/node/opentelemetry-instrumentation-knex/package.json index f0dc382ede..89fe190f95 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/plugins/node/opentelemetry-instrumentation-knex/package.json @@ -3,20 +3,21 @@ "version": "0.44.0", "description": "OpenTelemetry instrumentation for `knex` database SQL query builder", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "test": "nyc mocha 'test/**/*.ts'", - "tdd": "yarn test -- --watch-extensions ts --watch", - "clean": "rimraf build/*", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", + "lint:readme": "node ../../../scripts/lint-readme.js", + "prepublishOnly": "npm run compile", "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "nyc mocha 'test/**/*.test.ts'", "version:update": "node ../../../scripts/version-update.js", - "lint:readme": "node ../../../scripts/lint-readme", - "compile": "tsc -p .", - "prepublishOnly": "npm run compile", - "watch": "tsc -w" + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "instrumentation", @@ -31,6 +32,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-knex/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-knex/tsconfig.esm.json new file mode 100644 index 0000000000..11a1dd35c3 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-knex/tsconfig.esm.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo", + "downlevelIteration": true + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index 19e90aa688..a0b849014c 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -3,21 +3,22 @@ "version": "0.47.0", "description": "OpenTelemetry instrumentation for `koa` http web application framework", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "test": "nyc mocha 'test/**/*.ts'", - "test-all-versions": "tav", - "tdd": "yarn test -- --watch-extensions ts --watch", - "clean": "rimraf build/*", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", + "prepublishOnly": "npm run compile", "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "nyc mocha 'test/**/*.test.ts'", + "test-all-versions": "tav", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p .", - "prepublishOnly": "npm run compile", - "watch": "tsc -w" + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "instrumentation", @@ -34,6 +35,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-koa/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-koa/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-koa/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-memcached/package.json b/plugins/node/opentelemetry-instrumentation-memcached/package.json index 882a4167cc..9b99c87969 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/plugins/node/opentelemetry-instrumentation-memcached/package.json @@ -3,20 +3,23 @@ "version": "0.43.0", "description": "OpenTelemetry instrumentation for `memcached` database client for memcached", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "clean": "rimraf build/*", - "compile": "tsc -p .", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "prewatch": "npm run precompile", + "lint:readme": "node ../../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha 'test/**/*.test.ts'", "test:debug": "cross-env RUN_MEMCACHED_TESTS_LOCAL=true mocha --inspect-brk --no-timeouts 'test/**/*.test.ts'", "test:local": "cross-env RUN_MEMCACHED_TESTS_LOCAL=true npm run test", - "version:update": "node ../../../scripts/version-update.js" + "version:update": "node ../../../scripts/version-update.js", + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "instrumentation", @@ -32,6 +35,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-memcached/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-memcached/tsconfig.esm.json new file mode 100644 index 0000000000..11a1dd35c3 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-memcached/tsconfig.esm.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo", + "downlevelIteration": true + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index 0b1eee1b62..37bcc8f12a 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -3,25 +3,26 @@ "version": "0.51.0", "description": "OpenTelemetry instrumentation for `mongodb` database client for MongoDB", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", + "lint": "eslint . --ext .ts", + "lint:fix": "eslint . --ext .ts --fix", + "lint:readme": "node ../../../scripts/lint-readme.js", + "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", "docker:start": "docker run -e MONGODB_DB=opentelemetry-tests -e MONGODB_PORT=27017 -e MONGODB_HOST=127.0.0.1 -p 27017:27017 --rm mongo", "test": "npm run test-v5-v6", "test-v3": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/**/mongodb-v3.test.ts'", "test-v4": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/mongodb-v4-v5-v6.metrics.test.ts' 'test/**/mongodb-v4.test.ts'", "test-v5-v6": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/mongodb-v4-v5-v6.metrics.test.ts' 'test/**/mongodb-v5-v6.test.ts'", "test-all-versions": "tav", - "tdd": "npm run test -- --watch-extensions ts --watch", - "clean": "rimraf build/*", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", - "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p .", - "prepublishOnly": "npm run compile", - "watch": "tsc -w" + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "mongodb", @@ -37,6 +38,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-mongodb/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-mongodb/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index 134fce1f2b..cf7537636b 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -3,18 +3,21 @@ "version": "0.45.0", "description": "OpenTelemetry instrumentation for `mysql` database client for MySQL", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "clean": "rimraf build/*", - "compile": "tsc -p .", - "lint:fix": "eslint . --ext .ts --fix", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json ", "lint": "eslint . --ext .ts", - "prewatch": "npm run precompile", + "lint:fix": "eslint . --ext .ts --fix", + "lint:readme": "node ../../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha 'test/**/*.test.ts'", - "version:update": "node ../../../scripts/version-update.js" + "version:update": "node ../../../scripts/version-update.js", + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "instrumentation", @@ -30,6 +33,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-mysql/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-mysql/src/instrumentation.ts index 7bf5863fe5..6f00f40e57 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-mysql/src/instrumentation.ts @@ -340,10 +340,11 @@ export class MySQLInstrumentation extends InstrumentationBase { - return originalQuery.apply(connection, arguments); + return originalQuery.apply(connection, _args); } ); context.bind(parentContext, streamableQuery); @@ -364,9 +365,9 @@ export class MySQLInstrumentation extends InstrumentationBase { - return originalQuery.apply(connection, arguments); + return originalQuery.apply(connection, _args); }); } }; @@ -387,9 +388,8 @@ export class MySQLInstrumentation extends InstrumentationBase - originalCallback(...arguments) - ); + const _args = arguments; + return context.with(parentContext, () => originalCallback(..._args)); }; }; } diff --git a/plugins/node/opentelemetry-instrumentation-mysql/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-mysql/tsconfig.esm.json new file mode 100644 index 0000000000..11a1dd35c3 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-mysql/tsconfig.esm.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo", + "downlevelIteration": true + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index 558c58d73a..cc37ff3c93 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -3,19 +3,22 @@ "version": "0.45.0", "description": "OpenTelemetry instrumentation for `mysql2` database client for MySQL", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "clean": "rimraf build/*", - "compile": "tsc -p .", - "lint:fix": "eslint . --ext .ts --fix", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", - "prewatch": "npm run precompile", + "lint:fix": "eslint . --ext .ts --fix", + "lint:readme": "node ../../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha 'test/**/*.test.ts'", "test-all-versions": "tav", - "version:update": "node ../../../scripts/version-update.js" + "version:update": "node ../../../scripts/version-update.js", + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "instrumentation", @@ -32,6 +35,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-mysql2/tsconfig.esm.json new file mode 100644 index 0000000000..11a1dd35c3 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-mysql2/tsconfig.esm.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo", + "downlevelIteration": true + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json index 42030e2b6a..9179735b16 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json @@ -3,20 +3,22 @@ "version": "0.44.0", "description": "OpenTelemetry instrumentation for NestJS server side applications framework", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "clean": "rimraf build/*", - "compile": "tsc -p .", - "compile:watch": "tsc -w", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "prewatch": "npm run precompile", + "lint:readme": "node ../../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", - "test": "nyc mocha --timeout 5000 'test/**/*.test.ts'", + "test": "nyc mocha 'test/**/*.test.ts'", "test-all-versions": "tav", - "version:update": "node ../../../scripts/version-update.js" + "version:update": "node ../../../scripts/version-update.js", + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "instrumentation", @@ -33,6 +35,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-nestjs-core/src/instrumentation.ts index edc7bc5d2f..2f4a8fdc1b 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/src/instrumentation.ts @@ -130,10 +130,10 @@ function createWrapNestFactoryCreate( }, }); const spanContext = api.trace.setSpan(api.context.active(), span); - + const _args = arguments; return api.context.with(spanContext, async () => { try { - return await original.apply(this, arguments as any); + return await original.apply(this, _args as any); } catch (e: any) { throw addError(span, e); } finally { @@ -184,10 +184,10 @@ function createWrapCreateHandler(tracer: api.Tracer, moduleVersion?: string) { }, }); const spanContext = api.trace.setSpan(api.context.active(), span); - + const _args = arguments; return api.context.with(spanContext, async () => { try { - return await handler.apply(this, arguments as any); + return await handler.apply(this, _args as any); } catch (e: any) { throw addError(span, e); } finally { @@ -216,10 +216,10 @@ function createWrapHandler( const wrappedHandler = function (this: RouterExecutionContext) { const span = tracer.startSpan(spanName, options); const spanContext = api.trace.setSpan(api.context.active(), span); - + const _args = arguments; return api.context.with(spanContext, async () => { try { - return await handler.apply(this, arguments); + return await handler.apply(this, _args as any); } catch (e: any) { throw addError(span, e); } finally { diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-nestjs-core/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index b8bb857ddf..a9da13737c 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -3,19 +3,21 @@ "version": "0.43.0", "description": "OpenTelemetry instrumentation for `node:net` network API module", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "test": "nyc mocha 'test/**/*.test.ts'", - "tdd": "npm run test -- --watch-extensions ts --watch", - "clean": "rimraf build/*", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", - "prewatch": "npm run precompile", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "nyc mocha 'test/**/*.test.ts'", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p ." + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "connect", @@ -32,6 +34,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-net/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-net/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-net/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index bc2ec76777..5676add03c 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -3,16 +3,17 @@ "version": "0.50.0", "description": "OpenTelemetry instrumentation for `pg` and `pg-pool` database client for PostgreSQL", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "clean": "rimraf build/*", - "compile": "tsc -p .", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", - "prewatch": "npm run precompile", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha 'test/**/*.test.ts'", "test-all-versions": "tav", @@ -20,7 +21,7 @@ "test:debug": "mocha --inspect-brk --no-timeouts 'test/**/*.test.ts'", "test:local": "cross-env RUN_POSTGRES_TESTS_LOCAL=true npm run test", "version:update": "node ../../../scripts/version-update.js", - "watch": "tsc -w" + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "instrumentation", @@ -39,6 +40,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-pg/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-pg/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-pg/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index a9cff79b0d..bae591c761 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -3,20 +3,22 @@ "version": "0.46.0", "description": "OpenTelemetry instrumentation for `pino` logger", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "test": "nyc mocha 'test/**/*.test.ts'", - "test-all-versions": "tav", - "tdd": "npm run test -- --watch-extensions ts --watch", - "clean": "rimraf build/*", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", - "prewatch": "npm run precompile", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "nyc mocha 'test/**/*.test.ts'", + "test-all-versions": "tav", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p ." + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "instrumentation", @@ -33,6 +35,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-pino/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-pino/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-pino/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/package.json b/plugins/node/opentelemetry-instrumentation-redis-4/package.json index 134e530262..804229f8ab 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis-4/package.json @@ -3,9 +3,18 @@ "version": "0.46.0", "description": "OpenTelemetry instrumentation for `redis` v4 database client for Redis", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", + "lint": "eslint . --ext .ts", + "lint:fix": "eslint . --ext .ts --fix", + "lint:readme": "node ../../../scripts/lint-readme.js", + "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/redis.test.ts'", "test:debug": "cross-env RUN_REDIS_TESTS_LOCAL=true mocha --inspect-brk --no-timeouts test/redis.test.ts", "test:local": "cross-env RUN_REDIS_TESTS_LOCAL=true npm run test", @@ -13,15 +22,8 @@ "test:docker:stop": "docker stop otel-redis", "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/*", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", - "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p .", - "prepublishOnly": "npm run compile" + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "instrumentation", @@ -37,6 +39,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-redis-4/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-redis-4/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index 7cc7b5c99b..e79f58ee29 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -3,9 +3,18 @@ "version": "0.46.0", "description": "OpenTelemetry instrumentation for `redis` v2 and v3 database client for Redis", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", + "lint": "eslint . --ext .ts", + "lint:fix": "eslint . --ext .ts --fix", + "lint:readme": "node ../../../scripts/lint-readme.js", + "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", "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", @@ -13,15 +22,8 @@ "test:docker:stop": "docker stop otel-redis", "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/*", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", - "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p .", - "prepublishOnly": "npm run compile" + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "instrumentation", @@ -37,6 +39,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-redis/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-redis/tsconfig.esm.json new file mode 100644 index 0000000000..11a1dd35c3 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-redis/tsconfig.esm.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo", + "downlevelIteration": true + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index 85512a1c13..5de9af3162 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -3,21 +3,22 @@ "version": "0.45.0", "description": "OpenTelemetry instrumentation for `restify` http web application framework", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "clean": "rimraf build/*", - "compile": "tsc -p .", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", "prewatch": "npm run precompile", - "tdd": "yarn test -- --watch-extensions ts --watch", - "test": "nyc mocha 'test/**/*.ts'", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "nyc mocha 'test/**/*.test.ts'", "test-all-versions": "tav", "version:update": "node ../../../scripts/version-update.js", - "watch": "tsc -w" + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "instrumentation", @@ -32,6 +33,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-restify/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-restify/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-restify/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/plugins/node/opentelemetry-instrumentation-router/package.json index 6dca8acc2e..966dbfdeaf 100644 --- a/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/plugins/node/opentelemetry-instrumentation-router/package.json @@ -3,20 +3,21 @@ "version": "0.44.0", "description": "OpenTelemetry instrumentation for `router` http middleware router", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "test": "nyc mocha 'test/**/*.ts'", - "tdd": "yarn test -- --watch-extensions ts --watch", - "clean": "rimraf build/*", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", + "prepublishOnly": "npm run compile", "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "nyc mocha 'test/**/*.test.ts'", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p .", - "prepublishOnly": "npm run compile", - "watch": "tsc -w" + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "instrumentation", @@ -31,6 +32,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-router/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-router/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-router/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index 3872158456..a8e4ecb33c 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -3,20 +3,22 @@ "version": "0.44.0", "description": "OpenTelemetry instrumentation for `winston` logger", "main": "build/src/index.js", + "module": "build/esm/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "test": "nyc mocha 'test/**/*.test.ts'", - "test-all-versions": "tav", - "tdd": "npm run test -- --watch-extensions ts --watch", - "clean": "rimraf build/*", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "lint:readme": "node ../../../scripts/lint-readme.js", - "prewatch": "npm run precompile", "prepublishOnly": "npm run compile", + "prewatch": "npm run precompile", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "nyc mocha 'test/**/*.test.ts'", + "test-all-versions": "tav", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p ." + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "instrumentation", @@ -33,6 +35,9 @@ "node": ">=14" }, "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts" diff --git a/plugins/node/opentelemetry-instrumentation-winston/tsconfig.esm.json b/plugins/node/opentelemetry-instrumentation-winston/tsconfig.esm.json new file mode 100644 index 0000000000..379f547a46 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-winston/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +}