Skip to content

test: replaced node-fetch with native fetch in test setup #2022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

test: replaced node-fetch with native fetch in test setup #2022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 0 additions & 44 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@
"nats": "2.29.3",
"nats-v1": "npm:[email protected]",
"node-fetch": "3.3.2",
"node-fetch-v2": "npm:[email protected]",
"node-gyp": "11.2.0",
"node-nats-streaming": "0.3.2",
"oracledb": "6.9.0",
Expand Down
1 change: 0 additions & 1 deletion packages/aws-fargate/test/Control.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
1 change: 0 additions & 1 deletion packages/aws-fargate/test/esm/app.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion packages/aws-fargate/test/integration_test/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ process.on('SIGTERM', () => {
});

const http = require('http');
const fetch = require('node-fetch-v2');

const { sendToParent } = require('../../../core/test/test_util');

Expand Down
2 changes: 0 additions & 2 deletions packages/aws-lambda/test/lambdas/async.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {};

Expand Down
2 changes: 0 additions & 2 deletions packages/aws-lambda/test/lambdas/promise.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {};

Expand Down
2 changes: 0 additions & 2 deletions packages/aws-lambda/test/specification_compliance/lambda.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand Down
2 changes: 1 addition & 1 deletion packages/azure-container-services/test/Control.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
1 change: 0 additions & 1 deletion packages/azure-container-services/test/esm/app.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/apps/agentStubControls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
1 change: 0 additions & 1 deletion packages/collector/test/apps/expressControls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion packages/collector/test/immediate/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
1 change: 0 additions & 1 deletion packages/collector/test/test_util/ProcessControls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/cloud/aws-sdk/v2/combined_products.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/cloud/aws-sdk/v2/dynamodb/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/cloud/aws-sdk/v2/dynamodb/app.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/cloud/aws-sdk/v2/kinesis/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/cloud/aws-sdk/v2/kinesis/app.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/cloud/aws-sdk/v2/s3/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/cloud/aws-sdk/v2/s3/app.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/cloud/aws-sdk/v2/sns/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/cloud/aws-sdk/v2/sqs/receiveMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/cloud/aws-sdk/v2/sqs/sqs-consumer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/cloud/aws-sdk/v3/dynamodb/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/cloud/aws-sdk/v3/kinesis/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')();
Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/cloud/aws-sdk/v3/s3/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/cloud/aws-sdk/v3/sns/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')();
Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/cloud/aws-sdk/v3/sqs/receiver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/cloud/aws-sdk/v3/sqs/sender.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/cloud/aws-sdk/v3/sqs/sqs-consumer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/cloud/azure/blob/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/cloud/azure/blob/app.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`;
Expand Down
1 change: 0 additions & 1 deletion packages/collector/test/tracing/cloud/gcp/pubsub/publisher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
1 change: 0 additions & 1 deletion packages/collector/test/tracing/cloud/gcp/pubsub/subscriber.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 0 additions & 2 deletions packages/collector/test/tracing/control_flow/async_await/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ process.on('SIGTERM', () => {
process.exit(0);
});

const fetch = require('node-fetch-v2');

require('../../../..')({
agentPort: process.env.AGENT_PORT,
level: 'warn',
Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/control_flow/async_await/controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
1 change: 0 additions & 1 deletion packages/collector/test/tracing/control_flow/bluebird/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/control_flow/native_promise/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion packages/collector/test/tracing/databases/couchbase/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
Loading