Skip to content

Commit af74801

Browse files
committed
feat(core): Decouple scope.transactionName from root spans
1 parent 15092c4 commit af74801

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

packages/core/test/lib/utils/applyScopeDataToEvent.test.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ describe('applyScopeDataToEvent', () => {
187187
expect(event.transaction).toBe('/users/:id');
188188
});
189189

190+
<<<<<<< HEAD
190191
it('applies the root span name to transaction events', () => {
191192
const data: ScopeData = {
192193
eventProcessors: [],
@@ -219,6 +220,9 @@ describe('applyScopeDataToEvent', () => {
219220
});
220221

221222
it("doesn't apply the root span name to non-transaction events", () => {
223+
=======
224+
it("doesn't the root span name to non-transaction events", () => {
225+
>>>>>>> 45b7d13a2 (feat(core): Decouple `scope.transactionName` from root spans)
222226
const data: ScopeData = {
223227
eventProcessors: [],
224228
breadcrumbs: [],

0 commit comments

Comments
 (0)