diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0017c10fed..1d09150117 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -109,7 +109,7 @@ Production dependencies that are required by a package always need to be added t The following sections describe how to manage dependencies in practice. -### Adding A Package Dependency +### Adding A Package Dependency npm install import-in-the-middle -w packages/core `npm install -D ${dependency-name}`: Adds a dev dependency to the root `package.json` file. `npm install ${dependency-name} -w packages/collector`: Adds a production dependency to the package `@instana/collector`. This is equivalent to `cd packages/collector; npm install ${dependency-name}`. diff --git a/package-lock.json b/package-lock.json index 129616461f..1ac25281c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -97,7 +97,6 @@ "graphql-tag": "2.12.6", "graphql-ws": "^5.16.0", "husky": "^7.0.4", - "import-in-the-middle": "^1.7.4", "ioredis": "^5.4.1", "js-yaml": "^4.1.0", "kafka-node": "^5.0.0", @@ -24625,7 +24624,6 @@ "version": "1.9.5", "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", - "dev": true, "peerDependencies": { "acorn": "^8" } @@ -33383,7 +33381,6 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.7.4.tgz", "integrity": "sha512-Lk+qzWmiQuRPPulGQeK5qq0v32k2bHnWrRPFgqyvhw7Kkov5L6MOLOIU3pcWeujc9W4q54Cp3Q2WV16eQkc7Bg==", - "dev": true, "dependencies": { "acorn": "^8.8.2", "acorn-import-attributes": "^1.9.5", @@ -47763,6 +47760,7 @@ "@instana/core": "3.8.1", "@instana/shared-metrics": "3.8.1", "bunyan": "^1.8.15", + "import-in-the-middle": "^1.7.4", "semver": "^7.5.4", "serialize-error": "^8.1.0" }, @@ -48171,6 +48169,7 @@ "@opentelemetry/instrumentation-tedious": "0.10.1", "@opentelemetry/sdk-trace-base": "1.24.0", "cls-bluebird": "^2.1.0", + "import-in-the-middle": "^1.7.4", "lru-cache": "^10.1.0", "methods": "^1.1.2", "opentracing": "^0.14.5", diff --git a/package.json b/package.json index 5ba6cff4c7..51e2245eed 100644 --- a/package.json +++ b/package.json @@ -155,7 +155,6 @@ "graphql-tag": "2.12.6", "graphql-ws": "^5.16.0", "husky": "^7.0.4", - "import-in-the-middle": "^1.7.4", "ioredis": "^5.4.1", "js-yaml": "^4.1.0", "kafka-node": "^5.0.0", diff --git a/packages/collector/package.json b/packages/collector/package.json index 05ad6114c0..29f207fee2 100644 --- a/packages/collector/package.json +++ b/packages/collector/package.json @@ -81,6 +81,7 @@ "@instana/core": "3.8.1", "@instana/shared-metrics": "3.8.1", "bunyan": "^1.8.15", + "import-in-the-middle": "^1.7.4", "semver": "^7.5.4", "serialize-error": "^8.1.0" }, diff --git a/packages/collector/src/agentConnection.js b/packages/collector/src/agentConnection.js index adf13d0093..992f4fbe89 100644 --- a/packages/collector/src/agentConnection.js +++ b/packages/collector/src/agentConnection.js @@ -263,6 +263,8 @@ exports.sendMetrics = function sendMetrics(data, cb) { * @param {(...args: *) => *} cb */ exports.sendSpans = function sendSpans(spans, cb) { + /* eslint-disable no-console */ + console.log('here are the spans', spans); const callback = util.atMostOnce('callback for sendSpans', err => { if (err && !maxContentErrorHasBeenLogged && err instanceof PayloadTooLargeError) { logLargeSpans(spans); diff --git a/packages/collector/test/tracing/esm/iitm/test.js b/packages/collector/test/tracing/esm/iitm/test.js index efec6bc7ff..5be3c4bf0c 100644 --- a/packages/collector/test/tracing/esm/iitm/test.js +++ b/packages/collector/test/tracing/esm/iitm/test.js @@ -14,7 +14,7 @@ const constants = require('@instana/core').tracing.constants; const mochaSuiteFn = supportedVersion(process.versions.node) ? describe : describe.skip; -mochaSuiteFn('[ESM] - iitm', function () { +mochaSuiteFn.only('[ESM] - iitm', function () { this.timeout(config.getTestTimeout()); globalAgent.setUpCleanUpHooks(); diff --git a/packages/core/package.json b/packages/core/package.json index 9b9fd61e92..4cc1ec125c 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -64,6 +64,7 @@ "@opentelemetry/instrumentation-tedious": "0.10.1", "@opentelemetry/sdk-trace-base": "1.24.0", "cls-bluebird": "^2.1.0", + "import-in-the-middle": "^1.7.4", "lru-cache": "^10.1.0", "methods": "^1.1.2", "opentracing": "^0.14.5", diff --git a/packages/core/src/util/iitmHook.js b/packages/core/src/util/iitmHook.js index 61ef0784c5..e2ab18a864 100644 --- a/packages/core/src/util/iitmHook.js +++ b/packages/core/src/util/iitmHook.js @@ -5,10 +5,10 @@ 'use strict'; // eslint-disable-next-line instana/no-unsafe-require, import/no-extraneous-dependencies -const path = require('path'); -const rootDir = path.resolve(__dirname, '../../../../'); -const iitmHookPath = require.resolve('import-in-the-middle', { paths: [rootDir] }); -const iitmHook = require(iitmHookPath); +// const path = require('path'); +// const rootDir = path.resolve(__dirname, '../../../../'); +// const iitmHookPath = require.resolve('import-in-the-middle', { paths: [rootDir] }); +const iitmHook = require('import-in-the-middle'); const calculator = require('../tracing/instrumentation/test/calculator'); /* eslint-disable no-console */ function init() {