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

…#2948) Co-authored-by: Daniel Dyla <[email protected]>
open-telemetry · May 11, 2022 · ac578e9 · ac578e9
1 parent 97bc632
commit ac578e9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -14,6 +14,7 @@ All notable changes to experimental packages in this project will be documented
 
 ### :bug: (Bug Fix)
 
+* fix(opentelemetry-instrumentation-http): use correct origin when port is `null` #2948 @danielgblanco
 * fix(otlp-exporter-base): include esm and esnext in package files #2952 @dyladan
 
 ### :books: (Refine Doc)

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

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);