Merge branch 'main' into tree-shaking

open-telemetry · Oct 19, 2022 · cd7d823 · cd7d823
2 parents 1a1a3ae + 6ede1ee
commit cd7d823
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -24,6 +24,9 @@ All notable changes to experimental packages in this project will be documented
 
 ### :house: (Internal)
 
+* ci(instrumentation-http): remove got devDependency
+  [#3347](https://github.com/open-telemetry/opentelemetry-js/issues/3347) @dyladan
+
 ## 0.33.0
 
 ### :boom: Breaking Change

diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json
@@ -49,7 +49,6 @@
     "@opentelemetry/context-async-hooks": "1.7.0",
     "@opentelemetry/sdk-trace-base": "1.7.0",
     "@opentelemetry/sdk-trace-node": "1.7.0",
-    "@types/got": "9.6.12",
     "@types/mocha": "10.0.0",
     "@types/node": "18.6.5",
     "@types/request-promise-native": "1.0.18",
@@ -58,7 +57,6 @@
     "@types/superagent": "4.1.13",
     "axios": "0.24.0",
     "codecov": "3.8.3",
-    "got": "9.6.0",
     "mocha": "10.0.0",
     "nock": "13.0.11",
     "nyc": "15.1.0",

diff --git a/...imental/packages/opentelemetry-instrumentation-http/test/functionals/http-package.test.ts b/...imental/packages/opentelemetry-instrumentation-http/test/functionals/http-package.test.ts
@@ -35,7 +35,8 @@ instrumentation.disable();
 import * as http from 'http';
 import * as request from 'request-promise-native';
 import * as superagent from 'superagent';
-import * as got from 'got';
+// Temporarily removed. See https://github.com/open-telemetry/opentelemetry-js/issues/3344
+// import * as got from 'got';
 import * as nock from 'nock';
 import axios, { AxiosResponse } from 'axios';
 
@@ -80,7 +81,7 @@ describe('Packages', () => {
     [
       { name: 'axios', httpPackage: axios }, //keep first
       { name: 'superagent', httpPackage: superagent },
-      { name: 'got', httpPackage: { get: (url: string) => got(url) } },
+      // { name: 'got', httpPackage: { get: (url: string) => got(url) } },
       {
         name: 'request',
         httpPackage: { get: (url: string) => request(url) },

diff --git a/...mental/packages/opentelemetry-instrumentation-http/test/functionals/https-package.test.ts b/...mental/packages/opentelemetry-instrumentation-http/test/functionals/https-package.test.ts
@@ -35,7 +35,8 @@ instrumentation.disable();
 import * as http from 'http';
 import * as request from 'request-promise-native';
 import * as superagent from 'superagent';
-import * as got from 'got';
+// Temporarily removed. See https://github.com/open-telemetry/opentelemetry-js/issues/3344
+// import * as got from 'got';
 import * as nock from 'nock';
 import axios, { AxiosResponse } from 'axios';
 
@@ -80,7 +81,7 @@ describe('Packages', () => {
     [
       { name: 'axios', httpPackage: axios }, //keep first
       { name: 'superagent', httpPackage: superagent },
-      { name: 'got', httpPackage: { get: (url: string) => got(url) } },
+      // { name: 'got', httpPackage: { get: (url: string) => got(url) } },
       {
         name: 'request',
         httpPackage: { get: (url: string) => request(url) },