Skip to content

Commit d89400b

Browse files
Removed modal event handlers (duplicates shell navigating stuff)
1 parent ac1b0b8 commit d89400b

4 files changed

Lines changed: 9 additions & 185 deletions

File tree

‎src/Sentry.Maui/Internal/MauiEventsBinder.cs‎

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -504,41 +504,17 @@ private void OnApplicationOnPageAppearing(object? sender, Page page) =>
504504
private void OnApplicationOnPageDisappearing(object? sender, Page page) =>
505505
_hub.AddBreadcrumbForEvent(_options, sender, nameof(Application.PageDisappearing), NavigationType, NavigationCategory, data => data.AddElementInfo(_options, page, nameof(Page)));
506506

507-
private void OnApplicationOnModalPushing(object? sender, ModalPushingEventArgs e)
508-
{
507+
private void OnApplicationOnModalPushing(object? sender, ModalPushingEventArgs e) =>
509508
_hub.AddBreadcrumbForEvent(_options, sender, nameof(Application.ModalPushing), NavigationType, NavigationCategory, data => data.AddElementInfo(_options, e.Modal, nameof(e.Modal)));
510-
if (_options.EnableAutoTransactions)
511-
{
512-
StartNavigationTransaction(e.Modal.GetType().Name);
513-
}
514-
}
515509

516-
private void OnApplicationOnModalPushed(object? sender, ModalPushedEventArgs e)
517-
{
510+
private void OnApplicationOnModalPushed(object? sender, ModalPushedEventArgs e) =>
518511
_hub.AddBreadcrumbForEvent(_options, sender, nameof(Application.ModalPushed), NavigationType, NavigationCategory, data => data.AddElementInfo(_options, e.Modal, nameof(e.Modal)));
519-
if (_options.EnableAutoTransactions)
520-
{
521-
FinishNavigationSpanOrTransaction();
522-
}
523-
}
524512

525-
private void OnApplicationOnModalPopping(object? sender, ModalPoppingEventArgs e)
526-
{
513+
private void OnApplicationOnModalPopping(object? sender, ModalPoppingEventArgs e) =>
527514
_hub.AddBreadcrumbForEvent(_options, sender, nameof(Application.ModalPopping), NavigationType, NavigationCategory, data => data.AddElementInfo(_options, e.Modal, nameof(e.Modal)));
528-
if (_options.EnableAutoTransactions)
529-
{
530-
StartNavigationTransaction(e.Modal.GetType().Name);
531-
}
532-
}
533515

534-
private void OnApplicationOnModalPopped(object? sender, ModalPoppedEventArgs e)
535-
{
516+
private void OnApplicationOnModalPopped(object? sender, ModalPoppedEventArgs e) =>
536517
_hub.AddBreadcrumbForEvent(_options, sender, nameof(Application.ModalPopped), NavigationType, NavigationCategory, data => data.AddElementInfo(_options, e.Modal, nameof(e.Modal)));
537-
if (_options.EnableAutoTransactions)
538-
{
539-
FinishNavigationSpanOrTransaction();
540-
}
541-
}
542518
private void OnApplicationOnRequestedThemeChanged(object? sender, AppThemeChangedEventArgs e) =>
543519
_hub.AddBreadcrumbForEvent(_options, sender, nameof(Application.RequestedThemeChanged), SystemType, RenderingCategory, data => data.Add(nameof(e.RequestedTheme), e.RequestedTheme.ToString()));
544520

‎test/Sentry.Maui.Tests/MauiEventsBinderTests.Application.cs‎

Lines changed: 0 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -196,100 +196,6 @@ public static IEnumerable<object[]> ApplicationModalEventsData
196196
}
197197
}
198198

199-
[Fact]
200-
public void Application_ModalPushing_StartsNavigationTransaction()
201-
{
202-
// Arrange
203-
var application = MockApplication.Create();
204-
_fixture.Binder.HandleApplicationEvents(application);
205-
var mockTransaction = Substitute.For<ITransactionTracer>();
206-
_fixture.Hub.StartTransaction(Arg.Any<ITransactionContext>(), Arg.Any<TimeSpan?>())
207-
.Returns(mockTransaction);
208-
var modalPage = new ContentPage { StyleId = "TestModalPage" };
209-
210-
// Act
211-
application.RaiseEvent(nameof(Application.ModalPushing), new ModalPushingEventArgs(modalPage));
212-
213-
// Assert
214-
_fixture.Hub.Received(1).StartTransaction(
215-
Arg.Is<ITransactionContext>(c => c.Name == nameof(ContentPage) && c.Operation == "ui.load"),
216-
Arg.Any<TimeSpan?>());
217-
}
218-
219-
[Fact]
220-
public void Application_ModalPushing_DisabledOption_DoesNotStartTransaction()
221-
{
222-
// Arrange
223-
_fixture.Options.EnableAutoTransactions = false;
224-
var application = MockApplication.Create();
225-
_fixture.Binder.HandleApplicationEvents(application);
226-
var modalPage = new ContentPage { StyleId = "TestModalPage" };
227-
228-
// Act
229-
application.RaiseEvent(nameof(Application.ModalPushing), new ModalPushingEventArgs(modalPage));
230-
231-
// Assert
232-
_fixture.Hub.DidNotReceive().StartTransaction(Arg.Any<ITransactionContext>(), Arg.Any<TimeSpan?>());
233-
}
234-
235-
[Fact]
236-
public void Application_ModalPushed_StandaloneTransaction_NotExplicitlyFinished()
237-
{
238-
// Arrange
239-
var application = MockApplication.Create();
240-
_fixture.Binder.HandleApplicationEvents(application);
241-
var mockTransaction = Substitute.For<ITransactionTracer>();
242-
mockTransaction.IsFinished.Returns(false);
243-
_fixture.Hub.StartTransaction(Arg.Any<ITransactionContext>(), Arg.Any<TimeSpan?>())
244-
.Returns(mockTransaction);
245-
var modalPage = new ContentPage { StyleId = "TestModalPage" };
246-
247-
// ModalPushing starts the transaction
248-
application.RaiseEvent(nameof(Application.ModalPushing), new ModalPushingEventArgs(modalPage));
249-
250-
// Act - ModalPushed does NOT explicitly finish a standalone transaction
251-
application.RaiseEvent(nameof(Application.ModalPushed), new ModalPushedEventArgs(modalPage));
252-
253-
// Assert - idle timeout will handle: capture if it has children, discard if not
254-
mockTransaction.DidNotReceive().Finish(Arg.Any<SpanStatus>());
255-
}
256-
257-
[Fact]
258-
public void Application_ModalPopping_StartsNavigationTransaction()
259-
{
260-
// Arrange
261-
var application = MockApplication.Create();
262-
_fixture.Binder.HandleApplicationEvents(application);
263-
var mockTransaction = Substitute.For<ITransactionTracer>();
264-
_fixture.Hub.StartTransaction(Arg.Any<ITransactionContext>(), Arg.Any<TimeSpan?>())
265-
.Returns(mockTransaction);
266-
var modalPage = new ContentPage { StyleId = "TestModalPage" };
267-
268-
// Act
269-
application.RaiseEvent(nameof(Application.ModalPopping), new ModalPoppingEventArgs(modalPage));
270-
271-
// Assert
272-
_fixture.Hub.Received(1).StartTransaction(
273-
Arg.Is<ITransactionContext>(c => c.Name == nameof(ContentPage) && c.Operation == "ui.load"),
274-
Arg.Any<TimeSpan?>());
275-
}
276-
277-
[Fact]
278-
public void Application_ModalPopping_DisabledOption_DoesNotStartTransaction()
279-
{
280-
// Arrange
281-
_fixture.Options.EnableAutoTransactions = false;
282-
var application = MockApplication.Create();
283-
_fixture.Binder.HandleApplicationEvents(application);
284-
var modalPage = new ContentPage { StyleId = "TestModalPage" };
285-
286-
// Act
287-
application.RaiseEvent(nameof(Application.ModalPopping), new ModalPoppingEventArgs(modalPage));
288-
289-
// Assert
290-
_fixture.Hub.DidNotReceive().StartTransaction(Arg.Any<ITransactionContext>(), Arg.Any<TimeSpan?>());
291-
}
292-
293199
[Fact]
294200
public void Application_RequestedThemeChanged_AddsBreadcrumb()
295201
{

‎test/Sentry.Maui.Tests/MauiEventsBinderTests.Button.cs‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -316,63 +316,6 @@ public void Button_Pressed_ThenShellNavigating_NavigationIsChildSpanOfClick()
316316
clickTransaction.Received(1).StartChild("ui.load");
317317
}
318318

319-
[Fact]
320-
public void Button_Pressed_ThenModalPushing_NavigationIsChildSpanOfClick()
321-
{
322-
// Arrange
323-
var application = MockApplication.Create();
324-
_fixture.Binder.HandleApplicationEvents(application);
325-
var button = new Button { AutomationId = "my-btn" };
326-
_fixture.Binder.OnApplicationOnDescendantAdded(null, new ElementEventArgs(button));
327-
328-
var navSpan = Substitute.For<ISpan>();
329-
var clickTransaction = Substitute.For<ITransactionTracer>();
330-
clickTransaction.IsFinished.Returns(false);
331-
clickTransaction.StartChild(Arg.Any<string>()).Returns(navSpan);
332-
_fixture.Hub.StartTransaction(Arg.Any<ITransactionContext>(), Arg.Any<TimeSpan?>())
333-
.Returns(clickTransaction);
334-
335-
var modalPage = new ContentPage { StyleId = "TestModalPage" };
336-
337-
// Act - press button, then modal starts pushing
338-
button.RaiseEvent(nameof(Button.Pressed), EventArgs.Empty);
339-
application.RaiseEvent(nameof(Application.ModalPushing), new ModalPushingEventArgs(modalPage));
340-
341-
// Assert - only one transaction created (click), navigation is a child span
342-
_fixture.Hub.Received(1).StartTransaction(Arg.Any<ITransactionContext>(), Arg.Any<TimeSpan?>());
343-
clickTransaction.Received(1).StartChild("ui.load");
344-
}
345-
346-
[Fact]
347-
public void Button_Pressed_ModalPushed_FinishesSpanNotTransaction()
348-
{
349-
// Arrange
350-
var application = MockApplication.Create();
351-
_fixture.Binder.HandleApplicationEvents(application);
352-
var button = new Button { AutomationId = "my-btn" };
353-
_fixture.Binder.OnApplicationOnDescendantAdded(null, new ElementEventArgs(button));
354-
355-
var navSpan = Substitute.For<ISpan>();
356-
navSpan.IsFinished.Returns(false);
357-
var clickTransaction = Substitute.For<ITransactionTracer>();
358-
clickTransaction.IsFinished.Returns(false);
359-
clickTransaction.StartChild(Arg.Any<string>()).Returns(navSpan);
360-
_fixture.Hub.StartTransaction(Arg.Any<ITransactionContext>(), Arg.Any<TimeSpan?>())
361-
.Returns(clickTransaction);
362-
363-
var modalPage = new ContentPage { StyleId = "TestModalPage" };
364-
365-
button.RaiseEvent(nameof(Button.Pressed), EventArgs.Empty);
366-
application.RaiseEvent(nameof(Application.ModalPushing), new ModalPushingEventArgs(modalPage));
367-
368-
// Act - modal finishes pushing (page loaded)
369-
application.RaiseEvent(nameof(Application.ModalPushed), new ModalPushedEventArgs(modalPage));
370-
371-
// Assert - child span finished, click transaction NOT finished (idle timeout manages it)
372-
navSpan.Received(1).Finish(SpanStatus.Ok);
373-
clickTransaction.DidNotReceive().Finish(Arg.Any<SpanStatus>());
374-
}
375-
376319
[Fact]
377320
public void Button_Pressed_ShellNavigated_UpdatesSpanDescription()
378321
{

‎test/Sentry.Maui.Tests/MauiEventsBinderTests.Window.cs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,8 @@ public void Window_UnbindPopCanceled_DoesNotAddBreadcrumb()
226226
public void Window_PopCanceled_FinishesActiveNavigationSpan()
227227
{
228228
// Arrange
229-
var application = Mocks.MockApplication.Create();
230-
_fixture.Binder.HandleApplicationEvents(application);
229+
var shell = new Shell { StyleId = "shell" };
230+
_fixture.Binder.HandleShellEvents(shell);
231231
var window = new Window();
232232
_fixture.Binder.HandleWindowEvents(window);
233233
var button = new Button { AutomationId = "my-btn" };
@@ -241,11 +241,10 @@ public void Window_PopCanceled_FinishesActiveNavigationSpan()
241241
_fixture.Hub.StartTransaction(Arg.Any<ITransactionContext>(), Arg.Any<TimeSpan?>())
242242
.Returns(clickTransaction);
243243

244-
var modalPage = new ContentPage { StyleId = "TestModalPage" };
245-
246-
// Click button, then start popping a modal (navigation span created)
244+
// Click button, then start navigating (navigation span created)
247245
button.RaiseEvent(nameof(Button.Pressed), EventArgs.Empty);
248-
application.RaiseEvent(nameof(Application.ModalPopping), new ModalPoppingEventArgs(modalPage));
246+
shell.RaiseEvent(nameof(Shell.Navigating),
247+
new ShellNavigatingEventArgs(new ShellNavigationState("foo"), new ShellNavigationState("bar"), ShellNavigationSource.Push, false));
249248

250249
// Act - pop is cancelled
251250
window.RaiseEvent(nameof(Window.PopCanceled), EventArgs.Empty);

0 commit comments

Comments
 (0)