Merge branch 'master' into abhi/feat/check-performance-mark

getsentry · Jun 18, 2020 · 7653990 · 7653990
2 parents b8d1e9c + c6a73dc
commit 7653990
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/packages/apm/src/integrations/tracing.ts b/packages/apm/src/integrations/tracing.ts
@@ -630,7 +630,7 @@ export class Tracing implements Integration {
               resource.startTimestamp = timeOrigin + startTime;
               resource.endTimestamp = resource.startTimestamp + duration;
               // We remember the entry script end time to calculate the difference to the first init mark
-              if (entryScriptStartEndTime === undefined && (entryScriptSrc || '').includes(resourceName)) {
+              if (entryScriptStartEndTime === undefined && (entryScriptSrc || '').indexOf(resourceName) > -1) {
                 entryScriptStartEndTime = resource.endTimestamp;
               }
             }

diff --git a/packages/hub/tsconfig.json b/packages/hub/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "extends": "./tsconfig.build.json",
-  "include": ["src/**/*.ts", "test/**/*.ts", "../apm/test/span.test.ts"],
+  "include": ["src/**/*.ts", "test/**/*.ts"],
   "exclude": ["dist"],
   "compilerOptions": {
     "rootDir": ".",

diff --git a/packages/integrations/src/vue.ts b/packages/integrations/src/vue.ts
@@ -250,7 +250,7 @@ export class Vue implements Integration {
     const childHandler = (hook: Hook, operation: Operation) => {
       // Skip components that we don't want to track to minimize the noise and give a more granular control to the user
       const shouldTrack = Array.isArray(this._options.tracingOptions.trackComponents)
-        ? this._options.tracingOptions.trackComponents.includes(name)
+        ? this._options.tracingOptions.trackComponents.indexOf(name) > -1
         : this._options.tracingOptions.trackComponents;
 
       if (!this._rootSpan || !shouldTrack) {