From 9b3dec7732f41b294676c50b054b765cad9b11be Mon Sep 17 00:00:00 2001 From: Arya Date: Wed, 17 Sep 2025 22:57:27 +0530 Subject: [PATCH] test: replaced node-fetch with native fetch in test setup --- package-lock.json | 44 ------------------- package.json | 1 - packages/aws-fargate/test/Control.js | 1 - packages/aws-fargate/test/esm/app.mjs | 1 - .../aws-fargate/test/integration_test/app.js | 1 - packages/aws-lambda/test/lambdas/async.js | 2 - packages/aws-lambda/test/lambdas/promise.js | 2 - .../test/specification_compliance/lambda.js | 2 - .../azure-container-services/test/Control.js | 2 +- .../azure-container-services/test/esm/app.mjs | 1 - .../collector/test/apps/agentStubControls.js | 2 +- .../collector/test/apps/expressControls.js | 1 - packages/collector/test/immediate/test.js | 1 - .../test/test_util/ProcessControls.js | 1 - .../cloud/aws-sdk/v2/combined_products.js | 2 +- .../tracing/cloud/aws-sdk/v2/dynamodb/app.js | 2 +- .../tracing/cloud/aws-sdk/v2/dynamodb/app.mjs | 2 +- .../tracing/cloud/aws-sdk/v2/kinesis/app.js | 2 +- .../tracing/cloud/aws-sdk/v2/kinesis/app.mjs | 2 +- .../test/tracing/cloud/aws-sdk/v2/s3/app.js | 2 +- .../test/tracing/cloud/aws-sdk/v2/s3/app.mjs | 2 +- .../test/tracing/cloud/aws-sdk/v2/sns/app.js | 2 +- .../cloud/aws-sdk/v2/sqs/receiveMessage.js | 2 +- .../cloud/aws-sdk/v2/sqs/sqs-consumer.js | 2 +- .../tracing/cloud/aws-sdk/v3/dynamodb/app.js | 2 +- .../tracing/cloud/aws-sdk/v3/kinesis/app.js | 2 +- .../test/tracing/cloud/aws-sdk/v3/s3/app.js | 2 +- .../test/tracing/cloud/aws-sdk/v3/sns/app.js | 2 +- .../tracing/cloud/aws-sdk/v3/sqs/receiver.js | 2 +- .../tracing/cloud/aws-sdk/v3/sqs/sender.js | 2 +- .../cloud/aws-sdk/v3/sqs/sqs-consumer.js | 2 +- .../test/tracing/cloud/azure/blob/app.js | 2 +- .../test/tracing/cloud/azure/blob/app.mjs | 2 +- .../tracing/cloud/gcp/pubsub/publisher.js | 1 - .../tracing/cloud/gcp/pubsub/subscriber.js | 1 - .../tracing/control_flow/async_await/app.js | 2 - .../control_flow/async_await/controls.js | 2 +- .../test/tracing/control_flow/bluebird/app.js | 1 - .../control_flow/native_promise/app.js | 2 +- .../test/tracing/databases/couchbase/test.js | 2 +- .../tracing/databases/elasticsearch/app.js | 2 +- .../test/tracing/databases/ioredis/app.js | 2 +- .../test/tracing/databases/ioredis/app.mjs | 2 +- .../test/tracing/databases/memcached/app.js | 2 +- .../test/tracing/databases/memcached/app.mjs | 2 +- .../test/tracing/databases/mongodb/app.js | 2 +- .../test/tracing/databases/mongodb/app.mjs | 2 +- .../test/tracing/databases/mysql/app.js | 1 - .../test/tracing/databases/mysql/app.mjs | 1 - .../test/tracing/databases/pg/app.js | 2 +- .../test/tracing/databases/pg/app.mjs | 2 +- .../test/tracing/databases/pg_native/app.js | 2 +- .../test/tracing/databases/pg_native/app.mjs | 2 +- .../test/tracing/databases/redis/app.js | 2 +- .../test/tracing/databases/redis/legacyApp.js | 2 +- .../test/tracing/logging/bunyan/bunyanApp.js | 1 - .../test/tracing/logging/bunyan/bunyanApp.mjs | 1 - .../test/tracing/logging/console/app.js | 1 - .../test/tracing/logging/console/app.mjs | 1 - .../test/tracing/logging/log4js/app.js | 1 - .../test/tracing/logging/log4js/app.mjs | 1 - .../test/tracing/logging/pino/app.js | 1 - .../test/tracing/logging/winston/app.js | 1 - .../test/tracing/logging/winston/app.mjs | 1 - .../messaging/amqp/consumerCallbacks.js | 2 +- .../messaging/amqp/consumerPromises.js | 2 +- .../messaging/amqp/publisherCallbacks.js | 1 - .../messaging/amqp/publisherControls.js | 2 +- .../messaging/amqp/publisherPromises.js | 1 - .../test/tracing/messaging/bull/util.js | 2 +- .../tracing/messaging/kafka-avro/consumer.js | 1 - .../tracing/messaging/kafka-avro/producer.js | 1 - .../tracing/messaging/kafka-node/consumer.js | 2 +- .../tracing/messaging/kafka-node/producer.js | 1 - .../tracing/messaging/kafkajs/consumer.js | 2 +- .../tracing/messaging/kafkajs/producer.js | 1 - .../messaging/nats-streaming/publisher.js | 1 - .../messaging/nats-streaming/subscriber.js | 2 +- .../test/tracing/messaging/nats/publisher.js | 1 - .../test/tracing/messaging/nats/subscriber.js | 2 +- .../messaging/node-rdkafka/consumer.js | 2 +- .../messaging/node-rdkafka/producer.js | 2 +- .../test/tracing/misc/node-fetch/app.js | 2 +- .../test/tracing/misc/node-fetch/app.mjs | 1 - .../misc/span-batching-with-redis/app.js | 2 +- .../misc/specification_compliance/app.js | 2 +- .../tracing/misc/w3c_trace_context/app.js | 2 +- .../test/tracing/open_tracing/controls.js | 2 +- .../test/tracing/opentelemetry/restify-app.js | 2 +- .../protocols/apollo_subgraph/client.js | 1 - .../test/tracing/protocols/graphql/client.js | 2 +- .../http/client/allowRootExitSpanApp.js | 2 +- .../protocols/http/client/clientApp.js | 2 +- .../tracing/protocols/http/client/sdkApp1.js | 8 ++-- .../protocols/http/proxy/expressProxy.js | 2 +- .../http/proxy/expressProxyControls.js | 1 - .../sdk/allowRootExitSpans/app_default.js | 1 - .../sdk/allowRootExitSpans/app_with_entry.js | 1 - packages/collector/test/tracing/sdk/app.js | 2 +- packages/google-cloud-run/test/Control.js | 1 - packages/google-cloud-run/test/esm/app.mjs | 2 +- .../test/integration_test/app.js | 1 - .../opentelemetry-exporter/test/Control.js | 1 - packages/opentelemetry-exporter/test/app.js | 2 +- .../opentelemetry-sampler/test/Control.js | 2 +- packages/opentelemetry-sampler/test/app.js | 2 +- packages/serverless-collector/test/Control.js | 2 +- .../serverless-collector/test/esm/app.mjs | 2 +- .../test/util/AbstractServerlessControl.js | 1 - 109 files changed, 68 insertions(+), 159 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4fdc594c5a..4761dd905f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -141,7 +141,6 @@ "nats": "2.29.3", "nats-v1": "npm:nats@1.4.12", "node-fetch": "3.3.2", - "node-fetch-v2": "npm:node-fetch@2.7.0", "node-gyp": "11.2.0", "node-nats-streaming": "0.3.2", "oracledb": "6.9.0", @@ -39025,49 +39024,6 @@ "license": "MIT", "optional": true }, - "node_modules/node-fetch-v2": { - "name": "node-fetch", - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "dev": true, - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "node_modules/node-fetch-v2/node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "dev": true - }, - "node_modules/node-fetch-v2/node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "dev": true - }, - "node_modules/node-fetch-v2/node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dev": true, - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "node_modules/node-gyp": { "version": "11.2.0", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-11.2.0.tgz", diff --git a/package.json b/package.json index a737f02bf5..443b738b7e 100644 --- a/package.json +++ b/package.json @@ -208,7 +208,6 @@ "nats": "2.29.3", "nats-v1": "npm:nats@1.4.12", "node-fetch": "3.3.2", - "node-fetch-v2": "npm:node-fetch@2.7.0", "node-gyp": "11.2.0", "node-nats-streaming": "0.3.2", "oracledb": "6.9.0", diff --git a/packages/aws-fargate/test/Control.js b/packages/aws-fargate/test/Control.js index de10e80e60..ca13779cb1 100644 --- a/packages/aws-fargate/test/Control.js +++ b/packages/aws-fargate/test/Control.js @@ -7,7 +7,6 @@ const { fork } = require('child_process'); const path = require('path'); -const fetch = require('node-fetch-v2'); const config = require('@instana/core/test/config'); const AbstractServerlessControl = require('../../serverless/test/util/AbstractServerlessControl'); diff --git a/packages/aws-fargate/test/esm/app.mjs b/packages/aws-fargate/test/esm/app.mjs index 4d87322363..6ed7f3bfe4 100644 --- a/packages/aws-fargate/test/esm/app.mjs +++ b/packages/aws-fargate/test/esm/app.mjs @@ -3,7 +3,6 @@ */ import http from 'http'; -import fetch from 'node-fetch'; const downstreamDummyUrl = process.env.DOWNSTREAM_DUMMY_URL; const port = process.env.TASK_HTTP_PORT; diff --git a/packages/aws-fargate/test/integration_test/app.js b/packages/aws-fargate/test/integration_test/app.js index 10e1ed1be2..d0db51254a 100644 --- a/packages/aws-fargate/test/integration_test/app.js +++ b/packages/aws-fargate/test/integration_test/app.js @@ -12,7 +12,6 @@ process.on('SIGTERM', () => { }); const http = require('http'); -const fetch = require('node-fetch-v2'); const { sendToParent } = require('../../../core/test/test_util'); diff --git a/packages/aws-lambda/test/lambdas/async.js b/packages/aws-lambda/test/lambdas/async.js index 86dc4c359b..4b1ce910dd 100644 --- a/packages/aws-lambda/test/lambdas/async.js +++ b/packages/aws-lambda/test/lambdas/async.js @@ -17,8 +17,6 @@ const delay = require('../../../core/test/test_util/delay'); // assumed root dir of the Lambda. require('../../src/metrics/rootDir').root = require('path').resolve(__dirname, '..', '..'); -const fetch = require('node-fetch-v2'); - const downstreamDummyUrl = process.env.DOWNSTREAM_DUMMY_URL; const response = {}; diff --git a/packages/aws-lambda/test/lambdas/promise.js b/packages/aws-lambda/test/lambdas/promise.js index d567b4ef4c..d38b16d792 100644 --- a/packages/aws-lambda/test/lambdas/promise.js +++ b/packages/aws-lambda/test/lambdas/promise.js @@ -17,8 +17,6 @@ const delay = require('../../../core/test/test_util/delay'); // assumed root dir of the Lambda. require('../../src/metrics/rootDir').root = require('path').resolve(__dirname, '..', '..'); -const fetch = require('node-fetch-v2'); - const downstreamDummyUrl = process.env.DOWNSTREAM_DUMMY_URL; const response = {}; diff --git a/packages/aws-lambda/test/specification_compliance/lambda.js b/packages/aws-lambda/test/specification_compliance/lambda.js index 14a46f31b1..a453127d65 100644 --- a/packages/aws-lambda/test/specification_compliance/lambda.js +++ b/packages/aws-lambda/test/specification_compliance/lambda.js @@ -15,8 +15,6 @@ const instana = require('../..'); // assumed root dir of the Lambda. require('../../src/metrics/rootDir').root = require('path').resolve(__dirname, '..', '..'); -const fetch = require('node-fetch-v2'); - const downstreamDummyUrl = process.env.DOWNSTREAM_DUMMY_URL; exports.handler = instana.wrap(async event => { diff --git a/packages/azure-container-services/test/Control.js b/packages/azure-container-services/test/Control.js index f62c82d7b7..e9ed6fe0f8 100644 --- a/packages/azure-container-services/test/Control.js +++ b/packages/azure-container-services/test/Control.js @@ -6,7 +6,7 @@ const { fork } = require('child_process'); const path = require('path'); -const fetch = require('node-fetch-v2'); + const portfinder = require('@instana/collector/test/test_util/portfinder'); const config = require('@instana/core/test/config'); const AbstractServerlessControl = require('../../serverless/test/util/AbstractServerlessControl'); diff --git a/packages/azure-container-services/test/esm/app.mjs b/packages/azure-container-services/test/esm/app.mjs index af55aca794..abed24e1ec 100644 --- a/packages/azure-container-services/test/esm/app.mjs +++ b/packages/azure-container-services/test/esm/app.mjs @@ -3,7 +3,6 @@ */ import http from 'http'; -import fetch from 'node-fetch'; import getAppPort from '@instana/collector/test/test_util/app-port.js'; const downstreamDummyUrl = process.env.DOWNSTREAM_DUMMY_URL; diff --git a/packages/collector/test/apps/agentStubControls.js b/packages/collector/test/apps/agentStubControls.js index a69b4d5ac0..960ff22496 100644 --- a/packages/collector/test/apps/agentStubControls.js +++ b/packages/collector/test/apps/agentStubControls.js @@ -6,7 +6,7 @@ 'use strict'; const spawn = require('child_process').spawn; -const fetch = require('node-fetch-v2'); + const portFinder = require('../test_util/portfinder'); const path = require('path'); const _ = require('lodash'); diff --git a/packages/collector/test/apps/expressControls.js b/packages/collector/test/apps/expressControls.js index 5421a0523c..6b9d38b185 100644 --- a/packages/collector/test/apps/expressControls.js +++ b/packages/collector/test/apps/expressControls.js @@ -5,7 +5,6 @@ 'use strict'; -const fetch = require('node-fetch-v2'); const fs = require('fs'); const path = require('path'); const spawn = require('child_process').spawn; diff --git a/packages/collector/test/immediate/test.js b/packages/collector/test/immediate/test.js index 479f8a45b8..071450b56a 100644 --- a/packages/collector/test/immediate/test.js +++ b/packages/collector/test/immediate/test.js @@ -9,7 +9,6 @@ const { expect } = require('chai'); const { spawn } = require('child_process'); const _ = require('lodash'); const portfinder = require('../test_util/portfinder'); -const fetch = require('node-fetch-v2'); const config = require('../../../core/test/config'); const { delay, retry } = require('../../../core/test/test_util'); diff --git a/packages/collector/test/test_util/ProcessControls.js b/packages/collector/test/test_util/ProcessControls.js index 7e3cb54cae..9d86f4e496 100644 --- a/packages/collector/test/test_util/ProcessControls.js +++ b/packages/collector/test/test_util/ProcessControls.js @@ -11,7 +11,6 @@ const _ = require('lodash'); const fork = require('child_process').fork; const fs = require('fs'); const path = require('path'); -const fetch = require('node-fetch-v2'); const config = require('../../../core/test/config'); const http2Promise = require('./http2Promise'); diff --git a/packages/collector/test/tracing/cloud/aws-sdk/v2/combined_products.js b/packages/collector/test/tracing/cloud/aws-sdk/v2/combined_products.js index ae881850e8..697690b12e 100644 --- a/packages/collector/test/tracing/cloud/aws-sdk/v2/combined_products.js +++ b/packages/collector/test/tracing/cloud/aws-sdk/v2/combined_products.js @@ -7,7 +7,7 @@ require('../../../../../src')(); const agentPort = process.env.INSTANA_AGENT_PORT; -const fetch = require('node-fetch-v2'); + const delay = require('@instana/core/test/test_util/delay'); const AWS = require('aws-sdk'); diff --git a/packages/collector/test/tracing/cloud/aws-sdk/v2/dynamodb/app.js b/packages/collector/test/tracing/cloud/aws-sdk/v2/dynamodb/app.js index c4d048f576..3dfd183344 100644 --- a/packages/collector/test/tracing/cloud/aws-sdk/v2/dynamodb/app.js +++ b/packages/collector/test/tracing/cloud/aws-sdk/v2/dynamodb/app.js @@ -13,7 +13,7 @@ process.on('SIGTERM', () => { require('../../../../../..')(); const agentPort = process.env.INSTANA_AGENT_PORT; -const fetch = require('node-fetch-v2'); + const delay = require('../../../../../../../core/test/test_util/delay'); const AWS = require('aws-sdk'); diff --git a/packages/collector/test/tracing/cloud/aws-sdk/v2/dynamodb/app.mjs b/packages/collector/test/tracing/cloud/aws-sdk/v2/dynamodb/app.mjs index 53eb1ee3aa..8b4131cc0b 100644 --- a/packages/collector/test/tracing/cloud/aws-sdk/v2/dynamodb/app.mjs +++ b/packages/collector/test/tracing/cloud/aws-sdk/v2/dynamodb/app.mjs @@ -12,7 +12,7 @@ process.on('SIGTERM', () => { }); const agentPort = process.env.INSTANA_AGENT_PORT; -import fetch from 'node-fetch'; + import delay from '../../../../../../../core/test/test_util/delay.js'; import getAppPort from '../../../../../test_util/app-port.js'; import logger from '@instana/core/test/test_util/log.js'; diff --git a/packages/collector/test/tracing/cloud/aws-sdk/v2/kinesis/app.js b/packages/collector/test/tracing/cloud/aws-sdk/v2/kinesis/app.js index f853536649..abb7890662 100644 --- a/packages/collector/test/tracing/cloud/aws-sdk/v2/kinesis/app.js +++ b/packages/collector/test/tracing/cloud/aws-sdk/v2/kinesis/app.js @@ -17,7 +17,7 @@ const app = express(); const port = require('../../../../../test_util/app-port')(); const streamName = process.env.AWS_KINESIS_STREAM_NAME || 'nodejs-team'; const agentPort = process.env.INSTANA_AGENT_PORT; -const fetch = require('node-fetch-v2'); + const AWS = require('aws-sdk'); const logPrefix = `AWS SDK v2 Kinesis (${process.pid}):\t`; const log = require('@instana/core/test/test_util/log').getLogger(logPrefix); diff --git a/packages/collector/test/tracing/cloud/aws-sdk/v2/kinesis/app.mjs b/packages/collector/test/tracing/cloud/aws-sdk/v2/kinesis/app.mjs index 4d4df3ee13..93d5bd5f27 100644 --- a/packages/collector/test/tracing/cloud/aws-sdk/v2/kinesis/app.mjs +++ b/packages/collector/test/tracing/cloud/aws-sdk/v2/kinesis/app.mjs @@ -18,7 +18,7 @@ import getAppPort from '../../../../../test_util/app-port.js'; const port = getAppPort(); const streamName = process.env.AWS_KINESIS_STREAM_NAME || 'nodejs-team'; const agentPort = process.env.INSTANA_AGENT_PORT; -import fetch from 'node-fetch'; + import AWS from 'aws-sdk'; const logPrefix = `AWS SDK v2 Kinesis (${process.pid}):\t`; import log from '@instana/core/test/test_util/log.js'; diff --git a/packages/collector/test/tracing/cloud/aws-sdk/v2/s3/app.js b/packages/collector/test/tracing/cloud/aws-sdk/v2/s3/app.js index a1f4d06ab0..69ad1fe99d 100644 --- a/packages/collector/test/tracing/cloud/aws-sdk/v2/s3/app.js +++ b/packages/collector/test/tracing/cloud/aws-sdk/v2/s3/app.js @@ -13,7 +13,7 @@ process.on('SIGTERM', () => { require('../../../../../..')(); const agentPort = process.env.INSTANA_AGENT_PORT; -const fetch = require('node-fetch-v2'); + const delay = require('../../../../../../../core/test/test_util/delay'); const AWS = require('aws-sdk'); diff --git a/packages/collector/test/tracing/cloud/aws-sdk/v2/s3/app.mjs b/packages/collector/test/tracing/cloud/aws-sdk/v2/s3/app.mjs index e1649b5e7e..d132a32c22 100644 --- a/packages/collector/test/tracing/cloud/aws-sdk/v2/s3/app.mjs +++ b/packages/collector/test/tracing/cloud/aws-sdk/v2/s3/app.mjs @@ -12,7 +12,7 @@ process.on('SIGTERM', () => { }); const agentPort = process.env.INSTANA_AGENT_PORT; -import fetch from 'node-fetch'; + import delay from '../../../../../../../core/test/test_util/delay.js'; import AWS from 'aws-sdk'; import express from 'express'; diff --git a/packages/collector/test/tracing/cloud/aws-sdk/v2/sns/app.js b/packages/collector/test/tracing/cloud/aws-sdk/v2/sns/app.js index 6054572714..ead141c065 100644 --- a/packages/collector/test/tracing/cloud/aws-sdk/v2/sns/app.js +++ b/packages/collector/test/tracing/cloud/aws-sdk/v2/sns/app.js @@ -13,7 +13,7 @@ process.on('SIGTERM', () => { require('../../../../../..')(); const agentPort = process.env.INSTANA_AGENT_PORT; -const fetch = require('node-fetch-v2'); + const delay = require('@instana/core/test/test_util/delay'); const AWS = require('aws-sdk'); diff --git a/packages/collector/test/tracing/cloud/aws-sdk/v2/sqs/receiveMessage.js b/packages/collector/test/tracing/cloud/aws-sdk/v2/sqs/receiveMessage.js index 1c93dcb844..70f9b1f33a 100644 --- a/packages/collector/test/tracing/cloud/aws-sdk/v2/sqs/receiveMessage.js +++ b/packages/collector/test/tracing/cloud/aws-sdk/v2/sqs/receiveMessage.js @@ -24,7 +24,7 @@ const instana = require('../../../../../..')({ }); const express = require('express'); -const fetch = require('node-fetch-v2'); + const { sendToParent } = require('../../../../../../../core/test/test_util'); const delay = require('../../../../../../../core/test/test_util/delay'); const CollectingLogger = require('../../../../../test_util/CollectingLogger'); diff --git a/packages/collector/test/tracing/cloud/aws-sdk/v2/sqs/sqs-consumer.js b/packages/collector/test/tracing/cloud/aws-sdk/v2/sqs/sqs-consumer.js index 776c672d9d..92415e5b76 100644 --- a/packages/collector/test/tracing/cloud/aws-sdk/v2/sqs/sqs-consumer.js +++ b/packages/collector/test/tracing/cloud/aws-sdk/v2/sqs/sqs-consumer.js @@ -21,7 +21,7 @@ const instana = require('../../../../../../src')(); const express = require('express'); const AWS = require('aws-sdk'); const { Consumer } = require('sqs-consumer'); -const fetch = require('node-fetch-v2'); + const { sendToParent } = require('../../../../../../../core/test/test_util'); const delay = require('../../../../../../../core/test/test_util/delay'); diff --git a/packages/collector/test/tracing/cloud/aws-sdk/v3/dynamodb/app.js b/packages/collector/test/tracing/cloud/aws-sdk/v3/dynamodb/app.js index 2ee351725c..d9f7eb7ae3 100644 --- a/packages/collector/test/tracing/cloud/aws-sdk/v3/dynamodb/app.js +++ b/packages/collector/test/tracing/cloud/aws-sdk/v3/dynamodb/app.js @@ -24,7 +24,7 @@ if (process.env.AWS_SDK_CLIENT_DYNAMODB_REQUIRE !== '@aws-sdk/client-dynamodb') require('../../../../../..')(); const express = require('express'); -const fetch = require('node-fetch-v2'); + const awsRegion = 'us-east-2'; let dynamoDB; diff --git a/packages/collector/test/tracing/cloud/aws-sdk/v3/kinesis/app.js b/packages/collector/test/tracing/cloud/aws-sdk/v3/kinesis/app.js index 4a5d87fe92..4b9e4520d2 100644 --- a/packages/collector/test/tracing/cloud/aws-sdk/v3/kinesis/app.js +++ b/packages/collector/test/tracing/cloud/aws-sdk/v3/kinesis/app.js @@ -12,7 +12,7 @@ process.on('SIGTERM', () => { require('../../../../../..')(); const express = require('express'); -const fetch = require('node-fetch-v2'); + const app = express(); const agentPort = process.env.INSTANA_AGENT_PORT; const port = require('../../../../../test_util/app-port')(); diff --git a/packages/collector/test/tracing/cloud/aws-sdk/v3/s3/app.js b/packages/collector/test/tracing/cloud/aws-sdk/v3/s3/app.js index cae7ea49f3..1b94945bb9 100644 --- a/packages/collector/test/tracing/cloud/aws-sdk/v3/s3/app.js +++ b/packages/collector/test/tracing/cloud/aws-sdk/v3/s3/app.js @@ -23,7 +23,7 @@ if (process.env.AWS_SDK_CLIENT_S3_REQUIRE !== '@aws-sdk/client-s3') { require('../../../../../..')(); const express = require('express'); -const fetch = require('node-fetch-v2'); + const awsSdk3 = require('@aws-sdk/client-s3'); const logPrefix = `AWS SDK v3 S3 (${process.pid}):\t`; const log = require('@instana/core/test/test_util/log').getLogger(logPrefix); diff --git a/packages/collector/test/tracing/cloud/aws-sdk/v3/sns/app.js b/packages/collector/test/tracing/cloud/aws-sdk/v3/sns/app.js index e7192a83e1..637b5d2d50 100644 --- a/packages/collector/test/tracing/cloud/aws-sdk/v3/sns/app.js +++ b/packages/collector/test/tracing/cloud/aws-sdk/v3/sns/app.js @@ -12,7 +12,7 @@ process.on('SIGTERM', () => { require('../../../../../..')(); const express = require('express'); -const fetch = require('node-fetch-v2'); + const app = express(); const agentPort = process.env.INSTANA_AGENT_PORT; const port = require('../../../../../test_util/app-port')(); diff --git a/packages/collector/test/tracing/cloud/aws-sdk/v3/sqs/receiver.js b/packages/collector/test/tracing/cloud/aws-sdk/v3/sqs/receiver.js index a913c5d3f3..056d9ac44a 100644 --- a/packages/collector/test/tracing/cloud/aws-sdk/v3/sqs/receiver.js +++ b/packages/collector/test/tracing/cloud/aws-sdk/v3/sqs/receiver.js @@ -23,7 +23,7 @@ if (process.env.AWS_SDK_CLIENT_SQS_REQUIRE && process.env.AWS_SDK_CLIENT_SQS_REQ const instana = require('../../../../../..')(); const express = require('express'); -const fetch = require('node-fetch-v2'); + const awsSdk3 = require('@aws-sdk/client-sqs'); const logPrefix = `AWS SDK v3 SQS Receiver (${process.pid}):\t`; const log = require('@instana/core/test/test_util/log').getLogger(logPrefix); diff --git a/packages/collector/test/tracing/cloud/aws-sdk/v3/sqs/sender.js b/packages/collector/test/tracing/cloud/aws-sdk/v3/sqs/sender.js index 0336fe316b..154f83a0d5 100644 --- a/packages/collector/test/tracing/cloud/aws-sdk/v3/sqs/sender.js +++ b/packages/collector/test/tracing/cloud/aws-sdk/v3/sqs/sender.js @@ -24,7 +24,7 @@ if (process.env.AWS_SDK_CLIENT_SQS_REQUIRE !== '@aws-sdk/client-sqs') { require('../../../../../..')(); const express = require('express'); const delay = require('@instana/core/test/test_util/delay'); -const fetch = require('node-fetch-v2'); + const awsSdk3 = require('@aws-sdk/client-sqs'); const logPrefix = `AWS SDK v3 SQS Sender (${process.pid}):\t`; const log = require('@instana/core/test/test_util/log').getLogger(logPrefix); diff --git a/packages/collector/test/tracing/cloud/aws-sdk/v3/sqs/sqs-consumer.js b/packages/collector/test/tracing/cloud/aws-sdk/v3/sqs/sqs-consumer.js index e17a03a5bd..bbc6df1e3e 100644 --- a/packages/collector/test/tracing/cloud/aws-sdk/v3/sqs/sqs-consumer.js +++ b/packages/collector/test/tracing/cloud/aws-sdk/v3/sqs/sqs-consumer.js @@ -20,7 +20,7 @@ const instana = require('../../../../../../src')(); const express = require('express'); const awsSdk3 = require('@aws-sdk/client-sqs'); const { Consumer } = require('sqs-consumer'); -const fetch = require('node-fetch-v2'); + const { sendToParent } = require('../../../../../../../core/test/test_util'); const delay = require('../../../../../../../core/test/test_util/delay'); diff --git a/packages/collector/test/tracing/cloud/azure/blob/app.js b/packages/collector/test/tracing/cloud/azure/blob/app.js index 7b42a2da70..9e7d356f3e 100644 --- a/packages/collector/test/tracing/cloud/azure/blob/app.js +++ b/packages/collector/test/tracing/cloud/azure/blob/app.js @@ -18,7 +18,7 @@ const agentPort = process.env.INSTANA_AGENT_PORT; const app = express(); const logPrefix = `Express / azure blob App (${process.pid}):\t`; const fs = require('fs'); -const fetch = require('node-fetch-v2'); + const filePath = `${__dirname}/sample.pdf`; const localFilePath = `${__dirname}/out.pdf`; const binaryData = fs.readFileSync(filePath); diff --git a/packages/collector/test/tracing/cloud/azure/blob/app.mjs b/packages/collector/test/tracing/cloud/azure/blob/app.mjs index 016c47df5e..e4d384fa71 100644 --- a/packages/collector/test/tracing/cloud/azure/blob/app.mjs +++ b/packages/collector/test/tracing/cloud/azure/blob/app.mjs @@ -15,7 +15,7 @@ const agentPort = process.env.INSTANA_AGENT_PORT; const app = express(); const logPrefix = `Express / azure blob App (${process.pid}):\t`; import fs from 'fs'; -import fetch from 'node-fetch'; + const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); const filePath = `${__dirname}/sample.pdf`; diff --git a/packages/collector/test/tracing/cloud/gcp/pubsub/publisher.js b/packages/collector/test/tracing/cloud/gcp/pubsub/publisher.js index 577cfd5c82..57df56691a 100644 --- a/packages/collector/test/tracing/cloud/gcp/pubsub/publisher.js +++ b/packages/collector/test/tracing/cloud/gcp/pubsub/publisher.js @@ -18,7 +18,6 @@ require('../../../../..')(); const bodyParser = require('body-parser'); const express = require('express'); const morgan = require('morgan'); -const fetch = require('node-fetch-v2'); const asyncRoute = require('../../../../test_util/asyncExpressRoute'); const { createTopic } = require('./pubsubUtil'); diff --git a/packages/collector/test/tracing/cloud/gcp/pubsub/subscriber.js b/packages/collector/test/tracing/cloud/gcp/pubsub/subscriber.js index 09a682d423..ad05a70787 100644 --- a/packages/collector/test/tracing/cloud/gcp/pubsub/subscriber.js +++ b/packages/collector/test/tracing/cloud/gcp/pubsub/subscriber.js @@ -18,7 +18,6 @@ const instana = require('../../../../..')(); const bodyParser = require('body-parser'); const express = require('express'); const morgan = require('morgan'); -const fetch = require('node-fetch-v2'); const { sendToParent } = require('../../../../../../core/test/test_util'); const { createTopicAndSubscription } = require('./pubsubUtil'); diff --git a/packages/collector/test/tracing/control_flow/async_await/app.js b/packages/collector/test/tracing/control_flow/async_await/app.js index 8037709317..26b3aa168b 100644 --- a/packages/collector/test/tracing/control_flow/async_await/app.js +++ b/packages/collector/test/tracing/control_flow/async_await/app.js @@ -11,8 +11,6 @@ process.on('SIGTERM', () => { process.exit(0); }); -const fetch = require('node-fetch-v2'); - require('../../../..')({ agentPort: process.env.AGENT_PORT, level: 'warn', diff --git a/packages/collector/test/tracing/control_flow/async_await/controls.js b/packages/collector/test/tracing/control_flow/async_await/controls.js index 61fd2dba49..039637549f 100644 --- a/packages/collector/test/tracing/control_flow/async_await/controls.js +++ b/packages/collector/test/tracing/control_flow/async_await/controls.js @@ -6,7 +6,7 @@ 'use strict'; const spawn = require('child_process').spawn; -const fetch = require('node-fetch-v2'); + const path = require('path'); const portfinder = require('../../../test_util/portfinder'); diff --git a/packages/collector/test/tracing/control_flow/bluebird/app.js b/packages/collector/test/tracing/control_flow/bluebird/app.js index d31779c8f1..f94b392e1f 100644 --- a/packages/collector/test/tracing/control_flow/bluebird/app.js +++ b/packages/collector/test/tracing/control_flow/bluebird/app.js @@ -16,7 +16,6 @@ process.on('SIGTERM', () => { const instana = require('../../../..')(); -const fetch = require('node-fetch-v2'); const bodyParser = require('body-parser'); const EventEmitter = require('events'); const Promise = require('bluebird'); diff --git a/packages/collector/test/tracing/control_flow/native_promise/app.js b/packages/collector/test/tracing/control_flow/native_promise/app.js index fb7a611005..45d208b20a 100644 --- a/packages/collector/test/tracing/control_flow/native_promise/app.js +++ b/packages/collector/test/tracing/control_flow/native_promise/app.js @@ -12,7 +12,7 @@ process.on('SIGTERM', () => { }); const instana = require('../../../..')(); -const fetch = require('node-fetch-v2'); + const bodyParser = require('body-parser'); const EventEmitter = require('events'); const express = require('express'); diff --git a/packages/collector/test/tracing/databases/couchbase/test.js b/packages/collector/test/tracing/databases/couchbase/test.js index db8adca787..e133190180 100644 --- a/packages/collector/test/tracing/databases/couchbase/test.js +++ b/packages/collector/test/tracing/databases/couchbase/test.js @@ -5,7 +5,7 @@ 'use strict'; const expect = require('chai').expect; -const fetch = require('node-fetch-v2'); + const constants = require('@instana/core').tracing.constants; const supportedVersion = require('@instana/core').tracing.supportedVersion; const config = require('../../../../../core/test/config'); diff --git a/packages/collector/test/tracing/databases/elasticsearch/app.js b/packages/collector/test/tracing/databases/elasticsearch/app.js index 5e60b19c36..aaa2a711d2 100644 --- a/packages/collector/test/tracing/databases/elasticsearch/app.js +++ b/packages/collector/test/tracing/databases/elasticsearch/app.js @@ -22,7 +22,7 @@ require('../../../..')(); const bodyParser = require('body-parser'); const express = require('express'); const morgan = require('morgan'); -const fetch = require('node-fetch-v2'); + const { Client } = require('@elastic/elasticsearch'); const port = require('../../../test_util/app-port')(); diff --git a/packages/collector/test/tracing/databases/ioredis/app.js b/packages/collector/test/tracing/databases/ioredis/app.js index 6ed89a6ef7..00afa87cb3 100644 --- a/packages/collector/test/tracing/databases/ioredis/app.js +++ b/packages/collector/test/tracing/databases/ioredis/app.js @@ -21,7 +21,7 @@ const bodyParser = require('body-parser'); const express = require('express'); const morgan = require('morgan'); const ioredis = require('ioredis'); -const fetch = require('node-fetch-v2'); + const port = require('../../../test_util/app-port')(); const connect = require('./connect-via'); const app = express(); diff --git a/packages/collector/test/tracing/databases/ioredis/app.mjs b/packages/collector/test/tracing/databases/ioredis/app.mjs index 69ff191dc5..6620db2861 100644 --- a/packages/collector/test/tracing/databases/ioredis/app.mjs +++ b/packages/collector/test/tracing/databases/ioredis/app.mjs @@ -19,7 +19,7 @@ import bodyParser from 'body-parser'; import express from 'express'; import morgan from 'morgan'; import ioredis from 'ioredis'; -import fetch from 'node-fetch'; + import portFactory from '../../../test_util/app-port.js'; import connect from './connect-via/index.js'; const port = portFactory(); diff --git a/packages/collector/test/tracing/databases/memcached/app.js b/packages/collector/test/tracing/databases/memcached/app.js index 24b6ea7618..a4fa745093 100644 --- a/packages/collector/test/tracing/databases/memcached/app.js +++ b/packages/collector/test/tracing/databases/memcached/app.js @@ -16,7 +16,7 @@ const express = require('express'); const app = express(); const port = require('../../../test_util/app-port')(); const agentPort = process.env.INSTANA_AGENT_PORT; -const fetch = require('node-fetch-v2'); + const logPrefix = `Memcached (${process.pid}):\t`; const log = require('@instana/core/test/test_util/log').getLogger(logPrefix); const Memcached = require('memcached'); diff --git a/packages/collector/test/tracing/databases/memcached/app.mjs b/packages/collector/test/tracing/databases/memcached/app.mjs index e67c60069c..7e51a98d7f 100644 --- a/packages/collector/test/tracing/databases/memcached/app.mjs +++ b/packages/collector/test/tracing/databases/memcached/app.mjs @@ -16,7 +16,7 @@ const app = express(); import getAppPort from '../../../test_util/app-port.js'; const port = getAppPort(); const agentPort = process.env.INSTANA_AGENT_PORT; -import fetch from 'node-fetch'; + import logger from '@instana/core/test/test_util/log.js'; import Memcached from 'memcached'; diff --git a/packages/collector/test/tracing/databases/mongodb/app.js b/packages/collector/test/tracing/databases/mongodb/app.js index a71b8b82ba..9c2c870526 100644 --- a/packages/collector/test/tracing/databases/mongodb/app.js +++ b/packages/collector/test/tracing/databases/mongodb/app.js @@ -30,7 +30,7 @@ const bodyParser = require('body-parser'); const express = require('express'); const morgan = require('morgan'); const assert = require('assert'); -const fetch = require('node-fetch-v2'); + const port = require('../../../test_util/app-port')(); const app = express(); diff --git a/packages/collector/test/tracing/databases/mongodb/app.mjs b/packages/collector/test/tracing/databases/mongodb/app.mjs index dd5a326098..99f06cba48 100644 --- a/packages/collector/test/tracing/databases/mongodb/app.mjs +++ b/packages/collector/test/tracing/databases/mongodb/app.mjs @@ -23,7 +23,7 @@ import bodyParser from 'body-parser'; import express from 'express'; import morgan from 'morgan'; import assert from 'assert'; -import fetch from 'node-fetch'; + import getAppPort from '../../../test_util/app-port.js'; const port = getAppPort(); diff --git a/packages/collector/test/tracing/databases/mysql/app.js b/packages/collector/test/tracing/databases/mysql/app.js index b23aff9b43..67be95d048 100644 --- a/packages/collector/test/tracing/databases/mysql/app.js +++ b/packages/collector/test/tracing/databases/mysql/app.js @@ -41,7 +41,6 @@ if (driverModeEnvVar === 'mysql') { const mysql = require(driver); -const fetch = require('node-fetch-v2'); const bodyParser = require('body-parser'); const express = require('express'); const morgan = require('morgan'); diff --git a/packages/collector/test/tracing/databases/mysql/app.mjs b/packages/collector/test/tracing/databases/mysql/app.mjs index 44ec77c0d1..7537937f0d 100644 --- a/packages/collector/test/tracing/databases/mysql/app.mjs +++ b/packages/collector/test/tracing/databases/mysql/app.mjs @@ -48,7 +48,6 @@ if (driverModeEnvVar === 'mysql') { client = mysql2promise; } -import fetch from 'node-fetch'; import bodyParser from 'body-parser'; import express from 'express'; import morgan from 'morgan'; diff --git a/packages/collector/test/tracing/databases/pg/app.js b/packages/collector/test/tracing/databases/pg/app.js index 8e047af1d4..384c77a721 100644 --- a/packages/collector/test/tracing/databases/pg/app.js +++ b/packages/collector/test/tracing/databases/pg/app.js @@ -22,7 +22,7 @@ const Pool = _pg.Pool; const Client = _pg.Client; const express = require('express'); const morgan = require('morgan'); -const fetch = require('node-fetch-v2'); + const bodyParser = require('body-parser'); const port = require('../../../test_util/app-port')(); diff --git a/packages/collector/test/tracing/databases/pg/app.mjs b/packages/collector/test/tracing/databases/pg/app.mjs index b370259b70..37a68f6284 100644 --- a/packages/collector/test/tracing/databases/pg/app.mjs +++ b/packages/collector/test/tracing/databases/pg/app.mjs @@ -20,7 +20,7 @@ const Pool = _pg.Pool; const Client = _pg.Client; import express from 'express'; import morgan from 'morgan'; -import fetch from 'node-fetch'; + import bodyParser from 'body-parser'; import getAppPort from '../../../test_util/app-port.js'; const port = getAppPort(); diff --git a/packages/collector/test/tracing/databases/pg_native/app.js b/packages/collector/test/tracing/databases/pg_native/app.js index a571729fe7..26928d4596 100644 --- a/packages/collector/test/tracing/databases/pg_native/app.js +++ b/packages/collector/test/tracing/databases/pg_native/app.js @@ -18,7 +18,7 @@ require('../../../..')(); const Client = require('pg-native'); const express = require('express'); const morgan = require('morgan'); -const fetch = require('node-fetch-v2'); + const bodyParser = require('body-parser'); const port = require('../../../test_util/app-port')(); diff --git a/packages/collector/test/tracing/databases/pg_native/app.mjs b/packages/collector/test/tracing/databases/pg_native/app.mjs index 967aec2c24..382a6e3090 100644 --- a/packages/collector/test/tracing/databases/pg_native/app.mjs +++ b/packages/collector/test/tracing/databases/pg_native/app.mjs @@ -16,7 +16,7 @@ const agentPort = process.env.INSTANA_AGENT_PORT; import Client from 'pg-native'; import express from 'express'; import morgan from 'morgan'; -import fetch from 'node-fetch'; + import bodyParser from 'body-parser'; import getAppPort from '../../../test_util/app-port.js'; const port = getAppPort(); diff --git a/packages/collector/test/tracing/databases/redis/app.js b/packages/collector/test/tracing/databases/redis/app.js index d7e7e68389..2e1c964360 100644 --- a/packages/collector/test/tracing/databases/redis/app.js +++ b/packages/collector/test/tracing/databases/redis/app.js @@ -19,7 +19,7 @@ const redis = require(process.env.REDIS_PKG); const bodyParser = require('body-parser'); const express = require('express'); const morgan = require('morgan'); -const fetch = require('node-fetch-v2'); + const port = require('../../../test_util/app-port')(); const cls = require('../../../../../core/src/tracing/cls'); diff --git a/packages/collector/test/tracing/databases/redis/legacyApp.js b/packages/collector/test/tracing/databases/redis/legacyApp.js index 24cc1e208f..7622076e93 100644 --- a/packages/collector/test/tracing/databases/redis/legacyApp.js +++ b/packages/collector/test/tracing/databases/redis/legacyApp.js @@ -21,7 +21,7 @@ const bodyParser = require('body-parser'); const express = require('express'); const morgan = require('morgan'); const redis = require('redis'); -const fetch = require('node-fetch-v2'); + const port = require('../../../test_util/app-port')(); const cls = require('../../../../../core/src/tracing/cls'); diff --git a/packages/collector/test/tracing/logging/bunyan/bunyanApp.js b/packages/collector/test/tracing/logging/bunyan/bunyanApp.js index 6598d62141..b5e76f25d5 100644 --- a/packages/collector/test/tracing/logging/bunyan/bunyanApp.js +++ b/packages/collector/test/tracing/logging/bunyan/bunyanApp.js @@ -15,7 +15,6 @@ process.on('SIGTERM', () => { require('../../../..')(); -const fetch = require('node-fetch-v2'); const bodyParser = require('body-parser'); const express = require('express'); const morgan = require('morgan'); diff --git a/packages/collector/test/tracing/logging/bunyan/bunyanApp.mjs b/packages/collector/test/tracing/logging/bunyan/bunyanApp.mjs index 24b194ee58..e83891ab98 100644 --- a/packages/collector/test/tracing/logging/bunyan/bunyanApp.mjs +++ b/packages/collector/test/tracing/logging/bunyan/bunyanApp.mjs @@ -12,7 +12,6 @@ process.on('SIGTERM', () => { process.exit(0); }); -import fetch from 'node-fetch-v2'; import bodyParser from 'body-parser'; import express from 'express'; import morgan from 'morgan'; diff --git a/packages/collector/test/tracing/logging/console/app.js b/packages/collector/test/tracing/logging/console/app.js index 117239d198..eae1926498 100644 --- a/packages/collector/test/tracing/logging/console/app.js +++ b/packages/collector/test/tracing/logging/console/app.js @@ -17,7 +17,6 @@ const agentPort = process.env.INSTANA_AGENT_PORT; require('../../../..')(); -const fetch = require('node-fetch-v2'); const bodyParser = require('body-parser'); const express = require('express'); const morgan = require('morgan'); diff --git a/packages/collector/test/tracing/logging/console/app.mjs b/packages/collector/test/tracing/logging/console/app.mjs index d63602dbcc..e6ffe1a5ce 100644 --- a/packages/collector/test/tracing/logging/console/app.mjs +++ b/packages/collector/test/tracing/logging/console/app.mjs @@ -15,7 +15,6 @@ process.on('SIGTERM', () => { const agentPort = process.env.INSTANA_AGENT_PORT; -import fetch from 'node-fetch'; import bodyParser from 'body-parser'; import express from 'express'; import morgan from 'morgan'; diff --git a/packages/collector/test/tracing/logging/log4js/app.js b/packages/collector/test/tracing/logging/log4js/app.js index 618f1e6982..f0e48817b4 100644 --- a/packages/collector/test/tracing/logging/log4js/app.js +++ b/packages/collector/test/tracing/logging/log4js/app.js @@ -15,7 +15,6 @@ process.on('SIGTERM', () => { require('../../../..')(); -const fetch = require('node-fetch-v2'); const bodyParser = require('body-parser'); const express = require('express'); const morgan = require('morgan'); diff --git a/packages/collector/test/tracing/logging/log4js/app.mjs b/packages/collector/test/tracing/logging/log4js/app.mjs index ad55c41484..eed9e3e225 100644 --- a/packages/collector/test/tracing/logging/log4js/app.mjs +++ b/packages/collector/test/tracing/logging/log4js/app.mjs @@ -13,7 +13,6 @@ process.on('SIGTERM', () => { process.exit(0); }); -import fetch from 'node-fetch'; import bodyParser from 'body-parser'; import express from 'express'; import morgan from 'morgan'; diff --git a/packages/collector/test/tracing/logging/pino/app.js b/packages/collector/test/tracing/logging/pino/app.js index 82833ee7ce..9c47a3043f 100644 --- a/packages/collector/test/tracing/logging/pino/app.js +++ b/packages/collector/test/tracing/logging/pino/app.js @@ -16,7 +16,6 @@ process.on('SIGTERM', () => { require('./mockVersion'); require('../../../..')(); -const fetch = require('node-fetch-v2'); const bodyParser = require('body-parser'); const express = require('express'); const morgan = require('morgan'); diff --git a/packages/collector/test/tracing/logging/winston/app.js b/packages/collector/test/tracing/logging/winston/app.js index 672d776577..f33a9d92c8 100644 --- a/packages/collector/test/tracing/logging/winston/app.js +++ b/packages/collector/test/tracing/logging/winston/app.js @@ -15,7 +15,6 @@ process.on('SIGTERM', () => { require('../../../..')(); -const fetch = require('node-fetch-v2'); const bodyParser = require('body-parser'); const express = require('express'); const morgan = require('morgan'); diff --git a/packages/collector/test/tracing/logging/winston/app.mjs b/packages/collector/test/tracing/logging/winston/app.mjs index 1b18321e42..8008e63456 100644 --- a/packages/collector/test/tracing/logging/winston/app.mjs +++ b/packages/collector/test/tracing/logging/winston/app.mjs @@ -13,7 +13,6 @@ process.on('SIGTERM', () => { process.exit(0); }); -import fetch from 'node-fetch'; import bodyParser from 'body-parser'; import express from 'express'; import morgan from 'morgan'; diff --git a/packages/collector/test/tracing/messaging/amqp/consumerCallbacks.js b/packages/collector/test/tracing/messaging/amqp/consumerCallbacks.js index df72140766..a35f8854c6 100644 --- a/packages/collector/test/tracing/messaging/amqp/consumerCallbacks.js +++ b/packages/collector/test/tracing/messaging/amqp/consumerCallbacks.js @@ -21,7 +21,7 @@ const instana = require('../../../..')({ const amqp = require('amqplib/callback_api'); const a = require('async'); -const fetch = require('node-fetch-v2'); + const bail = require('./amqpUtil').bail; const exchange = require('./amqpUtil').exchange; const queueName = require('./amqpUtil').queueName; diff --git a/packages/collector/test/tracing/messaging/amqp/consumerPromises.js b/packages/collector/test/tracing/messaging/amqp/consumerPromises.js index 19259508b2..9e0a009617 100644 --- a/packages/collector/test/tracing/messaging/amqp/consumerPromises.js +++ b/packages/collector/test/tracing/messaging/amqp/consumerPromises.js @@ -20,7 +20,7 @@ const instana = require('../../../..')({ }); const amqp = require('amqplib'); -const fetch = require('node-fetch-v2'); + const exchange = require('./amqpUtil').exchange; const queueName = require('./amqpUtil').queueName; const queueNameGet = require('./amqpUtil').queueNameGet; diff --git a/packages/collector/test/tracing/messaging/amqp/publisherCallbacks.js b/packages/collector/test/tracing/messaging/amqp/publisherCallbacks.js index ee8bcc6602..15c713aea7 100644 --- a/packages/collector/test/tracing/messaging/amqp/publisherCallbacks.js +++ b/packages/collector/test/tracing/messaging/amqp/publisherCallbacks.js @@ -35,7 +35,6 @@ const queueNameConfirm = require('./amqpUtil').queueNameConfirm; let channel; let confirmChannel; -const fetch = require('node-fetch-v2'); const bodyParser = require('body-parser'); const express = require('express'); const port = require('../../../test_util/app-port')(); diff --git a/packages/collector/test/tracing/messaging/amqp/publisherControls.js b/packages/collector/test/tracing/messaging/amqp/publisherControls.js index b0aa630baa..3dd9c86231 100644 --- a/packages/collector/test/tracing/messaging/amqp/publisherControls.js +++ b/packages/collector/test/tracing/messaging/amqp/publisherControls.js @@ -6,7 +6,7 @@ 'use strict'; const spawn = require('child_process').spawn; -const fetch = require('node-fetch-v2'); + const path = require('path'); const portfinder = require('../../../test_util/portfinder'); diff --git a/packages/collector/test/tracing/messaging/amqp/publisherPromises.js b/packages/collector/test/tracing/messaging/amqp/publisherPromises.js index dddca30695..1f15b2a525 100644 --- a/packages/collector/test/tracing/messaging/amqp/publisherPromises.js +++ b/packages/collector/test/tracing/messaging/amqp/publisherPromises.js @@ -34,7 +34,6 @@ let connection; let channel; let confirmChannel; -const fetch = require('node-fetch-v2'); const bodyParser = require('body-parser'); const express = require('express'); const port = require('../../../test_util/app-port')(); diff --git a/packages/collector/test/tracing/messaging/bull/util.js b/packages/collector/test/tracing/messaging/bull/util.js index 7f7364d7fb..969bd7076f 100644 --- a/packages/collector/test/tracing/messaging/bull/util.js +++ b/packages/collector/test/tracing/messaging/bull/util.js @@ -7,7 +7,7 @@ const fs = require('fs'); const path = require('path'); -const fetch = require('node-fetch-v2'); + const { delay } = require('../../../../../core/test/test_util'); const agentPort = process.env.INSTANA_AGENT_PORT; diff --git a/packages/collector/test/tracing/messaging/kafka-avro/consumer.js b/packages/collector/test/tracing/messaging/kafka-avro/consumer.js index 4566218951..b9036d3222 100644 --- a/packages/collector/test/tracing/messaging/kafka-avro/consumer.js +++ b/packages/collector/test/tracing/messaging/kafka-avro/consumer.js @@ -15,7 +15,6 @@ const instana = require('../../../..')(); // eslint-disable-next-line import/no-extraneous-dependencies const KafkaAvro = require('kafka-avro'); -const fetch = require('node-fetch-v2'); const delay = require('../../../../../core/test/test_util/delay'); const agentPort = process.env.INSTANA_AGENT_PORT; const { sendToParent } = require('@instana/core/test/test_util'); diff --git a/packages/collector/test/tracing/messaging/kafka-avro/producer.js b/packages/collector/test/tracing/messaging/kafka-avro/producer.js index f3b66c8e14..bd2ac88574 100644 --- a/packages/collector/test/tracing/messaging/kafka-avro/producer.js +++ b/packages/collector/test/tracing/messaging/kafka-avro/producer.js @@ -15,7 +15,6 @@ require('../../../..')({}); // eslint-disable-next-line import/no-extraneous-dependencies const KafkaAvro = require('kafka-avro'); -const fetch = require('node-fetch-v2'); const agentPort = process.env.INSTANA_AGENT_PORT; const logPrefix = `Kafka Avro Producer (${process.pid}):\t`; const log = require('@instana/core/test/test_util/log').getLogger(logPrefix); diff --git a/packages/collector/test/tracing/messaging/kafka-node/consumer.js b/packages/collector/test/tracing/messaging/kafka-node/consumer.js index ec3a01e646..24a6749c8c 100644 --- a/packages/collector/test/tracing/messaging/kafka-node/consumer.js +++ b/packages/collector/test/tracing/messaging/kafka-node/consumer.js @@ -19,7 +19,7 @@ const agentPort = process.env.INSTANA_AGENT_PORT; const instana = require('../../../..')(); const express = require('express'); const kafka = require('kafka-node'); -const fetch = require('node-fetch-v2'); + const { v4: uuid } = require('uuid'); let connected = false; diff --git a/packages/collector/test/tracing/messaging/kafka-node/producer.js b/packages/collector/test/tracing/messaging/kafka-node/producer.js index d6f945e5c8..ea4fb492ee 100644 --- a/packages/collector/test/tracing/messaging/kafka-node/producer.js +++ b/packages/collector/test/tracing/messaging/kafka-node/producer.js @@ -17,7 +17,6 @@ const agentPort = process.env.INSTANA_AGENT_PORT; require('../../../..')(); -const fetch = require('node-fetch-v2'); const bodyParser = require('body-parser'); const express = require('express'); const kafka = require('kafka-node'); diff --git a/packages/collector/test/tracing/messaging/kafkajs/consumer.js b/packages/collector/test/tracing/messaging/kafkajs/consumer.js index f3fef6fe20..407e31e964 100644 --- a/packages/collector/test/tracing/messaging/kafkajs/consumer.js +++ b/packages/collector/test/tracing/messaging/kafkajs/consumer.js @@ -14,7 +14,7 @@ process.on('SIGTERM', () => { const instana = require('../../../..')(); const express = require('express'); const { Kafka } = require('kafkajs'); -const fetch = require('node-fetch-v2'); + const { v4: uuid } = require('uuid'); const delay = require('../../../../../core/test/test_util/delay'); diff --git a/packages/collector/test/tracing/messaging/kafkajs/producer.js b/packages/collector/test/tracing/messaging/kafkajs/producer.js index 07ccb28d01..c2d0a018f2 100644 --- a/packages/collector/test/tracing/messaging/kafkajs/producer.js +++ b/packages/collector/test/tracing/messaging/kafkajs/producer.js @@ -13,7 +13,6 @@ process.on('SIGTERM', () => { require('../../../..')(); -const fetch = require('node-fetch-v2'); const bodyParser = require('body-parser'); const express = require('express'); const { Kafka } = require('kafkajs'); diff --git a/packages/collector/test/tracing/messaging/nats-streaming/publisher.js b/packages/collector/test/tracing/messaging/nats-streaming/publisher.js index 87842f6ed1..26973ca20e 100644 --- a/packages/collector/test/tracing/messaging/nats-streaming/publisher.js +++ b/packages/collector/test/tracing/messaging/nats-streaming/publisher.js @@ -15,7 +15,6 @@ const agentPort = process.env.INSTANA_AGENT_PORT; require('../../../..')(); -const fetch = require('node-fetch-v2'); const express = require('express'); const natsStreaming = require('node-nats-streaming'); diff --git a/packages/collector/test/tracing/messaging/nats-streaming/subscriber.js b/packages/collector/test/tracing/messaging/nats-streaming/subscriber.js index ea3f82f1a0..abbf8a0329 100644 --- a/packages/collector/test/tracing/messaging/nats-streaming/subscriber.js +++ b/packages/collector/test/tracing/messaging/nats-streaming/subscriber.js @@ -15,7 +15,7 @@ const agentPort = process.env.INSTANA_AGENT_PORT; const instana = require('../../../..')(); const express = require('express'); -const fetch = require('node-fetch-v2'); + const natsStreaming = require('node-nats-streaming'); const app = express(); diff --git a/packages/collector/test/tracing/messaging/nats/publisher.js b/packages/collector/test/tracing/messaging/nats/publisher.js index 1af9a7c33c..c2375dfa1d 100644 --- a/packages/collector/test/tracing/messaging/nats/publisher.js +++ b/packages/collector/test/tracing/messaging/nats/publisher.js @@ -16,7 +16,6 @@ const agentPort = process.env.INSTANA_AGENT_PORT; require('./mockVersion'); require('../../../..')(); -const fetch = require('node-fetch-v2'); const express = require('express'); const NATS = require('nats'); diff --git a/packages/collector/test/tracing/messaging/nats/subscriber.js b/packages/collector/test/tracing/messaging/nats/subscriber.js index 0274a0d228..775f73f6bb 100644 --- a/packages/collector/test/tracing/messaging/nats/subscriber.js +++ b/packages/collector/test/tracing/messaging/nats/subscriber.js @@ -16,7 +16,7 @@ require('./mockVersion'); const instana = require('../../../..')(); const express = require('express'); -const fetch = require('node-fetch-v2'); + const NATS = require('nats'); const log = require('@instana/core/test/test_util/log').getLogger('NATS Subscriber: '); diff --git a/packages/collector/test/tracing/messaging/node-rdkafka/consumer.js b/packages/collector/test/tracing/messaging/node-rdkafka/consumer.js index 4d4d7728c9..bf95c93a16 100644 --- a/packages/collector/test/tracing/messaging/node-rdkafka/consumer.js +++ b/packages/collector/test/tracing/messaging/node-rdkafka/consumer.js @@ -11,7 +11,7 @@ process.on('SIGTERM', () => { }); const instana = require('../../../..')(); -const fetch = require('node-fetch-v2'); + const delay = require('../../../../../core/test/test_util/delay'); const agentPort = process.env.INSTANA_AGENT_PORT; const { sendToParent } = require('@instana/core/test/test_util'); diff --git a/packages/collector/test/tracing/messaging/node-rdkafka/producer.js b/packages/collector/test/tracing/messaging/node-rdkafka/producer.js index 1553420ef0..de9557c5b3 100644 --- a/packages/collector/test/tracing/messaging/node-rdkafka/producer.js +++ b/packages/collector/test/tracing/messaging/node-rdkafka/producer.js @@ -13,7 +13,7 @@ process.on('SIGTERM', () => { require('../../../..')({}); const Kafka = require('node-rdkafka'); -const fetch = require('node-fetch-v2'); + const agentPort = process.env.INSTANA_AGENT_PORT; const logPrefix = `rdkafka Producer (${process.pid}):\t`; const log = require('@instana/core/test/test_util/log').getLogger(logPrefix); diff --git a/packages/collector/test/tracing/misc/node-fetch/app.js b/packages/collector/test/tracing/misc/node-fetch/app.js index b073001507..faf06680f4 100644 --- a/packages/collector/test/tracing/misc/node-fetch/app.js +++ b/packages/collector/test/tracing/misc/node-fetch/app.js @@ -26,7 +26,7 @@ const logPrefix = `fetch App (${process.pid}):\t`; const agentPort = process.env.INSTANA_AGENT_PORT; -const fetch = require('node-fetch-v2'); +const fetch = require('node-fetch'); if (process.env.WITH_STDOUT) { app.use(morgan(`${logPrefix}:method :url :status`)); } diff --git a/packages/collector/test/tracing/misc/node-fetch/app.mjs b/packages/collector/test/tracing/misc/node-fetch/app.mjs index 8c3f96a114..512c272f0f 100644 --- a/packages/collector/test/tracing/misc/node-fetch/app.mjs +++ b/packages/collector/test/tracing/misc/node-fetch/app.mjs @@ -20,7 +20,6 @@ import morgan from 'morgan'; import bodyParser from 'body-parser'; import getAppPort from '../../../test_util/app-port.js'; const port = getAppPort(); -import fetch from 'node-fetch'; const app = express(); const logPrefix = `fetch App (${process.pid}):\t`; diff --git a/packages/collector/test/tracing/misc/span-batching-with-redis/app.js b/packages/collector/test/tracing/misc/span-batching-with-redis/app.js index 29241d93d6..f654bcf81b 100644 --- a/packages/collector/test/tracing/misc/span-batching-with-redis/app.js +++ b/packages/collector/test/tracing/misc/span-batching-with-redis/app.js @@ -20,7 +20,7 @@ const bodyParser = require('body-parser'); const express = require('express'); const morgan = require('morgan'); const redis = require('redis'); -const fetch = require('node-fetch-v2'); + const port = require('../../../test_util/app-port')(); const app = express(); const logPrefix = `Redis Batching App (${process.pid}):\t`; diff --git a/packages/collector/test/tracing/misc/specification_compliance/app.js b/packages/collector/test/tracing/misc/specification_compliance/app.js index 33aa313d2a..11393482a0 100644 --- a/packages/collector/test/tracing/misc/specification_compliance/app.js +++ b/packages/collector/test/tracing/misc/specification_compliance/app.js @@ -18,7 +18,7 @@ require('../../../..')(); const fs = require('fs'); const path = require('path'); -const fetch = require('node-fetch-v2'); + const { parse } = require('url'); const http2Promise = require('../../../test_util/http2Promise'); diff --git a/packages/collector/test/tracing/misc/w3c_trace_context/app.js b/packages/collector/test/tracing/misc/w3c_trace_context/app.js index ed669b9662..b78e30bca2 100644 --- a/packages/collector/test/tracing/misc/w3c_trace_context/app.js +++ b/packages/collector/test/tracing/misc/w3c_trace_context/app.js @@ -44,7 +44,7 @@ if (isInstana()) { const fs = require('fs'); const path = require('path'); -const fetch = require('node-fetch-v2'); + const { parse } = require('url'); const http2Promise = require('../../../test_util/http2Promise'); diff --git a/packages/collector/test/tracing/open_tracing/controls.js b/packages/collector/test/tracing/open_tracing/controls.js index d5b1e5c121..fc18098680 100644 --- a/packages/collector/test/tracing/open_tracing/controls.js +++ b/packages/collector/test/tracing/open_tracing/controls.js @@ -6,7 +6,7 @@ 'use strict'; const spawn = require('child_process').spawn; -const fetch = require('node-fetch-v2'); + const path = require('path'); const portfinder = require('../../test_util/portfinder'); const testUtils = require('../../../../core/test/test_util'); diff --git a/packages/collector/test/tracing/opentelemetry/restify-app.js b/packages/collector/test/tracing/opentelemetry/restify-app.js index 697d8e1233..6993896b90 100644 --- a/packages/collector/test/tracing/opentelemetry/restify-app.js +++ b/packages/collector/test/tracing/opentelemetry/restify-app.js @@ -22,7 +22,7 @@ require('@instana/collector')({ }); const restify = require('restify'); -const fetch = require('node-fetch-v2'); + const _pg = require('pg'); const Pool = _pg.Pool; const Client = _pg.Client; diff --git a/packages/collector/test/tracing/protocols/apollo_subgraph/client.js b/packages/collector/test/tracing/protocols/apollo_subgraph/client.js index 72619f7736..9b28f5a581 100644 --- a/packages/collector/test/tracing/protocols/apollo_subgraph/client.js +++ b/packages/collector/test/tracing/protocols/apollo_subgraph/client.js @@ -15,7 +15,6 @@ require('../../../..')(); const bodyParser = require('body-parser'); const express = require('express'); const morgan = require('morgan'); -const fetch = require('node-fetch-v2'); const serverPort = process.env.SERVER_PORT; const serverBaseUrl = `http://127.0.0.1:${serverPort}`; diff --git a/packages/collector/test/tracing/protocols/graphql/client.js b/packages/collector/test/tracing/protocols/graphql/client.js index feb5bdf327..c9f8e95dbb 100644 --- a/packages/collector/test/tracing/protocols/graphql/client.js +++ b/packages/collector/test/tracing/protocols/graphql/client.js @@ -17,7 +17,7 @@ const amqp = require('amqplib'); const bodyParser = require('body-parser'); const express = require('express'); const morgan = require('morgan'); -const fetch = require('node-fetch-v2'); + const { v4: uuid } = require('uuid'); const ws = require('ws'); diff --git a/packages/collector/test/tracing/protocols/http/client/allowRootExitSpanApp.js b/packages/collector/test/tracing/protocols/http/client/allowRootExitSpanApp.js index c4d7800c3e..771278950a 100644 --- a/packages/collector/test/tracing/protocols/http/client/allowRootExitSpanApp.js +++ b/packages/collector/test/tracing/protocols/http/client/allowRootExitSpanApp.js @@ -12,7 +12,7 @@ process.on('SIGTERM', () => { require('../../../../..')(); const { delay } = require('../../../../../../core/test/test_util'); -const fetch = require('node-fetch-v2'); + const agentPort = process.env.INSTANA_AGENT_PORT; // eslint-disable-next-line no-console diff --git a/packages/collector/test/tracing/protocols/http/client/clientApp.js b/packages/collector/test/tracing/protocols/http/client/clientApp.js index 8526f9e9fe..ebe0306815 100644 --- a/packages/collector/test/tracing/protocols/http/client/clientApp.js +++ b/packages/collector/test/tracing/protocols/http/client/clientApp.js @@ -20,7 +20,7 @@ const express = require('express'); const fs = require('fs'); const morgan = require('morgan'); const path = require('path'); -const fetch = require('node-fetch-v2'); + const port = require('../../../../test_util/app-port')(); const httpModule = process.env.APP_USES_HTTPS === 'true' ? require('https') : require('http'); diff --git a/packages/collector/test/tracing/protocols/http/client/sdkApp1.js b/packages/collector/test/tracing/protocols/http/client/sdkApp1.js index 3a3785f0be..41465c4280 100644 --- a/packages/collector/test/tracing/protocols/http/client/sdkApp1.js +++ b/packages/collector/test/tracing/protocols/http/client/sdkApp1.js @@ -12,18 +12,18 @@ process.on('SIGTERM', () => { const instana = require('../../../../..')(); const { delay } = require('../../../../../../core/test/test_util'); -const nodeFetch = require('node-fetch-v2'); + const agentPort = process.env.INSTANA_AGENT_PORT; const main = async () => { let err1; try { - const req = new nodeFetch.Request(`http://127.0.0.1:${agentPort}`); - await nodeFetch(req); + const req = new fetch.Request(`http://127.0.0.1:${agentPort}`); + await fetch(req); await instana.sdk.async.startEntrySpan('my-translation-service'); - await nodeFetch('https://www.ibm.com/products/instana'); + await fetch('https://www.ibm.com/products/instana'); } catch (err) { err1 = err; } diff --git a/packages/collector/test/tracing/protocols/http/proxy/expressProxy.js b/packages/collector/test/tracing/protocols/http/proxy/expressProxy.js index 56382c5d35..5b8907dc41 100644 --- a/packages/collector/test/tracing/protocols/http/proxy/expressProxy.js +++ b/packages/collector/test/tracing/protocols/http/proxy/expressProxy.js @@ -27,7 +27,7 @@ require('../../../../..')({ } }); const express = require('express'); -const fetch = require('node-fetch-v2'); + const port = require('../../../../test_util/app-port')(); const app = express(); diff --git a/packages/collector/test/tracing/protocols/http/proxy/expressProxyControls.js b/packages/collector/test/tracing/protocols/http/proxy/expressProxyControls.js index 350b798196..0249d218d3 100644 --- a/packages/collector/test/tracing/protocols/http/proxy/expressProxyControls.js +++ b/packages/collector/test/tracing/protocols/http/proxy/expressProxyControls.js @@ -5,7 +5,6 @@ 'use strict'; -const fetch = require('node-fetch-v2'); const path = require('path'); const spawn = require('child_process').spawn; diff --git a/packages/collector/test/tracing/sdk/allowRootExitSpans/app_default.js b/packages/collector/test/tracing/sdk/allowRootExitSpans/app_default.js index d24488c17c..33891001a3 100644 --- a/packages/collector/test/tracing/sdk/allowRootExitSpans/app_default.js +++ b/packages/collector/test/tracing/sdk/allowRootExitSpans/app_default.js @@ -17,7 +17,6 @@ require('../../../../src')({ } }); const agentPort = process.env.INSTANA_AGENT_PORT; -const fetch = require('node-fetch-v2'); function main() { setTimeout(async () => { diff --git a/packages/collector/test/tracing/sdk/allowRootExitSpans/app_with_entry.js b/packages/collector/test/tracing/sdk/allowRootExitSpans/app_with_entry.js index 45d2d2909e..3a47c2aa50 100644 --- a/packages/collector/test/tracing/sdk/allowRootExitSpans/app_with_entry.js +++ b/packages/collector/test/tracing/sdk/allowRootExitSpans/app_with_entry.js @@ -18,7 +18,6 @@ const instana = require('../../../../src')({ }); const agentPort = process.env.INSTANA_AGENT_PORT; const { delay } = require('../../../../../core/test/test_util'); -const fetch = require('node-fetch-v2'); const executeRequest = async () => { let error; diff --git a/packages/collector/test/tracing/sdk/app.js b/packages/collector/test/tracing/sdk/app.js index 511abb0f3b..78fc6430c9 100644 --- a/packages/collector/test/tracing/sdk/app.js +++ b/packages/collector/test/tracing/sdk/app.js @@ -22,7 +22,7 @@ const bodyParser = require('body-parser'); const express = require('express'); const morgan = require('morgan'); const path = require('path'); -const fetch = require('node-fetch-v2'); + const port = require('../../test_util/app-port')(); const { delay, getTestAppLogger } = require('../../../../core/test/test_util'); const DummyEmitter = require('./dummyEmitter'); diff --git a/packages/google-cloud-run/test/Control.js b/packages/google-cloud-run/test/Control.js index 2480d4846f..cafc2c641b 100644 --- a/packages/google-cloud-run/test/Control.js +++ b/packages/google-cloud-run/test/Control.js @@ -7,7 +7,6 @@ const { fork } = require('child_process'); const path = require('path'); -const fetch = require('node-fetch-v2'); const portfinder = require('@instana/collector/test/test_util/portfinder'); const config = require('@instana/core/test/config'); diff --git a/packages/google-cloud-run/test/esm/app.mjs b/packages/google-cloud-run/test/esm/app.mjs index 1f187ddee7..d4c936423f 100644 --- a/packages/google-cloud-run/test/esm/app.mjs +++ b/packages/google-cloud-run/test/esm/app.mjs @@ -9,7 +9,7 @@ process.on('SIGTERM', () => { }); import http from 'http'; -import fetch from 'node-fetch'; + import getAppPort from '@instana/collector/test/test_util/app-port.js'; const downstreamDummyUrl = process.env.DOWNSTREAM_DUMMY_URL; diff --git a/packages/google-cloud-run/test/integration_test/app.js b/packages/google-cloud-run/test/integration_test/app.js index 3f7d2f9dff..65b855f09f 100644 --- a/packages/google-cloud-run/test/integration_test/app.js +++ b/packages/google-cloud-run/test/integration_test/app.js @@ -12,7 +12,6 @@ process.on('SIGTERM', () => { }); const http = require('http'); -const fetch = require('node-fetch-v2'); const { sendToParent } = require('../../../core/test/test_util'); diff --git a/packages/opentelemetry-exporter/test/Control.js b/packages/opentelemetry-exporter/test/Control.js index 6a6bcb645d..72781622bd 100644 --- a/packages/opentelemetry-exporter/test/Control.js +++ b/packages/opentelemetry-exporter/test/Control.js @@ -8,7 +8,6 @@ const AbstractServerlessControl = require('@instana/serverless/test/util/AbstractServerlessControl'); const portfinder = require('@instana/collector/test/test_util/portfinder'); const { fork } = require('child_process'); -const fetch = require('node-fetch-v2'); class Control extends AbstractServerlessControl { constructor(opts) { diff --git a/packages/opentelemetry-exporter/test/app.js b/packages/opentelemetry-exporter/test/app.js index 57dd504e45..318b5da90b 100644 --- a/packages/opentelemetry-exporter/test/app.js +++ b/packages/opentelemetry-exporter/test/app.js @@ -13,7 +13,7 @@ process.on('SIGTERM', () => { require('./tracing'); const express = require('express'); -const fetch = require('node-fetch-v2'); + const logPrefix = `OpenTelemetry test app (${process.pid}):\t`; const log = require('@instana/core/test/test_util/log').getLogger(logPrefix); const { delay } = require('@instana/core/test/test_util'); diff --git a/packages/opentelemetry-sampler/test/Control.js b/packages/opentelemetry-sampler/test/Control.js index 3e07bc223f..562ca54929 100644 --- a/packages/opentelemetry-sampler/test/Control.js +++ b/packages/opentelemetry-sampler/test/Control.js @@ -5,7 +5,7 @@ 'use strict'; const { fork } = require('child_process'); -const fetch = require('node-fetch-v2'); + const AbstractServerlessControl = require('../../serverless/test/util/AbstractServerlessControl'); const portfinder = require('../../collector/test/test_util/portfinder'); diff --git a/packages/opentelemetry-sampler/test/app.js b/packages/opentelemetry-sampler/test/app.js index f1537805a9..57c7e6babf 100644 --- a/packages/opentelemetry-sampler/test/app.js +++ b/packages/opentelemetry-sampler/test/app.js @@ -27,7 +27,7 @@ if (otelEndpoint) { require('./tracing'); const express = require('express'); -const fetch = require('node-fetch-v2'); + const logPrefix = `OpenTelemetry test app (${process.pid}):\t`; const log = require('@instana/core/test/test_util/log').getLogger(logPrefix); const { delay } = require('@instana/core/test/test_util'); diff --git a/packages/serverless-collector/test/Control.js b/packages/serverless-collector/test/Control.js index 97fd9d1d91..3e061e4435 100644 --- a/packages/serverless-collector/test/Control.js +++ b/packages/serverless-collector/test/Control.js @@ -6,7 +6,7 @@ const { fork } = require('child_process'); const path = require('path'); -const fetch = require('node-fetch-v2'); + const portfinder = require('@instana/collector/test/test_util/portfinder'); const config = require('@instana/core/test/config'); const AbstractServerlessControl = require('../../serverless/test/util/AbstractServerlessControl'); diff --git a/packages/serverless-collector/test/esm/app.mjs b/packages/serverless-collector/test/esm/app.mjs index 0637727954..a64b881f0a 100644 --- a/packages/serverless-collector/test/esm/app.mjs +++ b/packages/serverless-collector/test/esm/app.mjs @@ -3,7 +3,7 @@ */ import http from 'http'; -import fetch from 'node-fetch'; + import getAppPort from '@instana/collector/test/test_util/app-port.js'; const downstreamDummyUrl = process.env.DOWNSTREAM_DUMMY_URL; diff --git a/packages/serverless/test/util/AbstractServerlessControl.js b/packages/serverless/test/util/AbstractServerlessControl.js index 1e83b29db9..f4ac1319c3 100644 --- a/packages/serverless/test/util/AbstractServerlessControl.js +++ b/packages/serverless/test/util/AbstractServerlessControl.js @@ -10,7 +10,6 @@ const { assert: { fail } } = require('chai'); const path = require('path'); -const fetch = require('node-fetch-v2'); const retry = require('@instana/core/test/test_util/retry'); // const delay = require('@instana/core/test/test_util/delay');