Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions eng/common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ function InitializeCustomToolset {
}

function Build {
TryLogClientIpAddress
InitializeToolset
InitializeCustomToolset

Expand Down
1 change: 1 addition & 0 deletions eng/common/sdk-task.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ try {
}

if ($restore) {
Try-LogClientIpAddress
Build 'Restore'
}

Expand Down
21 changes: 21 additions & 0 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,9 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
return $global:_DotNetInstallDir
}

# In case of network error, try to log the current IP for reference
Try-LogClientIpAddress

# Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
$env:DOTNET_MULTILEVEL_LOOKUP=0

Expand Down Expand Up @@ -872,3 +875,21 @@ if (!$disableConfigureToolsetImport) {
}
}
}

function Try-LogClientIpAddress()
{
Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes"
try
{
$result = Invoke-WebRequest -Uri "http://co1.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing
$lines = $result.Content.Split([Environment]::NewLine)
$socketIp = $lines | Select-String -Pattern "^Socket IP:.*"
Write-Host $socketIp
$clientIp = $lines | Select-String -Pattern "^Client IP:.*"
Write-Host $clientIp
}
catch
{
Write-Host "Unable to get this machine's effective IP address for logging: $_"
}
}
7 changes: 7 additions & 0 deletions eng/common/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,13 @@ function StopProcesses {
return 0
}

function TryLogClientIpAddress () {
echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes'
if command -v curl > /dev/null; then
curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: '
fi
}

function MSBuild {
local args=$@
if [[ "$pipelines_log" == true ]]; then
Expand Down