Skip to content

Commit 0a32bf5

Browse files
authored
Merge branch 'master' into abhi/ref/react-profiler
2 parents 2743af0 + c6a73dc commit 0a32bf5

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

packages/apm/src/integrations/tracing.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ export class Tracing implements Integration {
629629
resource.startTimestamp = timeOrigin + startTime;
630630
resource.endTimestamp = resource.startTimestamp + duration;
631631
// We remember the entry script end time to calculate the difference to the first init mark
632-
if (entryScriptStartEndTime === undefined && (entryScriptSrc || '').includes(resourceName)) {
632+
if (entryScriptStartEndTime === undefined && (entryScriptSrc || '').indexOf(resourceName) > -1) {
633633
entryScriptStartEndTime = resource.endTimestamp;
634634
}
635635
}

packages/hub/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"extends": "./tsconfig.build.json",
3-
"include": ["src/**/*.ts", "test/**/*.ts", "../apm/test/span.test.ts"],
3+
"include": ["src/**/*.ts", "test/**/*.ts"],
44
"exclude": ["dist"],
55
"compilerOptions": {
66
"rootDir": ".",

packages/integrations/src/vue.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ export class Vue implements Integration {
250250
const childHandler = (hook: Hook, operation: Operation) => {
251251
// Skip components that we don't want to track to minimize the noise and give a more granular control to the user
252252
const shouldTrack = Array.isArray(this._options.tracingOptions.trackComponents)
253-
? this._options.tracingOptions.trackComponents.includes(name)
253+
? this._options.tracingOptions.trackComponents.indexOf(name) > -1
254254
: this._options.tracingOptions.trackComponents;
255255

256256
if (!this._rootSpan || !shouldTrack) {

0 commit comments

Comments
 (0)