Merge branch 'master' of github.com:getsentry/sentry-javascript

Author: HazAT

packages/node/src/transports/http.ts

@@ -1,7 +1,6 @@
 import { Event, Response, TransportOptions } from '@sentry/types';
 import { SentryError } from '@sentry/utils';
 import * as http from 'http';
-import * as HttpsProxyAgent from 'https-proxy-agent';
 
 import { BaseTransport } from './base';
 
@@ -10,11 +9,10 @@ export class HTTPTransport extends BaseTransport {
   /** Create a new instance and set this.agent */
   public constructor(public options: TransportOptions) {
     super(options);
-    this.module = http;
     const proxy = options.httpProxy || process.env.http_proxy;
+    this.module = http;
     this.client = proxy
-      ? // tslint:disable-next-line:no-unsafe-any
-        (new HttpsProxyAgent(proxy) as http.Agent)
+      ? (new (require('https-proxy-agent'))(proxy) as http.Agent) // tslint:disable-line:no-unsafe-any
       : new http.Agent({ keepAlive: false, maxSockets: 30, timeout: 2000 });
   }
 

packages/node/src/transports/https.ts

@@ -1,7 +1,6 @@
 import { Event, Response, TransportOptions } from '@sentry/types';
 import { SentryError } from '@sentry/utils';
 import * as https from 'https';
-import * as HttpsProxyAgent from 'https-proxy-agent';
 
 import { BaseTransport } from './base';
 
@@ -10,11 +9,10 @@ export class HTTPSTransport extends BaseTransport {
   /** Create a new instance and set this.agent */
   public constructor(public options: TransportOptions) {
     super(options);
-    this.module = https;
     const proxy = options.httpsProxy || options.httpProxy || process.env.https_proxy || process.env.http_proxy;
+    this.module = https;
     this.client = proxy
-      ? // tslint:disable-next-line:no-unsafe-any
-        (new HttpsProxyAgent(proxy) as https.Agent)
+      ? (new (require('https-proxy-agent'))(proxy) as https.Agent) // tslint:disable-line:no-unsafe-any
       : new https.Agent({ keepAlive: false, maxSockets: 30, timeout: 2000 });
   }