Skip to content

Commit 9163202

Browse files
antonisantonis
committed
Removes thead.id
1 parent 7820367 commit 9163202

File tree

5 files changed

+5
-45
lines changed

5 files changed

+5
-45
lines changed

‎packages/core/src/js/tracing/span.ts‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,6 @@ export function addDefaultOpForSpanFrom(client: Client): void {
155155
});
156156
}
157157

158-
export const SPAN_THREAD_ID = 'thread.id';
159-
export const SPAN_THREAD_ID_MAIN = 1;
160-
export const SPAN_THREAD_ID_JAVASCRIPT = 2;
161158
export const SPAN_THREAD_NAME = 'thread.name';
162159
export const SPAN_THREAD_NAME_MAIN = 'main';
163160
export const SPAN_THREAD_NAME_JAVASCRIPT = 'javascript';
@@ -168,8 +165,7 @@ export const SPAN_THREAD_NAME_JAVASCRIPT = 'javascript';
168165
*/
169166
export function addThreadInfoToSpan(client: Client): void {
170167
client.on('spanStart', (span: Span) => {
171-
if (!spanToJSON(span).data?.[SPAN_THREAD_ID]) {
172-
span.setAttribute(SPAN_THREAD_ID, SPAN_THREAD_ID_JAVASCRIPT);
168+
if (!spanToJSON(span).data?.[SPAN_THREAD_NAME]) {
173169
span.setAttribute(SPAN_THREAD_NAME, SPAN_THREAD_NAME_JAVASCRIPT);
174170
}
175171
});
@@ -180,7 +176,6 @@ export function addThreadInfoToSpan(client: Client): void {
180176
*/
181177
export function setMainThreadInfo(spanJSON: SpanJSON): SpanJSON {
182178
spanJSON.data = spanJSON.data || {};
183-
spanJSON.data[SPAN_THREAD_ID] = SPAN_THREAD_ID_MAIN;
184179
spanJSON.data[SPAN_THREAD_NAME] = SPAN_THREAD_NAME_MAIN;
185180
return spanJSON;
186181
}

‎packages/core/test/tracing/integrations/appStart.test.ts‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,7 @@ import {
2727
setRootComponentCreationTimestampMs,
2828
} from '../../../src/js/tracing/integrations/appStart';
2929
import { SPAN_ORIGIN_AUTO_APP_START, SPAN_ORIGIN_MANUAL_APP_START } from '../../../src/js/tracing/origin';
30-
import {
31-
SPAN_THREAD_ID,
32-
SPAN_THREAD_ID_MAIN,
33-
SPAN_THREAD_NAME,
34-
SPAN_THREAD_NAME_MAIN,
35-
} from '../../../src/js/tracing/span';
30+
import { SPAN_THREAD_NAME, SPAN_THREAD_NAME_MAIN } from '../../../src/js/tracing/span';
3631
import { getTimeOriginMilliseconds } from '../../../src/js/tracing/utils';
3732
import { RN_GLOBAL_OBJ } from '../../../src/js/utils/worldwide';
3833
import { NATIVE } from '../../../src/js/wrapper';
@@ -258,7 +253,6 @@ describe('App Start Integration', () => {
258253
data: {
259254
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: appStartRootSpan!.op,
260255
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: SPAN_ORIGIN_AUTO_APP_START,
261-
[SPAN_THREAD_ID]: SPAN_THREAD_ID_MAIN,
262256
[SPAN_THREAD_NAME]: SPAN_THREAD_NAME_MAIN,
263257
},
264258
}),
@@ -620,7 +614,6 @@ describe('App Start Integration', () => {
620614
data: {
621615
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: appStartRootSpan!.op,
622616
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: SPAN_ORIGIN_AUTO_APP_START,
623-
[SPAN_THREAD_ID]: SPAN_THREAD_ID_MAIN,
624617
[SPAN_THREAD_NAME]: SPAN_THREAD_NAME_MAIN,
625618
},
626619
}),

‎packages/core/test/tracing/reactnativenavigation.test.ts‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,7 @@ import {
3232
SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
3333
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
3434
} from '../../src/js/tracing/semanticAttributes';
35-
import {
36-
SPAN_THREAD_ID,
37-
SPAN_THREAD_ID_JAVASCRIPT,
38-
SPAN_THREAD_NAME,
39-
SPAN_THREAD_NAME_JAVASCRIPT,
40-
} from '../../src/js/tracing/span';
35+
import { SPAN_THREAD_NAME, SPAN_THREAD_NAME_JAVASCRIPT } from '../../src/js/tracing/span';
4136
import { getDefaultTestClientOptions, TestClient } from '../mocks/client';
4237

4338
interface MockEventsRegistry extends EventsRegistry {
@@ -93,7 +88,6 @@ describe('React Native Navigation Instrumentation', () => {
9388
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
9489
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
9590
[SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON]: 'idleTimeout',
96-
[SPAN_THREAD_ID]: SPAN_THREAD_ID_JAVASCRIPT,
9791
[SPAN_THREAD_NAME]: SPAN_THREAD_NAME_JAVASCRIPT,
9892
},
9993
}),
@@ -139,7 +133,6 @@ describe('React Native Navigation Instrumentation', () => {
139133
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
140134
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
141135
[SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON]: 'idleTimeout',
142-
[SPAN_THREAD_ID]: SPAN_THREAD_ID_JAVASCRIPT,
143136
[SPAN_THREAD_NAME]: SPAN_THREAD_NAME_JAVASCRIPT,
144137
},
145138
}),
@@ -216,7 +209,6 @@ describe('React Native Navigation Instrumentation', () => {
216209
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
217210
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
218211
[SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON]: 'idleTimeout',
219-
[SPAN_THREAD_ID]: SPAN_THREAD_ID_JAVASCRIPT,
220212
[SPAN_THREAD_NAME]: SPAN_THREAD_NAME_JAVASCRIPT,
221213
},
222214
}),
@@ -306,7 +298,6 @@ describe('React Native Navigation Instrumentation', () => {
306298
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
307299
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
308300
[SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON]: 'idleTimeout',
309-
[SPAN_THREAD_ID]: SPAN_THREAD_ID_JAVASCRIPT,
310301
[SPAN_THREAD_NAME]: SPAN_THREAD_NAME_JAVASCRIPT,
311302
},
312303
}),
@@ -356,7 +347,6 @@ describe('React Native Navigation Instrumentation', () => {
356347
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
357348
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
358349
[SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON]: 'idleTimeout',
359-
[SPAN_THREAD_ID]: SPAN_THREAD_ID_JAVASCRIPT,
360350
[SPAN_THREAD_NAME]: SPAN_THREAD_NAME_JAVASCRIPT,
361351
},
362352
}),

‎packages/core/test/tracing/reactnavigation.test.ts‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,7 @@ import {
2020
SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
2121
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
2222
} from '../../src/js/tracing/semanticAttributes';
23-
import {
24-
DEFAULT_NAVIGATION_SPAN_NAME,
25-
SPAN_THREAD_ID,
26-
SPAN_THREAD_ID_JAVASCRIPT,
27-
SPAN_THREAD_NAME,
28-
SPAN_THREAD_NAME_JAVASCRIPT,
29-
} from '../../src/js/tracing/span';
23+
import { DEFAULT_NAVIGATION_SPAN_NAME, SPAN_THREAD_NAME, SPAN_THREAD_NAME_JAVASCRIPT } from '../../src/js/tracing/span';
3024
import { RN_GLOBAL_OBJ } from '../../src/js/utils/worldwide';
3125
import { getDefaultTestClientOptions, TestClient } from '../mocks/client';
3226
import { NATIVE } from '../mockWrapper';
@@ -89,7 +83,6 @@ describe('ReactNavigationInstrumentation', () => {
8983
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
9084
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
9185
[SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON]: 'idleTimeout',
92-
[SPAN_THREAD_ID]: SPAN_THREAD_ID_JAVASCRIPT,
9386
[SPAN_THREAD_NAME]: SPAN_THREAD_NAME_JAVASCRIPT,
9487
},
9588
}),
@@ -200,7 +193,6 @@ describe('ReactNavigationInstrumentation', () => {
200193
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
201194
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
202195
[SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON]: 'idleTimeout',
203-
[SPAN_THREAD_ID]: SPAN_THREAD_ID_JAVASCRIPT,
204196
[SPAN_THREAD_NAME]: SPAN_THREAD_NAME_JAVASCRIPT,
205197
},
206198
}),
@@ -239,7 +231,6 @@ describe('ReactNavigationInstrumentation', () => {
239231
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
240232
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
241233
[SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON]: 'idleTimeout',
242-
[SPAN_THREAD_ID]: SPAN_THREAD_ID_JAVASCRIPT,
243234
[SPAN_THREAD_NAME]: SPAN_THREAD_NAME_JAVASCRIPT,
244235
},
245236
}),
@@ -280,7 +271,6 @@ describe('ReactNavigationInstrumentation', () => {
280271
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
281272
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
282273
[SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON]: 'idleTimeout',
283-
[SPAN_THREAD_ID]: SPAN_THREAD_ID_JAVASCRIPT,
284274
[SPAN_THREAD_NAME]: SPAN_THREAD_NAME_JAVASCRIPT,
285275
},
286276
}),

‎packages/core/test/tracing/reactnavigation.ttid.test.tsx‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { startSpanManual } from '../../src/js';
1616
import { TimeToFullDisplay, TimeToInitialDisplay } from '../../src/js/tracing';
1717
import { _setAppStartEndTimestampMs } from '../../src/js/tracing/integrations/appStart';
1818
import { SPAN_ORIGIN_AUTO_NAVIGATION_REACT_NAVIGATION, SPAN_ORIGIN_AUTO_UI_TIME_TO_DISPLAY, SPAN_ORIGIN_MANUAL_UI_TIME_TO_DISPLAY } from '../../src/js/tracing/origin';
19-
import { SPAN_THREAD_ID, SPAN_THREAD_ID_JAVASCRIPT, SPAN_THREAD_NAME, SPAN_THREAD_NAME_JAVASCRIPT } from '../../src/js/tracing/span';
19+
import { SPAN_THREAD_NAME, SPAN_THREAD_NAME_JAVASCRIPT } from '../../src/js/tracing/span';
2020
import { isHermesEnabled, notWeb } from '../../src/js/utils/environment';
2121
import { createSentryFallbackEventEmitter } from '../../src/js/utils/sentryeventemitterfallback';
2222
import { RN_GLOBAL_OBJ } from '../../src/js/utils/worldwide';
@@ -81,7 +81,6 @@ describe('React Navigation - TTID', () => {
8181
data: {
8282
'sentry.op': 'ui.load.initial_display',
8383
'sentry.origin': SPAN_ORIGIN_AUTO_UI_TIME_TO_DISPLAY,
84-
[SPAN_THREAD_ID]: SPAN_THREAD_ID_JAVASCRIPT,
8584
[SPAN_THREAD_NAME]: SPAN_THREAD_NAME_JAVASCRIPT,
8685
},
8786
description: 'New Screen initial display',
@@ -113,7 +112,6 @@ describe('React Navigation - TTID', () => {
113112
data: {
114113
'sentry.op': 'ui.load.initial_display',
115114
'sentry.origin': SPAN_ORIGIN_AUTO_UI_TIME_TO_DISPLAY,
116-
[SPAN_THREAD_ID]: SPAN_THREAD_ID_JAVASCRIPT,
117115
[SPAN_THREAD_NAME]: SPAN_THREAD_NAME_JAVASCRIPT,
118116
},
119117
description: 'New Screen initial display',
@@ -151,7 +149,6 @@ describe('React Navigation - TTID', () => {
151149
data: {
152150
'sentry.op': 'ui.load.initial_display',
153151
'sentry.origin': SPAN_ORIGIN_AUTO_UI_TIME_TO_DISPLAY,
154-
[SPAN_THREAD_ID]: SPAN_THREAD_ID_JAVASCRIPT,
155152
[SPAN_THREAD_NAME]: SPAN_THREAD_NAME_JAVASCRIPT,
156153
},
157154
description: 'New Screen initial display',
@@ -210,7 +207,6 @@ describe('React Navigation - TTID', () => {
210207
'sentry.op': 'navigation.processing',
211208
'sentry.origin': SPAN_ORIGIN_AUTO_NAVIGATION_REACT_NAVIGATION,
212209
'sentry.source': 'custom',
213-
[SPAN_THREAD_ID]: SPAN_THREAD_ID_JAVASCRIPT,
214210
[SPAN_THREAD_NAME]: SPAN_THREAD_NAME_JAVASCRIPT,
215211
},
216212
description: 'Navigation dispatch to screen New Screen mounted',
@@ -240,7 +236,6 @@ describe('React Navigation - TTID', () => {
240236
'sentry.op': 'navigation.processing',
241237
'sentry.origin': SPAN_ORIGIN_AUTO_NAVIGATION_REACT_NAVIGATION,
242238
'sentry.source': 'custom',
243-
[SPAN_THREAD_ID]: SPAN_THREAD_ID_JAVASCRIPT,
244239
[SPAN_THREAD_NAME]: SPAN_THREAD_NAME_JAVASCRIPT,
245240
},
246241
description: 'Navigation dispatch to screen Initial Screen mounted',
@@ -272,7 +267,6 @@ describe('React Navigation - TTID', () => {
272267
data: {
273268
'sentry.op': 'ui.load.initial_display',
274269
'sentry.origin': SPAN_ORIGIN_AUTO_UI_TIME_TO_DISPLAY,
275-
[SPAN_THREAD_ID]: SPAN_THREAD_ID_JAVASCRIPT,
276270
[SPAN_THREAD_NAME]: SPAN_THREAD_NAME_JAVASCRIPT,
277271
},
278272
description: 'Initial Screen initial display',
@@ -308,7 +302,6 @@ describe('React Navigation - TTID', () => {
308302
data: {
309303
'sentry.op': 'ui.load.full_display',
310304
'sentry.origin': SPAN_ORIGIN_MANUAL_UI_TIME_TO_DISPLAY,
311-
[SPAN_THREAD_ID]: SPAN_THREAD_ID_JAVASCRIPT,
312305
[SPAN_THREAD_NAME]: SPAN_THREAD_NAME_JAVASCRIPT,
313306
},
314307
description: 'Time To Full Display',
@@ -386,7 +379,6 @@ describe('React Navigation - TTID', () => {
386379
data: {
387380
'sentry.op': 'ui.load.initial_display',
388381
'sentry.origin': SPAN_ORIGIN_AUTO_UI_TIME_TO_DISPLAY,
389-
[SPAN_THREAD_ID]: SPAN_THREAD_ID_JAVASCRIPT,
390382
[SPAN_THREAD_NAME]: SPAN_THREAD_NAME_JAVASCRIPT,
391383
},
392384
description: 'New Screen initial display',

0 commit comments

Comments
 (0)