Skip to content

Commit 09735ec

Browse files
pull[bot]pull[bot]
authored
Merge pull request #622 from KelvinTegelaar/dev
[pull] dev from KelvinTegelaar:dev
2 parents 886b67a + 41895aa commit 09735ec

File tree

6 files changed

+36
-26
lines changed

6 files changed

+36
-26
lines changed

‎Modules/CIPPCore/Public/Authentication/Test-CIPPAccess.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,13 +435,13 @@ function Test-CIPPAccess {
435435
$AccessTimings['Total'] = $AccessTotalSw.Elapsed.TotalMilliseconds
436436
$AccessTimingsRounded = [ordered]@{}
437437
foreach ($Key in ($AccessTimings.Keys | Sort-Object)) { $AccessTimingsRounded[$Key] = [math]::Round($AccessTimings[$Key], 2) }
438-
Write-Information "#### Access Timings #### $($AccessTimingsRounded | ConvertTo-Json -Compress)"
438+
Write-Debug "#### Access Timings #### $($AccessTimingsRounded | ConvertTo-Json -Compress)"
439439
return @('AllTenants')
440440
}
441441
$AccessTotalSw.Stop()
442442
$AccessTimings['Total'] = $AccessTotalSw.Elapsed.TotalMilliseconds
443443
$AccessTimingsRounded = [ordered]@{}
444444
foreach ($Key in ($AccessTimings.Keys | Sort-Object)) { $AccessTimingsRounded[$Key] = [math]::Round($AccessTimings[$Key], 2) }
445-
Write-Information "#### Access Timings #### $($AccessTimingsRounded | ConvertTo-Json -Compress)"
445+
Write-Debug "#### Access Timings #### $($AccessTimingsRounded | ConvertTo-Json -Compress)"
446446
return $true
447447
}

‎Modules/CIPPCore/Public/Authentication/Test-CIPPAccessUserRole.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function Test-CIPPAccessUserRole {
6666
$UserRoleTimings['Total'] = $UserRoleTotalSw.Elapsed.TotalMilliseconds
6767
$timingsRounded = [ordered]@{}
6868
foreach ($Key in ($UserRoleTimings.Keys | Sort-Object)) { $timingsRounded[$Key] = [math]::Round($UserRoleTimings[$Key], 2) }
69-
Write-Information "#### UserRole Timings #### $($timingsRounded | ConvertTo-Json -Compress)"
69+
Write-Debug "#### UserRole Timings #### $($timingsRounded | ConvertTo-Json -Compress)"
7070
return $User
7171
}
7272

@@ -127,7 +127,7 @@ function Test-CIPPAccessUserRole {
127127
$UserRoleTimings['Total'] = $UserRoleTotalSw.Elapsed.TotalMilliseconds
128128
$timingsRounded = [ordered]@{}
129129
foreach ($Key in ($UserRoleTimings.Keys | Sort-Object)) { $timingsRounded[$Key] = [math]::Round($UserRoleTimings[$Key], 2) }
130-
Write-Information "#### UserRole Timings #### $($timingsRounded | ConvertTo-Json -Compress)"
130+
Write-Debug "#### UserRole Timings #### $($timingsRounded | ConvertTo-Json -Compress)"
131131

132132
return $User
133133
}

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/New-CippCoreRequest.ps1‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ function New-CippCoreRequest {
7878
$HttpTimings['Total'] = $HttpTotalStopwatch.Elapsed.TotalMilliseconds
7979
$HttpTimingsRounded = [ordered]@{}
8080
foreach ($Key in ($HttpTimings.Keys | Sort-Object)) { $HttpTimingsRounded[$Key] = [math]::Round($HttpTimings[$Key], 2) }
81-
Write-Information "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
81+
Write-Debug "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
8282
return $Access
8383
}
8484
} catch {
@@ -87,7 +87,7 @@ function New-CippCoreRequest {
8787
$HttpTimings['Total'] = $HttpTotalStopwatch.Elapsed.TotalMilliseconds
8888
$HttpTimingsRounded = [ordered]@{}
8989
foreach ($Key in ($HttpTimings.Keys | Sort-Object)) { $HttpTimingsRounded[$Key] = [math]::Round($HttpTimings[$Key], 2) }
90-
Write-Information "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
90+
Write-Debug "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
9191
return ([HttpResponseContext]@{
9292
StatusCode = [HttpStatusCode]::Forbidden
9393
Body = $_.Exception.Message
@@ -150,7 +150,7 @@ function New-CippCoreRequest {
150150
$HttpTimings['Total'] = $HttpTotalStopwatch.Elapsed.TotalMilliseconds
151151
$HttpTimingsRounded = [ordered]@{}
152152
foreach ($Key in ($HttpTimings.Keys | Sort-Object)) { $HttpTimingsRounded[$Key] = [math]::Round($HttpTimings[$Key], 2) }
153-
Write-Information "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
153+
Write-Debug "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
154154
return ([HttpResponseContext]($HttpResponse | Select-Object -First 1))
155155
} else {
156156
# If no valid response context found, create a default success response
@@ -159,7 +159,7 @@ function New-CippCoreRequest {
159159
$HttpTimings['Total'] = $HttpTotalStopwatch.Elapsed.TotalMilliseconds
160160
$HttpTimingsRounded = [ordered]@{}
161161
foreach ($Key in ($HttpTimings.Keys | Sort-Object)) { $HttpTimingsRounded[$Key] = [math]::Round($HttpTimings[$Key], 2) }
162-
Write-Information "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
162+
Write-Debug "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
163163
return ([HttpResponseContext]@{
164164
StatusCode = $Response.StatusCode
165165
Body = $Response.Body
@@ -169,7 +169,7 @@ function New-CippCoreRequest {
169169
$HttpTimings['Total'] = $HttpTotalStopwatch.Elapsed.TotalMilliseconds
170170
$HttpTimingsRounded = [ordered]@{}
171171
foreach ($Key in ($HttpTimings.Keys | Sort-Object)) { $HttpTimingsRounded[$Key] = [math]::Round($HttpTimings[$Key], 2) }
172-
Write-Information "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
172+
Write-Debug "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
173173
return ([HttpResponseContext]@{
174174
StatusCode = [HttpStatusCode]::OK
175175
Body = $Response
@@ -183,7 +183,7 @@ function New-CippCoreRequest {
183183
$HttpTimings['Total'] = $HttpTotalStopwatch.Elapsed.TotalMilliseconds
184184
$HttpTimingsRounded = [ordered]@{}
185185
foreach ($Key in ($HttpTimings.Keys | Sort-Object)) { $HttpTimingsRounded[$Key] = [math]::Round($HttpTimings[$Key], 2) }
186-
Write-Information "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
186+
Write-Debug "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
187187
return ([HttpResponseContext]@{
188188
StatusCode = [HttpStatusCode]::InternalServerError
189189
Body = $_.Exception.Message
@@ -194,7 +194,7 @@ function New-CippCoreRequest {
194194
$HttpTimings['Total'] = $HttpTotalStopwatch.Elapsed.TotalMilliseconds
195195
$HttpTimingsRounded = [ordered]@{}
196196
foreach ($Key in ($HttpTimings.Keys | Sort-Object)) { $HttpTimingsRounded[$Key] = [math]::Round($HttpTimings[$Key], 2) }
197-
Write-Information "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
197+
Write-Debug "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
198198
return ([HttpResponseContext]@{
199199
StatusCode = [HttpStatusCode]::NotFound
200200
Body = 'Endpoint not found'
@@ -205,7 +205,7 @@ function New-CippCoreRequest {
205205
$HttpTimings['Total'] = $HttpTotalStopwatch.Elapsed.TotalMilliseconds
206206
$HttpTimingsRounded = [ordered]@{}
207207
foreach ($Key in ($HttpTimings.Keys | Sort-Object)) { $HttpTimingsRounded[$Key] = [math]::Round($HttpTimings[$Key], 2) }
208-
Write-Information "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
208+
Write-Debug "#### HTTP Request Timings #### $($HttpTimingsRounded | ConvertTo-Json -Compress)"
209209
return ([HttpResponseContext]@{
210210
StatusCode = [HttpStatusCode]::PreconditionFailed
211211
Body = 'Request not processed'

‎Modules/CIPPCore/Public/Tools/Enable-CippConsoleLogging.ps1‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ function Enable-CippConsoleLogging {
4040
'Information'
4141
}
4242

43+
if ($env:CIPP_CONSOLE_LOG_LEVEL -eq 'Debug') {
44+
$global:DebugPreference = 'Continue'
45+
}
46+
4347
# Override Write-Information
4448
function global:Write-Information {
4549
[CmdletBinding()]
@@ -53,7 +57,13 @@ function Enable-CippConsoleLogging {
5357
if ($PSBoundParameters.ContainsKey('MessageData') -and $MessageData) {
5458
# Send to telemetry
5559
if (-not [string]::IsNullOrWhiteSpace(($MessageData | Out-String).Trim())) {
56-
Send-CippConsoleLog -Message ($MessageData | Out-String).Trim() -Level 'Information'
60+
# If tag is supplied, include it in the log message
61+
$LogMessage = if ($Tags -and $Tags.Count -gt 0) {
62+
'[{0}] {1}' -f ($Tags -join ','), ($MessageData | Out-String).Trim()
63+
} else {
64+
($MessageData | Out-String).Trim()
65+
}
66+
Send-CippConsoleLog -Message $LogMessage -Level 'Information'
5767
}
5868

5969
# Call original function

‎Modules/CippEntrypoints/CippEntrypoints.psm1‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function Receive-CippHttpTrigger {
2121
if ($Request.Headers.'x-ms-coldstart' -eq 1) {
2222
Write-Information '** Function app cold start detected **'
2323
}
24-
Write-Information "CIPP_ACTION=$($Request.Params.CIPPEndpoint)"
24+
Write-Debug "CIPP_ACTION=$($Request.Params.CIPPEndpoint)"
2525

2626
$ConfigTable = Get-CIPPTable -tablename Config
2727
$Config = Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'OffloadFunctions' and RowKey eq 'OffloadFunctions'"
@@ -172,7 +172,7 @@ function Receive-CippOrchestrationTrigger {
172172
Entrypoint
173173
#>
174174
param($Context)
175-
Write-Information "CIPP_ACTION=$($Item.Command ?? $Item.FunctionName)"
175+
Write-Debug "CIPP_ACTION=$($Item.Command ?? $Item.FunctionName)"
176176
try {
177177
if (Test-Json -Json $Context.Input) {
178178
$OrchestratorInput = $Context.Input | ConvertFrom-Json
@@ -287,7 +287,7 @@ function Receive-CippActivityTrigger {
287287
Entrypoint
288288
#>
289289
param($Item)
290-
Write-Information "CIPP_ACTION=$($Item.Command ?? $Item.FunctionName)"
290+
Write-Debug "CIPP_ACTION=$($Item.Command ?? $Item.FunctionName)"
291291
Write-Warning "Hey Boo, the activity function is running. Here's some info: $($Item | ConvertTo-Json -Depth 10 -Compress)"
292292
try {
293293
$Output = $null
@@ -360,7 +360,7 @@ function Receive-CippActivityTrigger {
360360
}
361361

362362
try {
363-
Write-Verbose "Activity starting Function: $FunctionName."
363+
Write-Verbose "Activity starting Function: $FunctionName."
364364
Invoke-Command -ScriptBlock { & $FunctionName -Item $Item }
365365
$Status = 'Completed'
366366

@@ -477,9 +477,9 @@ function Receive-CIPPTimerTrigger {
477477
}
478478

479479
# Wrap the timer function execution with telemetry
480-
480+
481481
Invoke-Command -ScriptBlock { & $Function.Command @Parameters }
482-
482+
483483

484484
if ($Results -match '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$') {
485485
$FunctionStatus.OrchestratorId = $Results -join ','

‎profile.ps1‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if ($hasAppInsights) {
1313
try {
1414
$AppInsightsDllPath = Join-Path $PSScriptRoot 'Shared\AppInsights\Microsoft.ApplicationInsights.dll'
1515
$null = [Reflection.Assembly]::LoadFile($AppInsightsDllPath)
16-
Write-Information 'Application Insights SDK loaded successfully'
16+
Write-Debug 'Application Insights SDK loaded successfully'
1717
} catch {
1818
Write-Warning "Failed to load Application Insights SDK: $($_.Exception.Message)"
1919
}
@@ -52,13 +52,13 @@ if ($hasAppInsights -and -not $global:TelemetryClient) {
5252
$config.ConnectionString = $connectionString
5353
$global:TelemetryClient = [Microsoft.ApplicationInsights.TelemetryClient]::new($config)
5454
Enable-CippConsoleLogging
55-
Write-Information 'TelemetryClient initialized with connection string'
55+
Write-Debug 'TelemetryClient initialized with connection string'
5656
} elseif ($env:APPINSIGHTS_INSTRUMENTATIONKEY) {
5757
# Fall back to instrumentation key
5858
$global:TelemetryClient = [Microsoft.ApplicationInsights.TelemetryClient]::new()
5959
$global:TelemetryClient.InstrumentationKey = $env:APPINSIGHTS_INSTRUMENTATIONKEY
6060
Enable-CippConsoleLogging
61-
Write-Information 'TelemetryClient initialized with instrumentation key'
61+
Write-Debug 'TelemetryClient initialized with instrumentation key'
6262
}
6363
} catch {
6464
Write-Warning "Failed to initialize TelemetryClient: $($_.Exception.Message)"
@@ -71,7 +71,7 @@ $SwDurableSDK = [System.Diagnostics.Stopwatch]::StartNew()
7171
if ($env:ExternalDurablePowerShellSDK -eq $true) {
7272
try {
7373
Import-Module AzureFunctions.PowerShell.Durable.SDK -ErrorAction Stop
74-
Write-Information 'External Durable SDK enabled'
74+
Write-Debug 'External Durable SDK enabled'
7575
} catch {
7676
Write-LogMessage -message 'Failed to import module - AzureFunctions.PowerShell.Durable.SDK' -LogData (Get-CippException -Exception $_) -Sev 'debug'
7777
$_.Exception.Message
@@ -83,7 +83,7 @@ $Timings['DurableSDK'] = $SwDurableSDK.Elapsed.TotalMilliseconds
8383
$SwAuth = [System.Diagnostics.Stopwatch]::StartNew()
8484
try {
8585
if (!$env:SetFromProfile) {
86-
Write-Information "We're reloading from KV"
86+
Write-Debug "We're reloading from KV"
8787
$Auth = Get-CIPPAuthentication
8888
}
8989
} catch {
@@ -121,7 +121,7 @@ if (!$LastStartup -or $CurrentVersion -ne $LastStartup.Version) {
121121

122122
$ReleaseTable = Get-CippTable -tablename 'cacheGitHubReleaseNotes'
123123
Remove-AzDataTableEntity @ReleaseTable -Entity @{ PartitionKey = 'GitHubReleaseNotes'; RowKey = 'GitHubReleaseNotes' } -ErrorAction SilentlyContinue
124-
Write-Host 'Cleared GitHub release notes cache to force refresh on version update.'
124+
Write-Debug 'Cleared GitHub release notes cache to force refresh on version update.'
125125
}
126126
$SwVersion.Stop()
127127
$Timings['VersionCheck'] = $SwVersion.Elapsed.TotalMilliseconds
@@ -134,4 +134,4 @@ $TimingsRounded = [ordered]@{}
134134
foreach ($Key in ($Timings.Keys | Sort-Object)) {
135135
$TimingsRounded[$Key] = [math]::Round($Timings[$Key], 2)
136136
}
137-
Write-Information "#### Profile Load Timings #### $($TimingsRounded | ConvertTo-Json -Compress)"
137+
Write-Debug "#### Profile Load Timings #### $($TimingsRounded | ConvertTo-Json -Compress)"

0 commit comments

Comments
 (0)