fix(plugin-https): typings

Signed-off-by: Olivier Albertini <[email protected]>
open-telemetry · Nov 16, 2019 · c4b33c1 · c4b33c1
1 parent cf5bed1
commit c4b33c1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/packages/opentelemetry-plugin-http/src/types.ts b/packages/opentelemetry-plugin-http/src/types.ts
@@ -41,7 +41,8 @@ export type HttpRequestArgs = Array<HttpCallbackOptional | RequestSignature>;
 
 export type ParsedRequestOptions = (
   | http.RequestOptions
-  | Omit<url.UrlWithParsedQuery, 'query'>) & {
+  | Omit<url.UrlWithParsedQuery, 'query'>
+) & {
   protocol?: string | null;
   query?: string | ParsedUrlQuery | null;
 };

diff --git a/packages/opentelemetry-plugin-http/test/utils/assertSpan.ts b/packages/opentelemetry-plugin-http/test/utils/assertSpan.ts
@@ -33,7 +33,7 @@ export const assertSpan = (
     hostname: string;
     pathname: string;
     reqHeaders?: http.OutgoingHttpHeaders;
-    path?: string | null;
+    path?: string | null;
     forceStatus?: Status;
     component: string;
   }

diff --git a/packages/opentelemetry-plugin-http/test/utils/httpRequest.ts b/packages/opentelemetry-plugin-http/test/utils/httpRequest.ts
@@ -30,11 +30,11 @@ export const httpRequest = {
   }> => {
     const _options =
       typeof options === 'string'
-        ? Object.assign(url.parse(options), {
+        ? (Object.assign(url.parse(options), {
             headers: {
               'user-agent': 'http-plugin-test',
             },
-          }) as RequestOptions
+          }) as RequestOptions)
         : options;
     return new Promise((resolve, reject) => {
       const req = http.get(_options, (resp: http.IncomingMessage) => {

diff --git a/packages/opentelemetry-plugin-https/test/integrations/https-enable.test.ts b/packages/opentelemetry-plugin-https/test/integrations/https-enable.test.ts
@@ -31,6 +31,7 @@ import { assertSpan } from '../utils/assertSpan';
 import { DummyPropagation } from '../utils/DummyPropagation';
 import { httpsRequest } from '../utils/httpsRequest';
 import * as utils from '../utils/utils';
+import { RequestOptions } from 'https';
 
 const serverPort = 42345;
 const hostname = 'localhost';
@@ -140,7 +141,7 @@ describe('HttpsPlugin Integration tests', () => {
       const options = Object.assign(
         { headers: { Expect: '100-continue' } },
         url.parse('https://google.fr/')
-      );
+      ) as RequestOptions;
 
       const result = await httpsRequest.get(options);
       spans = memoryExporter.getFinishedSpans();

diff --git a/packages/opentelemetry-plugin-https/test/utils/assertSpan.ts b/packages/opentelemetry-plugin-https/test/utils/assertSpan.ts
@@ -35,7 +35,7 @@ export const assertSpan = (
     hostname: string;
     pathname: string;
     reqHeaders?: http.OutgoingHttpHeaders;
-    path?: string;
+    path?: string | null;
     component: string;
   }
 ) => {

diff --git a/packages/opentelemetry-plugin-https/test/utils/httpsRequest.ts b/packages/opentelemetry-plugin-https/test/utils/httpsRequest.ts
@@ -23,7 +23,7 @@ process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 
 export const httpsRequest = {
   get: (
-    options: string | RequestOptions
+    options: string | RequestOptions | url.URL
   ): Promise<{
     data: string;
     statusCode: number | undefined;
@@ -33,11 +33,11 @@ export const httpsRequest = {
   }> => {
     const _options =
       typeof options === 'string'
-        ? Object.assign(url.parse(options), {
+        ? (Object.assign(url.parse(options), {
             headers: {
               'user-agent': 'https-plugin-test',
             },
-          })
+          }) as RequestOptions)
         : options;
     return new Promise((resolve, reject) => {
       const req = https.get(_options, (resp: http.IncomingMessage) => {