Track page duration

dhindrik · Dec 12, 2024 · 39a3d34 · 39a3d34
1 parent 21a062a
commit 39a3d34
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 11 deletions.
diff --git a/TinyInsights.TestApp/Platforms/Android/AndroidManifest.xml b/TinyInsights.TestApp/Platforms/Android/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+	<uses-sdk android:minSdkVersion="30" android:targetSdkVersion="35" />
 	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.INTERNET" />

diff --git a/TinyInsights.TestApp/TinyInsights.TestApp.csproj b/TinyInsights.TestApp/TinyInsights.TestApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
+        <TargetFrameworks>net9.0-ios;net9.0-maccatalyst;net9.0-android35.0</TargetFrameworks>
         <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
         <!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
         <!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
@@ -34,7 +34,7 @@
 
         <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
         <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
-        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
+        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">30.0</SupportedOSPlatformVersion>
         <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
         <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
         <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>

diff --git a/TinyInsights/ApplicationInsightsProvider.cs b/TinyInsights/ApplicationInsightsProvider.cs
@@ -98,19 +98,32 @@ public void Initialize()
             {
                 throw new NullReferenceException("Unable to configure `IsAutoTrackPageViewsEnabled` as `Application.Current` is null. You can either set `IsAutoTrackPageViewsEnabled` to false to ignore this issue, or check out this link for a possible reason - https://github.com/dhindrik/TinyInsights.Maui/issues/21");
             }
-            WeakEventHandler<Page> weakHandler = new(OnAppearing);
-            Application.Current.PageAppearing += weakHandler.Handler;
+
+            WeakEventHandler<Page> weakOnAppearingHandler = new(OnAppearing);
+            Application.Current.PageAppearing += weakOnAppearingHandler.Handler;
+
+            WeakEventHandler<Page> weakOnDisappearingHandler = new(OnDisappearing);
+            Application.Current.PageDisappearing += weakOnDisappearingHandler.Handler;
         }
 
         Task.Run(SendCrashes);
 
         IsInitialized = true;
     }
 
+    private static DateTime? _lastPageAppearing;
+
     private static void OnAppearing(object? sender, Page e)
     {
+        _lastPageAppearing = DateTime.Now;
+    }
+
+    private static void OnDisappearing(object? sender, Page e)
+    {
+        var duration = DateTime.Now - _lastPageAppearing;
+
         var pageType = e.GetType();
-        provider?.TrackPageViewAsync(pageType.FullName ?? pageType.Name, new Dictionary<string, string> { { "DisplayName", pageType.Name } });
+        provider?.TrackPageViewAsync(pageType.FullName ?? pageType.Name, new Dictionary<string, string> { { "DisplayName", pageType.Name } }, duration);
     }
 
     readonly Dictionary<string, string> _globalProperties = [];
@@ -425,7 +438,7 @@ public async Task TrackEventAsync(string eventName, Dictionary<string, string>?
         }
     }
 
-    public async Task TrackPageViewAsync(string viewName, Dictionary<string, string>? properties = null)
+    public async Task TrackPageViewAsync(string viewName, Dictionary<string, string>? properties = null, TimeSpan? duration = null)
     {
         try
         {
@@ -437,7 +450,26 @@ public async Task TrackPageViewAsync(string viewName, Dictionary<string, string>
             if (EnableConsoleLogging)
                 Console.WriteLine($"TinyInsights: tracking page view {viewName}");
 
-            Client.TrackPageView(viewName);
+            var pageView = new PageViewTelemetry(viewName)
+            {
+                Timestamp = new DateTimeOffset(_lastPageAppearing ?? DateTime.Now),
+            };
+
+            if (duration is not null)
+            {
+                pageView.Duration = duration.Value;
+            }
+
+            if (properties is not null)
+            {
+                foreach (var property in properties)
+                {
+                    pageView.Properties.Add(property.Key, property.Value);
+                }
+            }
+
+            Client.TrackPageView(pageView);
+
             await Client.FlushAsync(CancellationToken.None);
         }
         catch (Exception ex)

diff --git a/TinyInsights/IInsights.cs b/TinyInsights/IInsights.cs
@@ -10,7 +10,7 @@ public interface IInsights
 
     Task TrackErrorAsync(Exception ex, Dictionary<string, string>? properties = null);
 
-    Task TrackPageViewAsync(string viewName, Dictionary<string, string>? properties = null);
+    Task TrackPageViewAsync(string viewName, Dictionary<string, string>? properties = null, TimeSpan? duration = null);
 
     Task TrackEventAsync(string eventName, Dictionary<string, string>? properties = null);
     Task TrackErrorAsync(Exception ex, ErrorSeverity severity, Dictionary<string, string>? properties = null);

diff --git a/TinyInsights/IInsightsProvider.cs b/TinyInsights/IInsightsProvider.cs
@@ -18,7 +18,7 @@ public interface IInsightsProvider
 
     Task TrackErrorAsync(Exception ex, Dictionary<string, string>? properties = null);
 
-    Task TrackPageViewAsync(string viewName, Dictionary<string, string>? properties = null);
+    Task TrackPageViewAsync(string viewName, Dictionary<string, string>? properties = null, TimeSpan? duration = null);
 
     Task TrackEventAsync(string eventName, Dictionary<string, string>? properties = null);
 

diff --git a/TinyInsights/Insights.cs b/TinyInsights/Insights.cs
@@ -57,13 +57,13 @@ public Task TrackErrorAsync(Exception ex, ErrorSeverity severity, Dictionary<str
         return Task.CompletedTask;
     }
 
-    public Task TrackPageViewAsync(string viewName, Dictionary<string, string>? properties = null)
+    public Task TrackPageViewAsync(string viewName, Dictionary<string, string>? properties = null, TimeSpan? duration = null)
     {
         var tasks = new List<Task>();
 
         foreach (var provider in insightsProviders.Where(x => x.IsTrackPageViewsEnabled))
         {
-            var task = provider.TrackPageViewAsync(viewName, properties);
+            var task = provider.TrackPageViewAsync(viewName, properties, duration);
             tasks.Add(task);
         }