Merge branch 'main' into browser-extension

open-telemetry · Jul 2, 2021 · 13b830b · 13b830b
2 parents 7920689 + 526f948
commit 13b830b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json
@@ -61,7 +61,6 @@
     "rimraf": "3.0.2",
     "sinon": "9.2.4",
     "ts-mocha": "8.0.0",
-    "ts-node": "9.1.1",
     "typescript": "4.3.5",
     "cassandra-driver": "4.6.3"
   },

diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json
@@ -61,7 +61,6 @@
     "rimraf": "3.0.2",
     "sinon": "9.2.4",
     "ts-mocha": "8.0.0",
-    "ts-node": "9.1.1",
     "typescript": "4.3.5"
   },
   "dependencies": {

diff --git a/plugins/web/opentelemetry-instrumentation-document-load/src/instrumentation.ts b/plugins/web/opentelemetry-instrumentation-document-load/src/instrumentation.ts
@@ -90,7 +90,7 @@ export class DocumentLoadInstrumentation extends InstrumentationBase<unknown> {
    * Collects information about performance and creates appropriate spans
    */
   private _collectPerformance() {
-    const metaElement = [...document.getElementsByTagName('meta')].find(
+    const metaElement = Array.from(document.getElementsByTagName('meta')).find(
       e => e.getAttribute('name') === TRACE_PARENT_HEADER
     );
     const entries = getPerformanceNavigationEntries();

diff --git a/tsconfig.base.esm.json b/tsconfig.base.esm.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.es5.json",
   "compilerOptions": {
     "module": "ES6",
     "moduleResolution": "node"

diff --git a/tsconfig.es5.json b/tsconfig.es5.json
@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "target": "es5"
+  }
+}