Merge pull request #606 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Standards/Push-CIPPStandard.ps1

@@ -8,9 +8,11 @@ function Push-CIPPStandard {
     )
 
     Write-Information "Received queue item for $($Item.Tenant) and standard $($Item.Standard)."
+
     $Tenant = $Item.Tenant
     $Standard = $Item.Standard
     $FunctionName = 'Invoke-CIPPStandard{0}' -f $Standard
+
     Write-Information "We'll be running $FunctionName"
 
     if ($Standard -in @('IntuneTemplate', 'ConditionalAccessTemplate')) {
@@ -44,6 +46,30 @@ function Push-CIPPStandard {
     }
     $script:CippStandardInfoStorage.Value = $StandardInfo
 
+    # ---- Standard execution telemetry ----
+    $runId = [guid]::NewGuid().ToString()
+    $invocationId = if ($ExecutionContext -and $ExecutionContext.InvocationId) {
+        "$($ExecutionContext.InvocationId)"
+    } else {
+        $null
+    }
+
+    $sw = [System.Diagnostics.Stopwatch]::StartNew()
+    $result = 'Unknown'
+    $err = $null
+
+    Write-Information -Tag 'CIPPStandardStart' -MessageData (@{
+            Kind         = 'CIPPStandardStart'
+            RunId        = $runId
+            InvocationId = $invocationId
+            Tenant       = $Tenant
+            Standard     = $Standard
+            TemplateId   = $Item.templateId
+            API          = $API
+            FunctionName = $FunctionName
+        } | ConvertTo-Json -Compress)
+    # -------------------------------------
+
     try {
         # Convert settings to JSON, replace %variables%, then convert back to object
         $SettingsJSON = $Item.Settings | ConvertTo-Json -Depth 10 -Compress
@@ -62,26 +88,44 @@ function Push-CIPPStandard {
             TriggerType  = 'Standard'
         }
 
-        # Add template-specific metadata
         if ($Standard -eq 'IntuneTemplate' -and $Item.Settings.TemplateList.value) {
             $metadata['IntuneTemplateId'] = $Item.Settings.TemplateList.value
         }
         if ($Standard -eq 'ConditionalAccessTemplate' -and $Item.Settings.TemplateList.value) {
             $metadata['CATemplateId'] = $Item.Settings.TemplateList.value
         }
 
-        # Wrap the standard execution with telemetry
         Measure-CippTask -TaskName $Standard -EventName 'CIPP.StandardCompleted' -Metadata $metadata -Script {
             & $FunctionName -Tenant $Item.Tenant -Settings $Settings -ErrorAction Stop
         }
 
+        $result = 'Success'
         Write-Information "Standard $($Standard) completed for tenant $($Tenant)"
     } catch {
+        $result = 'Failed'
+        $err = $_.Exception.Message
+
         Write-LogMessage -API 'Standards' -tenant $Tenant -message "Error running standard $($Standard) for tenant $($Tenant) - $($_.Exception.Message)" -sev Error -LogData (Get-CippException -Exception $_)
         Write-Warning "Error running standard $($Standard) for tenant $($Tenant) - $($_.Exception.Message)"
         Write-Information $_.InvocationInfo.PositionMessage
         throw $_.Exception.Message
     } finally {
+        $sw.Stop()
+
+        Write-Information -Tag 'CIPPStandardEnd' -MessageData (@{
+                Kind         = 'CIPPStandardEnd'
+                RunId        = $runId
+                InvocationId = $invocationId
+                Tenant       = $Tenant
+                Standard     = $Standard
+                TemplateId   = $Item.templateId
+                API          = $API
+                FunctionName = $FunctionName
+                Result       = $result
+                ElapsedMs    = $sw.ElapsedMilliseconds
+                Error        = $err
+            } | ConvertTo-Json -Compress)
+
         if ($script:CippStandardInfoStorage) {
             $script:CippStandardInfoStorage.Value = $null
         }

Modules/CippEntrypoints/CippEntrypoints.psm1

@@ -279,11 +279,12 @@ function Receive-CippActivityTrigger {
         $Output = $null
         Set-Location (Get-Item $PSScriptRoot).Parent.Parent.FullName
         $metric = @{
-            Kind     = 'CIPPCommandStart'
-            Command  = $Item.Command
-            Tenant   = $Item.TenantFilter.defaultDomainName
-            TaskName = $Item.TaskName
-            JSONData = ($Item | ConvertTo-Json -Depth 10 -Compress)
+            Kind         = 'CIPPCommandStart'
+            InvocationId = "$($ExecutionContext.InvocationId)"
+            Command      = $Item.Command
+            Tenant       = $Item.TenantFilter.defaultDomainName
+            TaskName     = $Item.TaskName
+            JSONData     = ($Item | ConvertTo-Json -Depth 10 -Compress)
         } | ConvertTo-Json -Depth 10 -Compress
 
         Write-Information -MessageData $metric -Tag 'CIPPCommandStart'