fix: adding web worker and ssr support

open-telemetry · Mar 11, 2021 · 23cd68b · 23cd68b
1 parent 2f169a5
commit 23cd68b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/packages/opentelemetry-core/src/platform/browser/environment.ts b/packages/opentelemetry-core/src/platform/browser/environment.ts
@@ -25,7 +25,9 @@ import {
  * Gets the environment variables
  */
 export function getEnv(): Required<ENVIRONMENT> {
-  const _window = window as typeof window & RAW_ENVIRONMENT;
+  const _window = (typeof window === 'undefined'
+    ? self
+    : window) as typeof window & RAW_ENVIRONMENT;
   const globalEnv = parseEnvironment(_window);
   return Object.assign({}, DEFAULT_ENVIRONMENT, globalEnv);
 }
diff --git a/packages/opentelemetry-instrumentation-fetch/src/fetch.ts b/packages/opentelemetry-instrumentation-fetch/src/fetch.ts
@@ -32,7 +32,17 @@ import { VERSION } from './version';
 // hard to say how long it should really wait, seems like 300ms is
 // safe enough
 const OBSERVER_WAIT_TIME_MS = 300;
-const urlNormalizingA = document.createElement('a');
+
+// Used to normalize relative URLs
+let a: HTMLAnchorElement | undefined;
+const getUrlNormalizingAnchor = () => {
+  if (!a) {
+    a = document.createElement('a');
+  }
+
+  return a;
+};
+
 /**
  * FetchPlugin Config
  */
@@ -359,11 +369,12 @@ export class FetchInstrumentation extends InstrumentationBase<
 
     const observer: PerformanceObserver = new PerformanceObserver(list => {
       const perfObsEntries = list.getEntries() as PerformanceResourceTiming[];
-      urlNormalizingA.href = spanUrl;
+      const urlNormalizingAnchor = getUrlNormalizingAnchor();
+      urlNormalizingAnchor.href = spanUrl;
       perfObsEntries.forEach(entry => {
         if (
           entry.initiatorType === 'fetch' &&
-          entry.name === urlNormalizingA.href
+          entry.name === urlNormalizingAnchor.href
         ) {
           entries.push(entry);
         }

diff --git a/packages/opentelemetry-web/src/utils.ts b/packages/opentelemetry-web/src/utils.ts
@@ -29,7 +29,14 @@ import {
 import { HttpAttribute } from '@opentelemetry/semantic-conventions';
 
 // Used to normalize relative URLs
-const urlNormalizingA = document.createElement('a');
+let a: HTMLAnchorElement | undefined;
+const getUrlNormalizingAnchor = () => {
+  if (!a) {
+    a = document.createElement('a');
+  }
+
+  return a;
+};
 
 /**
  * Helper function to be able to use enum as typed key in type and in interface when using forEach
@@ -125,8 +132,9 @@ export function getResource(
   initiatorType?: string
 ): PerformanceResourceTimingInfo {
   // de-relativize the URL before usage (does no harm to absolute URLs)
-  urlNormalizingA.href = spanUrl;
-  spanUrl = urlNormalizingA.href;
+  const urlNormalizingAnchor = getUrlNormalizingAnchor();
+  urlNormalizingAnchor.href = spanUrl;
+  spanUrl = urlNormalizingAnchor.href;
 
   const filteredResources = filterResourcesForSpan(
     spanUrl,