fix(opentelemetry-instrumentation-http): handle null port in options

See the issue for details Closes issue #2947
open-telemetry · May 3, 2022 · 4b21ec3 · 4b21ec3
1 parent ddb0775
commit 4b21ec3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to experimental packages in this project will be documented
 ### :rocket: (Enhancement)
 
 ### :bug: (Bug Fix)
+* fix(opentelemetry-instrumentation-http): handle null ports in options #2948 @danielgblanco
 
 ### :books: (Refine Doc)
 

diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts b/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts
@@ -264,7 +264,8 @@ export const getRequestInfo = (
       pathname = url.parse(optionsParsed.path).pathname || '/';
     }
     origin = `${optionsParsed.protocol || 'http:'}//${
-      optionsParsed.host || `${optionsParsed.hostname}:${optionsParsed.port}`
+      optionsParsed.host ||
+      `${optionsParsed.hostname}${optionsParsed.port ? `:${optionsParsed.port}` : ''}`
     }`;
   }
 

diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts
@@ -72,11 +72,23 @@ describe('Utility', () => {
         ...urlParsed,
         pathname: undefined,
       };
+      const urlParsedWithUndefinedHostAndPort = {
+        ...urlParsed,
+        host: undefined,
+        port: undefined,
+      };
+      const urlParsedWithUndefinedHostAndNullPort = {
+        ...urlParsed,
+        host: undefined,
+        port: null,
+      };
       const whatWgUrl = new url.URL(webUrl);
       for (const param of [
         webUrl,
         urlParsed,
         urlParsedWithoutPathname,
+        urlParsedWithUndefinedHostAndPort,
+        urlParsedWithUndefinedHostAndNullPort,
         whatWgUrl,
       ]) {
         const result = utils.getRequestInfo(param);