Skip to content

Update nock #2652

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

Merged
dyladan merged 3 commits into from
Dec 7, 2021
Merged

Update nock #2652

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
431c756
Update nock
cole-easton May 30, 2021
9ddaf0d
Merge remote-tracking branch 'origin/main' into pr/cole-easton/2249
dyladan Dec 6, 2021
235fabb
Merge branch 'main' into nock-13
dyladan Dec 6, 2021
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
Next Next commit
Update nock
  • Loading branch information
@cole-easton
cole-easton committed Jul 28, 2021
commit 431c7566fce5023428a99fe98f1d96c130f72a85
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-jaeger/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@types/sinon": "10.0.2",
"codecov": "3.8.3",
"mocha": "7.2.0",
"nock": "12.0.3",
"nock": "13.0.11",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "11.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-zipkin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"karma-spec-reporter": "0.0.32",
"karma-webpack": "4.0.2",
"mocha": "7.2.0",
"nock": "12.0.3",
"nock": "13.0.11",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "11.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-instrumentation-http/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"codecov": "3.8.3",
"got": "9.6.0",
"mocha": "7.2.0",
"nock": "12.0.3",
"nock": "13.0.11",
"nyc": "15.1.0",
"request": "2.88.2",
"request-promise-native": "1.0.9",
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ describe('HttpInstrumentation', () => {
it('should have 1 ended span when request is aborted', async () => {
nock(`${protocol}://my.server.com`)
.get('/')
.socketDelay(50)
.delayConnection(50)
.reply(200, '<html></html>');

const promiseRequest = new Promise((resolve, reject) => {
Expand Down Expand Up @@ -640,7 +640,7 @@ describe('HttpInstrumentation', () => {
(resp: http.IncomingMessage) => {
let data = '';
resp.on('data', chunk => {
req.abort();
req.destroy(Error());
data += chunk;
});
resp.on('end', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ describe('HttpsInstrumentation', () => {
it('should have 1 ended span when request is aborted', async () => {
nock(`${protocol}://my.server.com`)
.get('/')
.socketDelay(50)
.delayConnection(50)
.reply(200, '<html></html>');

const promiseRequest = new Promise((resolve, reject) => {
Expand Down Expand Up @@ -625,7 +625,7 @@ describe('HttpsInstrumentation', () => {
(resp: http.IncomingMessage) => {
let data = '';
resp.on('data', chunk => {
req.abort();
req.destroy(Error());
data += chunk;
});
resp.on('end', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-resource-detector-aws/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@types/sinon": "10.0.2",
"codecov": "3.8.3",
"mocha": "7.2.0",
"nock": "12.0.3",
"nock": "13.0.11",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "11.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-resource-detector-gcp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@types/semver": "7.3.7",
"codecov": "3.8.3",
"mocha": "7.2.0",
"nock": "12.0.3",
"nock": "13.0.11",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"ts-mocha": "8.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-resources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@types/sinon": "10.0.2",
"codecov": "3.8.3",
"mocha": "7.2.0",
"nock": "12.0.3",
"nock": "13.0.11",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "11.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-sdk-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"gcp-metadata": "^4.1.4",
"istanbul-instrumenter-loader": "3.0.1",
"mocha": "7.2.0",
"nock": "12.0.3",
"nock": "13.0.11",
"nyc": "15.1.0",
"semver": "7.3.5",
"sinon": "11.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-semantic-conventions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"@types/sinon": "10.0.2",
"codecov": "3.8.3",
"mocha": "7.2.0",
"nock": "12.0.3",
"nock": "13.0.11",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "11.1.2",
Expand Down