From b449f5d8c62f1362f82b05ca4a40cc221637c7cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Og=C3=B3rek?= Date: Thu, 18 Jun 2020 15:02:27 +0200 Subject: [PATCH 1/2] Remove includes in favor or indexOf for IE support (#2683) --- packages/apm/src/integrations/tracing.ts | 2 +- packages/integrations/src/vue.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apm/src/integrations/tracing.ts b/packages/apm/src/integrations/tracing.ts index a6ce61fe4192..81d30a8189fc 100644 --- a/packages/apm/src/integrations/tracing.ts +++ b/packages/apm/src/integrations/tracing.ts @@ -628,7 +628,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/integrations/src/vue.ts b/packages/integrations/src/vue.ts index 0aebcb7da217..6d62d811ca5e 100644 --- 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) { From c6a73dce6539437b07663cac7c048201cb15dcb2 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Thu, 18 Jun 2020 09:02:57 -0400 Subject: [PATCH 2/2] build(hub): Remove unnecessary include from tsconfig (#2684) --- packages/hub/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/hub/tsconfig.json b/packages/hub/tsconfig.json index c5b01e1bb513..55b38e135ae2 100644 --- 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": ".",