open-telemetry
/
opentelemetry-dotnet-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PS module default to ProgramFiles (#1533) 

Add custom path warning and default to ProgramFiles dir
This commit is contained in:
Rasmus Kuusmann 2022-11-02 15:51:32 +02:00 committed by GitHub
parent 377abcf53c
commit 885b2c4e43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenTelemetry.DotNet.Auto.psm1
View File

@ -23,12 +23,9 @@ function Get-Current-InstallDir() {
function Get-CLIInstallDir-From-InstallDir([string]$InstallDir) {
$dir = "OpenTelemetry .NET AutoInstrumentation"
if ($InstallDir -eq "<auto>" -or $installDir -eq "AppData") {
return (Join-Path $env:LOCALAPPDATA "Programs" | Join-Path -ChildPath $dir)
}
elseif ($InstallDir -eq "ProgramFiles") {
if ($InstallDir -eq "<auto>") {
return (Join-Path $Env:ProgramFiles $dir)
}
}
elseif (Test-Path $InstallDir -IsValid) {
return $InstallDir
}
@ -186,9 +183,9 @@ function Filter-Env-List([string[]]$EnvValues, [string[]]$Filters) {
.SYNOPSIS
Installs OpenTelemetry .NET Automatic Instrumentation.
.PARAMETER InstallDir
Default: <auto> - the default value is AppData
Default: <auto> - the default path is Program Files dir.
Install path of the OpenTelemetry .NET Automatic Instrumentation
Possible values: <auto>, ProgramFiles, AppData, (Custom path)
Possible values: <auto>, (Custom path)
#>
function Install-OpenTelemetryCore() {
param(
@ -276,6 +273,10 @@ function Register-OpenTelemetryForIIS() {
throw "OpenTelemetry Core must be setup first. Run 'Install-OpenTelemetryCore' to setup OpenTelemetry Core."
}
if ($installDir -notlike "$env:ProgramFiles\*") {
Write-Warning "OpenTelemetry is installed to custom path. Make sure that IIS user has access to the path."
}
Setup-Windows-Service -InstallDir $installDir -WindowsServiceName "W3SVC"
Setup-Windows-Service -InstallDir $installDir -WindowsServiceName "WAS"