Merge branch 'main' into main

open-telemetry · Dec 8, 2021 · 20d5396 · 20d5396
2 parents 4b90c33 + 09d3f68
commit 20d5396
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json
@@ -58,7 +58,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",

diff --git a/...rimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts b/...rimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts
@@ -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) => {
@@ -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', () => {

diff --git a/...imental/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts b/...imental/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts
@@ -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) => {
@@ -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', () => {

diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json
@@ -66,7 +66,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": "12.0.1",

diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json
@@ -49,7 +49,7 @@
     "@types/sinon": "10.0.6",
     "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": "12.0.1",

diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json
@@ -69,7 +69,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": "12.0.1",

diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json
@@ -56,7 +56,7 @@
     "@types/sinon": "10.0.6",
     "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": "12.0.1",

diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json
@@ -50,7 +50,7 @@
     "@types/sinon": "10.0.6",
     "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": "12.0.1",