Merge main to feature/triggers (#863)

* [main] Update dependencies from dotnet/arcade (#827) * Update dependencies from https://github.com/dotnet/arcade build 20210903.2 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.21452.4 -> To Version 7.0.0-beta.21453.2 * Update dependencies from https://github.com/dotnet/arcade build 20210906.1 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.21452.4 -> To Version 7.0.0-beta.21456.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * [main] Update dependencies from dotnet/diagnostics (#830) * Update dependencies from https://github.com/dotnet/diagnostics build 20210903.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 5.0.0-preview.21452.1 -> To Version 5.0.0-preview.21453.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20210906.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 5.0.0-preview.21452.1 -> To Version 5.0.0-preview.21456.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * [main] Update dependencies from dotnet/aspnetcore (#829) [main] Update dependencies from dotnet/aspnetcore * Update dependencies from https://github.com/dotnet/symstore build 20210907.1 (#832) [main] Update dependencies from dotnet/symstore * [main] Update dependencies from dotnet/runtime (#828) [main] Update dependencies from dotnet/runtime * Update dependencies from https://github.com/dotnet/aspnetcore build 20210908.2 (#831) [main] Update dependencies from dotnet/aspnetcore * Update dependencies from https://github.com/dotnet/diagnostics build 20210908.1 (#833) [main] Update dependencies from dotnet/diagnostics * Update dependencies from https://github.com/dotnet/arcade build 20210907.3 (#834) [main] Update dependencies from dotnet/arcade * Update dependencies from https://github.com/dotnet/runtime build 20210908.16 (#835) [main] Update dependencies from dotnet/runtime * Update dependencies from https://github.com/dotnet/aspnetcore build 20210908.47 (#836) [main] Update dependencies from dotnet/aspnetcore * Update dependencies from https://github.com/dotnet/symstore build 20210908.1 (#837) [main] Update dependencies from dotnet/symstore * Update dependencies from https://github.com/dotnet/diagnostics build 20210909.1 (#838) [main] Update dependencies from dotnet/diagnostics * Update dependencies from https://github.com/dotnet/arcade build 20210909.5 (#839) [main] Update dependencies from dotnet/arcade * Update dependencies from https://github.com/dotnet/runtime build 20210909.18 (#840) [main] Update dependencies from dotnet/runtime * [main] Update dependencies from dotnet/aspnetcore (#841) [main] Update dependencies from dotnet/aspnetcore * Update dependencies from https://github.com/dotnet/runtime build 20210910.14 (#843) [main] Update dependencies from dotnet/runtime * Update dependencies from https://github.com/dotnet/runtime build 20210911.1 (#844) [main] Update dependencies from dotnet/runtime * [main] Update dependencies from dotnet/aspnetcore (#845) [main] Update dependencies from dotnet/aspnetcore * Update dependencies from https://github.com/dotnet/diagnostics build 20210910.1 (#846) [main] Update dependencies from dotnet/diagnostics * Update dependencies from https://github.com/dotnet/diagnostics build 20210913.1 (#847) [main] Update dependencies from dotnet/diagnostics * Update dependencies from https://github.com/dotnet/arcade build 20210913.4 (#848) [main] Update dependencies from dotnet/arcade * Update dependencies from https://github.com/dotnet/aspnetcore build 20210913.5 (#850) [main] Update dependencies from dotnet/aspnetcore * Update dependencies from https://github.com/dotnet/runtime build 20210913.21 (#849) [main] Update dependencies from dotnet/runtime * Update dependencies from https://github.com/dotnet/symstore build 20210913.1 (#851) [main] Update dependencies from dotnet/symstore * Update dependencies from https://github.com/dotnet/runtime build 20210914.21 (#857) [main] Update dependencies from dotnet/runtime * Update dependencies from https://github.com/dotnet/diagnostics build 20210914.1 (#856) [main] Update dependencies from dotnet/diagnostics * Update dependencies from https://github.com/dotnet/aspnetcore build 20210915.1 (#858) [main] Update dependencies from dotnet/aspnetcore * Rename collectmetrics back to livemetrics (#855) * Update dependencies from https://github.com/dotnet/aspnetcore build 20210915.22 (#861) [main] Update dependencies from dotnet/aspnetcore * Update dependencies from https://github.com/dotnet/symstore build 20210915.1 (#862) [main] Update dependencies from dotnet/symstore * Update dependencies from https://github.com/dotnet/diagnostics build 20210915.1 (#860) [main] Update dependencies from dotnet/diagnostics Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Wiktor Kopec <[email protected]>
dotnet · Sep 17, 2021 · e785e25 · e785e25
2 parents 6800215 + 3b14583
commit e785e25
Show file tree

Hide file tree

Showing 17 changed files with 108 additions and 123 deletions.
diff --git a/documentation/README.md b/documentation/README.md
@@ -19,7 +19,7 @@ When running a dotnet application, differences in diverse local and production e
     - [`/gcdump`](./api/gcdump.md)
     - [`/trace`](./api/trace.md)
     - [`/metrics`](./api/metrics.md)
-    - [`/collectmetrics`](./api/collectmetrics.md)
+    - [`/livemetrics`](./api/livemetrics.md)
     - [`/logs`](./api/logs.md)
     - [`/info`](./api/info.md)
     - [`/operations`](.api/operations.md)

diff --git a/documentation/api/collectmetrics.md b/documentation/api/collectmetrics.md
diff --git a/documentation/api/collectmetrics-custom.md → documentation/api/livemetrics-custom.md b/documentation/api/collectmetrics-custom.md → documentation/api/livemetrics-custom.md
@@ -1,11 +1,11 @@
-# Collectmetrics - Get Custom
+# Livemetrics - Get Custom
 
 Captures metrics for a process, with the ability to specify custom metrics.
 
 ## HTTP Route
 
 ```http
-POST /collectmetrics?pid={pid}&uid={uid}&name={name}&metricsIntervalSeconds={metricsIntervalSeconds}&durationSeconds={durationSeconds}&egressProvider={egressProvider} HTTP/1.1
+POST /livemetrics?pid={pid}&uid={uid}&name={name}&metricsIntervalSeconds={metricsIntervalSeconds}&durationSeconds={durationSeconds}&egressProvider={egressProvider} HTTP/1.1
 ```
 
 > **NOTE:** Process information (IDs, names, environment, etc) may change between invocations of these APIs. Processes may start or stop between API invocations, causing this information to change.
@@ -58,7 +58,7 @@ The expected content type is `application/json`.
 ### Sample Request
 
 ```http
-GET /collectmetrics?pid=21632&metricsIntervalSeconds=10&durationSeconds=60 HTTP/1.1
+GET /livemetrics?pid=21632&metricsIntervalSeconds=10&durationSeconds=60 HTTP/1.1
 Host: localhost:52323
 Authorization: Bearer fffffffffffffffffffffffffffffffffffffffffff=
 

diff --git a/documentation/api/collectmetrics-get.md → documentation/api/livemetrics-get.md b/documentation/api/collectmetrics-get.md → documentation/api/livemetrics-get.md
@@ -1,4 +1,4 @@
-# Collectmetrics - Get
+# Livemetrics - Get
 
 Captures metrics for a chosen process.
 
@@ -7,7 +7,7 @@ Captures metrics for a chosen process.
 ## HTTP Route
 
 ```http
-GET /collectmetrics?pid={pid}&uid={uid}&name={name}&metricsIntervalSeconds={metricsIntervalSeconds}&durationSeconds={durationSeconds}&egressProvider={egressProvider} HTTP/1.1
+GET /livemetrics?pid={pid}&uid={uid}&name={name}&metricsIntervalSeconds={metricsIntervalSeconds}&durationSeconds={durationSeconds}&egressProvider={egressProvider} HTTP/1.1
 ```
 
 > **NOTE:** Process information (IDs, names, environment, etc) may change between invocations of these APIs. Processes may start or stop between API invocations, causing this information to change.
@@ -54,7 +54,7 @@ Allowed schemes:
 ### Sample Request
 
 ```http
-GET /collectmetrics?pid=21632&metricsIntervalSeconds=10&durationSeconds=60 HTTP/1.1
+GET /livemetrics?pid=21632&metricsIntervalSeconds=10&durationSeconds=60 HTTP/1.1
 Host: localhost:52323
 Authorization: Bearer fffffffffffffffffffffffffffffffffffffffffff=
 ```

diff --git a/documentation/api/livemetrics.md b/documentation/api/livemetrics.md
@@ -0,0 +1,6 @@
+# Live Metrics
+
+| Operation | Description |
+|---|---|
+| [Live Metrics](livemetrics-get.md) | Captures metrics using the default metric providers. |
+| [Live Custom Metrics](livemetrics-custom.md) | Captures metrics using custom metric providers. |
diff --git a/documentation/openapi.json b/documentation/openapi.json
@@ -799,7 +799,7 @@
         }
       }
     },
-    "/collectmetrics": {
+    "/livemetrics": {
       "get": {
         "tags": [
           "Diag"

diff --git a/documentation/releaseNotes/releaseNotes.md b/documentation/releaseNotes/releaseNotes.md
@@ -1,5 +1,5 @@
 Today we are releasing the next official preview of the `dotnet-monitor` tool. This release includes:
 
-- Added a new HTTP route (`/collectmetrics`) to collect metrics on demand. (#68)
+- Added a new HTTP route (`/livemetrics`) to collect metrics on demand. (#68)
 
 \*⚠️ **_indicates a breaking change_**
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -4,35 +4,35 @@
       <Uri>https://github.com/dotnet/command-line-api</Uri>
       <Sha>166610c56ff732093f0145a2911d4f6c40b786da</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Diagnostics.Monitoring" Version="5.0.0-preview.21452.1">
+    <Dependency Name="Microsoft.Diagnostics.Monitoring" Version="5.0.0-preview.21465.1">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>48a3ff7050b142fc603d2a14428e748d85b049f2</Sha>
+      <Sha>d2ac57d6bc88d3a6276ecb180945b13f2e3bb5dc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="5.0.0-preview.21452.1">
+    <Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="5.0.0-preview.21465.1">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>48a3ff7050b142fc603d2a14428e748d85b049f2</Sha>
+      <Sha>d2ac57d6bc88d3a6276ecb180945b13f2e3bb5dc</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21452.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21463.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>00949c51badfda4edd51d217a82ba607db7c4576</Sha>
+      <Sha>4b7c80f398fd3dcea03fdc4e454789b61181d300</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.21452.4">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.21463.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>00949c51badfda4edd51d217a82ba607db7c4576</Sha>
+      <Sha>4b7c80f398fd3dcea03fdc4e454789b61181d300</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.FileFormats" Version="1.0.245101">
+    <Dependency Name="Microsoft.FileFormats" Version="1.0.246501">
       <Uri>https://github.com/dotnet/symstore</Uri>
-      <Sha>085a85bd6b1f5408bfdd8435a9a2f4456949fb52</Sha>
+      <Sha>06b0f38229ef6c3bed4831f3b05ef8e75b4329f4</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.2.21453.2">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.2.21465.22">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>6613749521c3adcb4bd13830f1f2335a2105a570</Sha>
+      <Sha>69f1ace41496deda8f273027a337b1a56ed4bbfd</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.2.21452.24">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.2.21464.21">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>317dd69498a5b1f82622adbd1606c9430331dbd4</Sha>
+      <Sha>b3a9b0b740cce9322b03200db0b4ab736d7cd12d</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -27,16 +27,16 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- dotnet/arcade references -->
-    <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.21452.4</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.21463.4</MicrosoftDotNetXUnitExtensionsVersion>
     <!-- dotnet/aspnetcore references -->
-    <VSRedistCommonAspNetCoreSharedFrameworkx6460Version>6.0.0-rc.2.21453.2</VSRedistCommonAspNetCoreSharedFrameworkx6460Version>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6460Version>6.0.0-rc.2.21465.22</VSRedistCommonAspNetCoreSharedFrameworkx6460Version>
     <!-- dotnet/diagnostics references -->
-    <MicrosoftDiagnosticsMonitoringVersion>5.0.0-preview.21452.1</MicrosoftDiagnosticsMonitoringVersion>
-    <MicrosoftDiagnosticsMonitoringEventPipeVersion>5.0.0-preview.21452.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
+    <MicrosoftDiagnosticsMonitoringVersion>5.0.0-preview.21465.1</MicrosoftDiagnosticsMonitoringVersion>
+    <MicrosoftDiagnosticsMonitoringEventPipeVersion>5.0.0-preview.21465.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
     <!-- dotnet/runtime references -->
-    <VSRedistCommonNetCoreSharedFrameworkx6460Version>6.0.0-rc.2.21452.24</VSRedistCommonNetCoreSharedFrameworkx6460Version>
+    <VSRedistCommonNetCoreSharedFrameworkx6460Version>6.0.0-rc.2.21464.21</VSRedistCommonNetCoreSharedFrameworkx6460Version>
     <!-- dotnet/symstore references -->
-    <MicrosoftFileFormatsVersion>1.0.245101</MicrosoftFileFormatsVersion>
+    <MicrosoftFileFormatsVersion>1.0.246501</MicrosoftFileFormatsVersion>
   </PropertyGroup>
   <PropertyGroup Label="Runtime Versions">
     <MicrosoftNETCoreApp31Version>3.1.18</MicrosoftNETCoreApp31Version>

diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
@@ -6,7 +6,7 @@ usage()
 {
     echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir <directory>]"
     echo "BuildArch can be: arm(default), armel, arm64, x86"
-    echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.9 or alpine3.13. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
+    echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
     echo "                              for FreeBSD can be: freebsd11, freebsd12, freebsd13"
     echo "                              for illumos can be: illumos."
     echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
@@ -32,9 +32,9 @@ __UbuntuPackages="build-essential"
 __AlpinePackages="alpine-base"
 __AlpinePackages+=" build-base"
 __AlpinePackages+=" linux-headers"
-__AlpinePackagesEdgeCommunity=" lldb-dev"
-__AlpinePackagesEdgeMain+=" python3"
-__AlpinePackagesEdgeMain+=" libedit"
+__AlpinePackages+=" lldb-dev"
+__AlpinePackages+=" python3"
+__AlpinePackages+=" libedit"
 
 # symlinks fixer
 __UbuntuPackages+=" symlinks"
@@ -185,23 +185,17 @@ while :; do
             __UbuntuRepo=
             __Tizen=tizen
             ;;
-        alpine|alpine3.9)
+        alpine|alpine3.13)
             __CodeName=alpine
             __UbuntuRepo=
-            __AlpineVersion=3.9
-            __AlpinePackagesEdgeMain+=" llvm11-libs"
-            __AlpinePackagesEdgeMain+=" clang-libs"
+            __AlpineVersion=3.13
+            __AlpinePackages+=" llvm10-libs"
             ;;
-        alpine3.13)
+        alpine3.14)
             __CodeName=alpine
             __UbuntuRepo=
-            __AlpineVersion=3.13
-            # Alpine 3.13 has all the packages we need in the 3.13 repository
-            __AlpinePackages+=$__AlpinePackagesEdgeCommunity
-            __AlpinePackagesEdgeCommunity=
-            __AlpinePackages+=$__AlpinePackagesEdgeMain
-            __AlpinePackagesEdgeMain=
-            __AlpinePackages+=" llvm10-libs"
+            __AlpineVersion=3.14
+            __AlpinePackages+=" llvm11-libs"
             ;;
         freebsd11)
             __FreeBSDBase="11.3-RELEASE"
@@ -279,20 +273,6 @@ if [[ "$__CodeName" == "alpine" ]]; then
       -U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
       add $__AlpinePackages
 
-    if [[ -n "$__AlpinePackagesEdgeMain" ]]; then
-      $__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
-        -X http://dl-cdn.alpinelinux.org/alpine/edge/main \
-        -U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
-        add $__AlpinePackagesEdgeMain
-    fi
-
-    if [[ -n "$__AlpinePackagesEdgeCommunity" ]]; then
-      $__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
-        -X http://dl-cdn.alpinelinux.org/alpine/edge/community \
-        -U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
-        add $__AlpinePackagesEdgeCommunity
-    fi
-
     rm -r $__ApkToolsDir
 elif [[ "$__CodeName" == "freebsd" ]]; then
     mkdir -p $__RootfsDir/usr/local/etc

diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
@@ -44,7 +44,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
   set(TOOLCHAIN "i686-linux-gnu")
 elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
   set(CMAKE_SYSTEM_PROCESSOR "x86_64")
-  set(triple "x86_64-unknown-freebsd11")
+  set(triple "x86_64-unknown-freebsd12")
 elseif (ILLUMOS)
   set(CMAKE_SYSTEM_PROCESSOR "x86_64")
   set(TOOLCHAIN "x86_64-illumos")
@@ -91,6 +91,9 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
     set(CMAKE_CXX_COMPILER_TARGET ${triple})
     set(CMAKE_ASM_COMPILER_TARGET ${triple})
     set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld")
+    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld")
 elseif(ILLUMOS)
     set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
 
@@ -138,8 +141,8 @@ function(add_toolchain_linker_flag Flag)
   if (NOT Config STREQUAL "")
     set(CONFIG_SUFFIX "_${Config}")
   endif()
-  set("CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
-  set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
+  set("CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}_INIT" "${CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}_INIT} ${Flag}" PARENT_SCOPE)
+  set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT} ${Flag}" PARENT_SCOPE)
 endfunction()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")