AppMetrics#590 adding collectors to capture system usage and gc events

seif · Jul 9, 2020 · e98c055 · e98c055
1 parent 2b80de9
commit e98c055
Show file tree

Hide file tree

Showing 35 changed files with 638 additions and 460 deletions.
diff --git a/clean_cache.ps1 b/clean_cache.ps1
@@ -1,5 +1,6 @@
 Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics\ -Recurse -ErrorAction SilentlyContinue
 Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.abstractions\ -Recurse -ErrorAction SilentlyContinue
+Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.appnetcore\ -Recurse -ErrorAction SilentlyContinue
 Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.aspnetcore\ -Recurse -ErrorAction SilentlyContinue
 Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.aspnetcore.abstractions\ -Recurse -ErrorAction SilentlyContinue
 Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.aspnetcore.core\ -Recurse -ErrorAction SilentlyContinue
@@ -13,6 +14,7 @@ Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.aspnetcore.tracking\ -R
 Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.concurrency\ -Recurse -ErrorAction SilentlyContinue
 Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.core\ -Recurse -ErrorAction SilentlyContinue
 Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.extensions.configuration\ -Recurse -ErrorAction SilentlyContinue
+Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.extensions.collectors\ -Recurse -ErrorAction SilentlyContinue
 Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.extensions.dependencyinjection\ -Recurse -ErrorAction SilentlyContinue
 Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.extensions.healthchecks\ -Recurse -ErrorAction SilentlyContinue
 Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.extensions.hosting\ -Recurse -ErrorAction SilentlyContinue
@@ -22,7 +24,9 @@ Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.formatters.graphite\ -R
 Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.formatters.influxdb\ -Recurse -ErrorAction SilentlyContinue
 Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.formatters.json\ -Recurse -ErrorAction SilentlyContinue
 Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.formatters.prometheus\ -Recurse -ErrorAction SilentlyContinue
+Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.formatting.datadog\ -Recurse -ErrorAction SilentlyContinue
 Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.reporting.console\ -Recurse -ErrorAction SilentlyContinue
+Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.reporting.datadog\ -Recurse -ErrorAction SilentlyContinue
 Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.reporting.grafanacloudhostedmetrics\ -Recurse -ErrorAction SilentlyContinue
 Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.reporting.graphite\ -Recurse -ErrorAction SilentlyContinue
 Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.reporting.http\ -Recurse -ErrorAction SilentlyContinue

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -22,14 +22,15 @@
 
     <!-- Extensions -->
     <PackageReference Update="App.Metrics.AppNetCore" Version="$(AppMetricsVersion)" />
+	<PackageReference Update="App.Metrics.Extensions.Collectors" Version="$(AppMetricsVersion)" />
     <PackageReference Update="App.Metrics.Extensions.Configuration" Version="$(AppMetricsVersion)" />
-	  <PackageReference Update="App.Metrics.Extensions.HealthChecks" Version="$(AppMetricsVersion)" />
+	<PackageReference Update="App.Metrics.Extensions.HealthChecks" Version="$(AppMetricsVersion)" />
     <PackageReference Update="App.Metrics.Extensions.DependencyInjection" Version="$(AppMetricsVersion)" />
     <PackageReference Update="App.Metrics.Extensions.Hosting" Version="$(AppMetricsVersion)" />
 
     <!-- Reporting -->
-	  <PackageReference Update="App.Metrics.Formatting.DataDog" Version="$(AppMetricsVersion)" />
-	  <PackageReference Update="App.Metrics.Reporting.DataDog" Version="$(AppMetricsVersion)" />
+	<PackageReference Update="App.Metrics.Formatting.DataDog" Version="$(AppMetricsVersion)" />
+	<PackageReference Update="App.Metrics.Reporting.DataDog" Version="$(AppMetricsVersion)" />
     <PackageReference Update="App.Metrics.Reporting.Console" Version="$(AppMetricsVersion)" />
     <PackageReference Update="App.Metrics.Reporting.Http" Version="$(AppMetricsVersion)" />
     <PackageReference Update="App.Metrics.Reporting.Socket" Version="$(AppMetricsVersion)" />
@@ -64,6 +65,15 @@
 
     <!-- NServiceBus -->
     <PackageReference Update="App.Metrics.Extensions.NServiceBus" Version="$(FrameworkVersion)" />
+
+	<!-- Meta Packages -->
+    <PackageReference Update="App.Metrics.App.All" Version="$(AppMetricsVersion)" />
+	<PackageReference Update="App.Metrics.AspNetCore.All" Version="$(AppMetricsVersion)" />
+	<PackageReference Update="App.Metrics.Datadog" Version="$(AppMetricsVersion)" />
+	<PackageReference Update="App.Metrics.GrafanaCloudHostedMetrics" Version="$(AppMetricsVersion)" />
+	<PackageReference Update="App.Metrics.Graphite" Version="$(AppMetricsVersion)" />
+	<PackageReference Update="App.Metrics.InfluxDB" Version="$(AppMetricsVersion)" />
+	<PackageReference Update="App.Metrics.Prometheus" Version="$(AppMetricsVersion)" />
 
     <!-- Tests -->
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.3.0" />

diff --git a/src/Extensions/Extensions.sln b/src/Extensions/Extensions.sln
@@ -40,6 +40,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App.Metrics.AppNetCore", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App.Metrics.Extensions.HealthChecks", "src\App.Metrics.Extensions.HealthChecks\App.Metrics.Extensions.HealthChecks.csproj", "{49ED905C-6926-4F22-AF90-BF310F05B9E5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "App.Metrics.Extensions.Collectors", "src\App.Metrics.Extensions.Collectors\App.Metrics.Extensions.Collectors.csproj", "{F878DD28-6BC9-4028-95A3-87304F1C8482}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CollectorsSandbox", "sandbox\CollectorsSandbox\CollectorsSandbox.csproj", "{266F8348-5D24-4A75-9ABD-159D5E694C2D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -82,6 +86,14 @@ Global
 		{49ED905C-6926-4F22-AF90-BF310F05B9E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{49ED905C-6926-4F22-AF90-BF310F05B9E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{49ED905C-6926-4F22-AF90-BF310F05B9E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F878DD28-6BC9-4028-95A3-87304F1C8482}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F878DD28-6BC9-4028-95A3-87304F1C8482}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F878DD28-6BC9-4028-95A3-87304F1C8482}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F878DD28-6BC9-4028-95A3-87304F1C8482}.Release|Any CPU.Build.0 = Release|Any CPU
+		{266F8348-5D24-4A75-9ABD-159D5E694C2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{266F8348-5D24-4A75-9ABD-159D5E694C2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{266F8348-5D24-4A75-9ABD-159D5E694C2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{266F8348-5D24-4A75-9ABD-159D5E694C2D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -97,6 +109,8 @@ Global
 		{68356D5D-1CB0-4943-83C0-94FFD2BE1AFA} = {82216E00-F815-4464-9316-144F47326679}
 		{EA922A73-194C-43B8-872E-80C1E4774F87} = {2D805782-756E-4C98-B22E-F502BEE95318}
 		{49ED905C-6926-4F22-AF90-BF310F05B9E5} = {2D805782-756E-4C98-B22E-F502BEE95318}
+		{F878DD28-6BC9-4028-95A3-87304F1C8482} = {2D805782-756E-4C98-B22E-F502BEE95318}
+		{266F8348-5D24-4A75-9ABD-159D5E694C2D} = {82216E00-F815-4464-9316-144F47326679}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A8699A1D-0BA1-403C-86E9-C789CD2645EB}

diff --git a/src/Extensions/sandbox/CollectorsSandbox/CollectorsSandbox.csproj b/src/Extensions/sandbox/CollectorsSandbox/CollectorsSandbox.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\build\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <IsPackable>false</IsPackable>
+        <LangVersion>Latest</LangVersion>
+        <OutputType>exe</OutputType>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.5" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\App.Metrics.AppNetCore\App.Metrics.AppNetCore.csproj" />
+    </ItemGroup>
+</Project>
diff --git a/src/Extensions/sandbox/CollectorsSandbox/Host.cs b/src/Extensions/sandbox/CollectorsSandbox/Host.cs
@@ -0,0 +1,35 @@
+// <copyright file="Host.cs" company="App Metrics Contributors">
+// Copyright (c) App Metrics Contributors. All rights reserved.
+// </copyright>
+
+using System;
+using System.Threading.Tasks;
+using MetricsMicrosoftExtensionsSandbox;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+namespace CollectorsSandbox
+{
+    public class Host
+    {
+        public static async Task Main()
+        {
+            var host = new HostBuilder()
+                .ConfigureMetrics(
+                    (context, builder) =>
+                    {
+                        builder.Report.Using<SimpleConsoleMetricsReporter>(TimeSpan.FromSeconds(5));
+                    })
+                .ConfigureServices(services =>
+                {
+                    services.AddAppMetricsCollectors(options =>
+                    {
+                        options.CollectIntervalMilliseconds = 10000;
+                    });
+                })
+                .Build();
+
+            await host.RunAsync();
+        }
+    }
+}
diff --git a/...nsSandbox/SimpleConsoleMetricsReporter.cs → ...rsSandbox/SimpleConsoleMetricsReporter.cs b/...nsSandbox/SimpleConsoleMetricsReporter.cs → ...rsSandbox/SimpleConsoleMetricsReporter.cs
@@ -13,7 +13,7 @@
 using App.Metrics.Formatters.Ascii;
 using App.Metrics.Reporting;
 
-namespace HealthHostingMicrosoftExtensionsSandbox
+namespace MetricsMicrosoftExtensionsSandbox
 {
     public class SimpleConsoleMetricsReporter : IReportMetrics
     {

diff --git a/src/Extensions/sandbox/CollectorsSandbox/appsettings.json b/src/Extensions/sandbox/CollectorsSandbox/appsettings.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/src/Extensions/sandbox/HealthHostingMicrosoftExtensionsSandbox/Extensions/HostExtensions.cs b/src/Extensions/sandbox/HealthHostingMicrosoftExtensionsSandbox/Extensions/HostExtensions.cs
diff --git a/...ox/HealthHostingMicrosoftExtensionsSandbox/HealthHostingMicrosoftExtensionsSandbox.csproj b/...ox/HealthHostingMicrosoftExtensionsSandbox/HealthHostingMicrosoftExtensionsSandbox.csproj
diff --git a/src/Extensions/sandbox/HealthHostingMicrosoftExtensionsSandbox/Host.cs b/src/Extensions/sandbox/HealthHostingMicrosoftExtensionsSandbox/Host.cs
diff --git a/src/Extensions/sandbox/HealthHostingMicrosoftExtensionsSandbox/SampleHealthCheck.cs b/src/Extensions/sandbox/HealthHostingMicrosoftExtensionsSandbox/SampleHealthCheck.cs
diff --git a/src/Extensions/sandbox/HealthHostingMicrosoftExtensionsSandbox/appsettings.json b/src/Extensions/sandbox/HealthHostingMicrosoftExtensionsSandbox/appsettings.json