replace function stats with app insights

Author: JohnDuprey

Modules/CIPPCore/Public/CippQueue/Set-CippQueueTask.ps1

@@ -8,7 +8,8 @@ function Set-CippQueueTask {
         [string]$TaskId = (New-Guid).Guid.ToString(),
         [string]$Name,
         [ValidateSet('Queued', 'Running', 'Completed', 'Failed')]
-        [string]$Status = 'Queued'
+        [string]$Status = 'Queued',
+        [string]$Message
     )
 
     $CippQueueTasks = Get-CippTable -TableName CippQueueTasks
@@ -20,8 +21,11 @@ function Set-CippQueueTask {
         Name         = $Name
         Status       = $Status
     }
+    if ($Message) {
+        $QueueTaskEntry.Message = $Message
+    }
     $CippQueueTasks.Entity = $QueueTaskEntry
 
     Add-CIPPAzDataTableEntity @CippQueueTasks -Force
     return $QueueTaskEntry
-}
+}

Modules/CippEntrypoints/CippEntrypoints.psm1

@@ -271,7 +271,6 @@ function Receive-CippActivityTrigger {
     param($Item)
     Write-Warning "Hey Boo, the activity function is running. Here's some info: $($Item | ConvertTo-Json -Depth 10 -Compress)"
     try {
-        $Start = Get-Date
         $Output = $null
         Set-Location (Get-Item $PSScriptRoot).Parent.Parent.FullName
 
@@ -294,14 +293,14 @@ function Receive-CippActivityTrigger {
 
         if ($Item.FunctionName) {
             $FunctionName = 'Push-{0}' -f $Item.FunctionName
-            
+
             # Prepare telemetry metadata
             $taskName = if ($Item.Command) { $Item.Command } else { $FunctionName }
             $metadata = @{
                 Command      = if ($Item.Command) { $Item.Command } else { $FunctionName }
                 FunctionName = $FunctionName
             }
-            
+
             # Add tenant information if available
             if ($Item.TaskInfo) {
                 if ($Item.TaskInfo.Tenant) {
@@ -314,7 +313,7 @@ function Receive-CippActivityTrigger {
                     $metadata['Recurrence'] = $Item.TaskInfo.Recurrence
                 }
             }
-            
+
             # Add tenant from other common fields
             if (-not $metadata['Tenant']) {
                 if ($Item.TenantFilter) {
@@ -323,23 +322,23 @@ function Receive-CippActivityTrigger {
                     $metadata['Tenant'] = $Item.Tenant
                 }
             }
-            
+
             # Add queue information
             if ($Item.QueueId) {
                 $metadata['QueueId'] = $Item.QueueId
             }
             if ($Item.QueueName) {
                 $metadata['QueueName'] = $Item.QueueName
             }
-            
+
             try {
                 Write-Warning "Activity starting Function: $FunctionName."
-                
+
                 # Wrap the function execution with telemetry
                 $Output = Measure-CippTask -TaskName $taskName -Metadata $metadata -Script {
                     Invoke-Command -ScriptBlock { & $FunctionName -Item $Item }
                 }
-                
+
                 Write-Warning "Activity completed Function: $FunctionName."
                 if ($TaskStatus) {
                     $QueueTask.Status = 'Completed'
@@ -349,6 +348,7 @@ function Receive-CippActivityTrigger {
                 $ErrorMsg = $_.Exception.Message
                 if ($TaskStatus) {
                     $QueueTask.Status = 'Failed'
+                    $QueueTask.Message = $ErrorMsg
                     $null = Set-CippQueueTask @QueueTask
                 }
             }
@@ -359,21 +359,6 @@ function Receive-CippActivityTrigger {
                 $null = Set-CippQueueTask @QueueTask
             }
         }
-
-        $End = Get-Date
-
-        try {
-            $Stats = @{
-                FunctionType = 'Durable'
-                Entity       = $Item
-                Start        = $Start
-                End          = $End
-                ErrorMsg     = $ErrorMsg
-            }
-            Write-CippFunctionStats @Stats
-        } catch {
-            Write-Information "Error adding activity stats: $($_.Exception.Message)"
-        }
     } catch {
         Write-Information "Error in Receive-CippActivityTrigger: $($_.Exception.Message)"
         if ($TaskStatus) {
@@ -434,12 +419,12 @@ function Receive-CIPPTimerTrigger {
 
             # Prepare telemetry metadata
             $metadata = @{
-                Command    = $Function.Command
-                Cron       = $Function.Cron
-                FunctionId = $Function.Id
+                Command     = $Function.Command
+                Cron        = $Function.Cron
+                FunctionId  = $Function.Id
                 TriggerType = 'Timer'
             }
-            
+
             # Add parameters if available
             if ($Parameters.Count -gt 0) {
                 $metadata['ParameterCount'] = $Parameters.Count
@@ -456,7 +441,7 @@ function Receive-CIPPTimerTrigger {
             $Results = Measure-CippTask -TaskName $Function.Command -Metadata $metadata -Script {
                 Invoke-Command -ScriptBlock { & $Function.Command @Parameters }
             }
-            
+
             if ($Results -match '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$') {
                 $FunctionStatus.OrchestratorId = $Results -join ','
                 $Status = 'Started'