MAUI CommunityToolkit MVVM auto instrumentation of async commands

.generated.NoMobile.sln

@@ -201,6 +201,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.TrimTest", "test\Sen
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.MauiTrimTest", "test\Sentry.MauiTrimTest\Sentry.MauiTrimTest.csproj", "{DF92E098-822C-4B94-B96B-56BFB91FBB54}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Maui.CommunityToolkit.Mvvm", "src\Sentry.Maui.CommunityToolkit.Mvvm\Sentry.Maui.CommunityToolkit.Mvvm.csproj", "{E898F337-E982-46CC-8DA9-F8556AA7DD72}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.SourceGenerators", "src\Sentry.SourceGenerators\Sentry.SourceGenerators.csproj", "{C3CDF61C-3E28-441C-A9CE-011C89D11719}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.SourceGenerators.Tests", "test\Sentry.SourceGenerators.Tests\Sentry.SourceGenerators.Tests.csproj", "{3A76FF7D-2F32-4EA5-8999-2FFE3C7CB893}"
@@ -540,6 +541,10 @@ Global
 		{DF92E098-822C-4B94-B96B-56BFB91FBB54}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DF92E098-822C-4B94-B96B-56BFB91FBB54}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DF92E098-822C-4B94-B96B-56BFB91FBB54}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E898F337-E982-46CC-8DA9-F8556AA7DD72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E898F337-E982-46CC-8DA9-F8556AA7DD72}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E898F337-E982-46CC-8DA9-F8556AA7DD72}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E898F337-E982-46CC-8DA9-F8556AA7DD72}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C3CDF61C-3E28-441C-A9CE-011C89D11719}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C3CDF61C-3E28-441C-A9CE-011C89D11719}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C3CDF61C-3E28-441C-A9CE-011C89D11719}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -635,6 +640,7 @@ Global
 		{D7DF0B26-AD43-4F8B-9BFE-C4471CCC9821} = {21B42F60-5802-404E-90F0-AEBCC56760C0}
 		{6030B748-0000-43B5-B8A8-399AA42F5229} = {6987A1CC-608E-4868-A02C-09D30C8B7B2D}
 		{DF92E098-822C-4B94-B96B-56BFB91FBB54} = {6987A1CC-608E-4868-A02C-09D30C8B7B2D}
+		{E898F337-E982-46CC-8DA9-F8556AA7DD72} = {230B9384-90FD-4551-A5DE-1A5C197F25B6}
 		{C3CDF61C-3E28-441C-A9CE-011C89D11719} = {230B9384-90FD-4551-A5DE-1A5C197F25B6}
 		{3A76FF7D-2F32-4EA5-8999-2FFE3C7CB893} = {6987A1CC-608E-4868-A02C-09D30C8B7B2D}
 	EndGlobalSection

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Features
+
+- .NET MAUI integration with CommunityToolkit.Mvvm Async Relay Commands can now be auto spanned with the new package Sentry.Maui.CommunityToolkit.Mvvm ([#4125](https://github.com/getsentry/sentry-dotnet/pull/4125))
+
 ## 5.7.0
 
 ### Features

Sentry-CI-Build-Linux.slnf

@@ -44,6 +44,7 @@
       "src\\Sentry.Google.Cloud.Functions\\Sentry.Google.Cloud.Functions.csproj",
       "src\\Sentry.Hangfire\\Sentry.Hangfire.csproj",
       "src\\Sentry.Log4Net\\Sentry.Log4Net.csproj",
+      "src\\Sentry.Maui.CommunityToolkit.Mvvm\\Sentry.Maui.CommunityToolkit.Mvvm.csproj",
       "src\\Sentry.Maui\\Sentry.Maui.csproj",
       "src\\Sentry.NLog\\Sentry.NLog.csproj",
       "src\\Sentry.OpenTelemetry\\Sentry.OpenTelemetry.csproj",

Sentry-CI-Build-Windows.slnf

@@ -46,6 +46,7 @@
       "src\\Sentry.Google.Cloud.Functions\\Sentry.Google.Cloud.Functions.csproj",
       "src\\Sentry.Hangfire\\Sentry.Hangfire.csproj",
       "src\\Sentry.Log4Net\\Sentry.Log4Net.csproj",
+      "src\\Sentry.Maui.CommunityToolkit.Mvvm\\Sentry.Maui.CommunityToolkit.Mvvm.csproj",
       "src\\Sentry.Maui\\Sentry.Maui.csproj",
       "src\\Sentry.NLog\\Sentry.NLog.csproj",
       "src\\Sentry.OpenTelemetry\\Sentry.OpenTelemetry.csproj",

Sentry-CI-Build-macOS.slnf

@@ -51,6 +51,7 @@
       "src\\Sentry.Google.Cloud.Functions\\Sentry.Google.Cloud.Functions.csproj",
       "src\\Sentry.Hangfire\\Sentry.Hangfire.csproj",
       "src\\Sentry.Log4Net\\Sentry.Log4Net.csproj",
+      "src\\Sentry.Maui.CommunityToolkit.Mvvm\\Sentry.Maui.CommunityToolkit.Mvvm.csproj",
       "src\\Sentry.Maui\\Sentry.Maui.csproj",
       "src\\Sentry.NLog\\Sentry.NLog.csproj",
       "src\\Sentry.OpenTelemetry\\Sentry.OpenTelemetry.csproj",

Sentry-CI-CodeQL.slnf

@@ -15,6 +15,7 @@
       "src\\Sentry.Google.Cloud.Functions\\Sentry.Google.Cloud.Functions.csproj",
       "src\\Sentry.Hangfire\\Sentry.Hangfire.csproj",
       "src\\Sentry.Log4Net\\Sentry.Log4Net.csproj",
+      "src\\Sentry.Maui.CommunityToolkit.Mvvm\\Sentry.Maui.CommunityToolkit.Mvvm.csproj",
       "src\\Sentry.Maui\\Sentry.Maui.csproj",
       "src\\Sentry.NLog\\Sentry.NLog.csproj",
       "src\\Sentry.OpenTelemetry\\Sentry.OpenTelemetry.csproj",

Sentry.sln

@@ -201,6 +201,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.TrimTest", "test\Sen
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.MauiTrimTest", "test\Sentry.MauiTrimTest\Sentry.MauiTrimTest.csproj", "{DF92E098-822C-4B94-B96B-56BFB91FBB54}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Maui.CommunityToolkit.Mvvm", "src\Sentry.Maui.CommunityToolkit.Mvvm\Sentry.Maui.CommunityToolkit.Mvvm.csproj", "{E898F337-E982-46CC-8DA9-F8556AA7DD72}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.SourceGenerators", "src\Sentry.SourceGenerators\Sentry.SourceGenerators.csproj", "{C3CDF61C-3E28-441C-A9CE-011C89D11719}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.SourceGenerators.Tests", "test\Sentry.SourceGenerators.Tests\Sentry.SourceGenerators.Tests.csproj", "{3A76FF7D-2F32-4EA5-8999-2FFE3C7CB893}"
@@ -540,6 +541,10 @@ Global
 		{DF92E098-822C-4B94-B96B-56BFB91FBB54}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DF92E098-822C-4B94-B96B-56BFB91FBB54}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DF92E098-822C-4B94-B96B-56BFB91FBB54}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E898F337-E982-46CC-8DA9-F8556AA7DD72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E898F337-E982-46CC-8DA9-F8556AA7DD72}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E898F337-E982-46CC-8DA9-F8556AA7DD72}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E898F337-E982-46CC-8DA9-F8556AA7DD72}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C3CDF61C-3E28-441C-A9CE-011C89D11719}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C3CDF61C-3E28-441C-A9CE-011C89D11719}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C3CDF61C-3E28-441C-A9CE-011C89D11719}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -635,6 +640,7 @@ Global
 		{D7DF0B26-AD43-4F8B-9BFE-C4471CCC9821} = {21B42F60-5802-404E-90F0-AEBCC56760C0}
 		{6030B748-0000-43B5-B8A8-399AA42F5229} = {6987A1CC-608E-4868-A02C-09D30C8B7B2D}
 		{DF92E098-822C-4B94-B96B-56BFB91FBB54} = {6987A1CC-608E-4868-A02C-09D30C8B7B2D}
+		{E898F337-E982-46CC-8DA9-F8556AA7DD72} = {230B9384-90FD-4551-A5DE-1A5C197F25B6}
 		{C3CDF61C-3E28-441C-A9CE-011C89D11719} = {230B9384-90FD-4551-A5DE-1A5C197F25B6}
 		{3A76FF7D-2F32-4EA5-8999-2FFE3C7CB893} = {6987A1CC-608E-4868-A02C-09D30C8B7B2D}
 	EndGlobalSection

SentryMobile.slnf

@@ -11,6 +11,7 @@
       "src\\Sentry.Bindings.Android\\Sentry.Bindings.Android.csproj",
       "src\\Sentry.Bindings.Cocoa\\Sentry.Bindings.Cocoa.csproj",
       "src\\Sentry.Extensions.Logging\\Sentry.Extensions.Logging.csproj",
+      "src\\Sentry.Maui.CommunityToolkit.Mvvm\\Sentry.Maui.CommunityToolkit.Mvvm.csproj",
       "src\\Sentry.Maui\\Sentry.Maui.csproj",
       "src\\Sentry.SourceGenerators\\Sentry.SourceGenerators.csproj",
       "src\\Sentry\\Sentry.csproj",

SentryNoSamples.slnf

@@ -16,6 +16,7 @@
       "src\\Sentry.Google.Cloud.Functions\\Sentry.Google.Cloud.Functions.csproj",
       "src\\Sentry.Hangfire\\Sentry.Hangfire.csproj",
       "src\\Sentry.Log4Net\\Sentry.Log4Net.csproj",
+      "src\\Sentry.Maui.CommunityToolkit.Mvvm\\Sentry.Maui.CommunityToolkit.Mvvm.csproj",
       "src\\Sentry.Maui\\Sentry.Maui.csproj",
       "src\\Sentry.NLog\\Sentry.NLog.csproj",
       "src\\Sentry.OpenTelemetry\\Sentry.OpenTelemetry.csproj",

samples/Sentry.Samples.Maui/AppShell.xaml.cs

@@ -5,5 +5,6 @@ public partial class AppShell
     public AppShell()
     {
         InitializeComponent();
+        Routing.RegisterRoute("ctmvvm", typeof(CtMvvmPage));
     }
 }

samples/Sentry.Samples.Maui/CtMvvmPage.xaml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:maui="clr-namespace:Sentry.Samples.Maui"
+             x:Class="Sentry.Samples.Maui.CtMvvmPage"
+             x:DataType="maui:CtMvvmViewModel"
+             Title="Community Toolkit MVVM">
+
+    <ContentPage.BindingContext>
+        <maui:CtMvvmViewModel />
+    </ContentPage.BindingContext>
+
+    <ContentPage.Content>
+        <Button Text="Auto-Instrumented Button"
+                Command="{Binding TestCommand}" />
+    </ContentPage.Content>
+</ContentPage>

samples/Sentry.Samples.Maui/CtMvvmPage.xaml.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Sentry.Samples.Maui;
+
+public partial class CtMvvmPage : ContentPage
+{
+    public CtMvvmPage()
+    {
+        InitializeComponent();
+    }
+}
+

samples/Sentry.Samples.Maui/CtMvvmViewModel.cs

@@ -0,0 +1,15 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+
+namespace Sentry.Samples.Maui;
+
+public partial class CtMvvmViewModel : ObservableObject
+{
+    // Sentry automatically creates spans for async relay commands
+    [RelayCommand]
+    private async Task Test()
+    {
+        var rand = new Random().Next(100, 1000);
+        await Task.Delay(TimeSpan.FromMilliseconds(rand));
+    }
+}

samples/Sentry.Samples.Maui/MainPage.xaml

@@ -83,6 +83,13 @@
                 Clicked="OnFeedbackClicked"
                 HorizontalOptions="Center" />
 
+            <Button
+                x:Name="CtMvvmBtn"
+                Text="CommunityToolkit.Mvvm Integration"
+                SemanticProperties.Hint="Shows a test that auto-instrument async relay commands from the MVVM Community Toolkit."
+                Clicked="CtMvvmBtn_OnClicked"
+                HorizontalOptions="Center" />
+
         </VerticalStackLayout>
     </ScrollView>
 

samples/Sentry.Samples.Maui/MainPage.xaml.cs

@@ -101,6 +101,11 @@ private async void OnFeedbackClicked(object sender, EventArgs e)
         await Navigation.PushModalAsync(new SubmitFeedback());
     }
 
+    private void CtMvvmBtn_OnClicked(object sender, EventArgs e)
+    {
+        Shell.Current.GoToAsync("ctmvvm");
+    }
+
     private void TapGestureRecognizer_OnTapped(object sender, TappedEventArgs e)
     {
     }

samples/Sentry.Samples.Maui/MauiProgram.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using Sentry.Maui;
 
 namespace Sentry.Samples.Maui;
 
@@ -25,6 +26,14 @@ public static MauiApp CreateMauiApp()
                 options.Debug = true;
                 options.SampleRate = 1.0F;
 
+                // The Sentry MVVM Community Toolkit integration automatically creates traces for async relay commands,
+                // but only if tracing is enabled. Here we capture all traces (in a production app you'd probably only
+                // capture a certain percentage)
+                options.TracesSampleRate = 1.0F;
+
+                // Automatically create traces for async relay commands in the MVVM Community Toolkit
+                options.AddCommunityToolkitIntegration();
+
 #if __ANDROID__
                 // Currently experimental support is only available on Android
                 options.Native.ExperimentalOptions.SessionReplay.OnErrorSampleRate = 1.0;

samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj

@@ -102,6 +102,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\src\Sentry.Maui.CommunityToolkit.Mvvm\Sentry.Maui.CommunityToolkit.Mvvm.csproj" />
     <ProjectReference Include="..\..\src\Sentry.Maui\Sentry.Maui.csproj" />
     <ProjectReference Include="..\..\src\Sentry.Analyzers\Sentry.Analyzers.csproj"
                       OutputItemType="Analyzer"

scripts/device-test.ps1

@@ -24,7 +24,7 @@ try
 {
     if (!$Tfm)
     {
-        $Tfm = 'net8.0'
+        $Tfm = 'net9.0'
     }
     $arch = (!$IsWindows -and $(uname -m) -eq 'arm64') ? 'arm64' : 'x64'
     if ($Platform -eq 'android')

scripts/generate-solution-filters-config.yaml

@@ -175,10 +175,12 @@ filterConfigs:
         - "src/**/*Bindings.Cocoa.csproj"
         - "src/**/Sentry.Extensions.Logging.csproj"
         - "src/**/Sentry.Maui.csproj"
+        - "src/**/Sentry.Maui.CommunityToolkit.Mvvm.csproj"
         - "test/**/Sentry.Testing.CrashableApp.csproj"
         - "test/**/Sentry.Android.AssemblyReader.Tests.csproj"
         - "test/**/Sentry.Extensions.Logging.Tests.csproj"
         - "test/**/Sentry.Maui.Device.TestApp.csproj"
+        - "test/**/Sentry.Testing.CrashableApp.csproj"
         - "test/**/Sentry.Maui.Tests.csproj"
         - "test/**/Sentry.Testing.csproj"
         - "test/**/Sentry.Tests.csproj"