Skip to content

Commit e98c055

Browse files
alhardyalhardy
committed
AppMetrics#590 adding collectors to capture system usage and gc events
1 parent 2b80de9 commit e98c055

35 files changed

+638
-460
lines changed

‎clean_cache.ps1

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics\ -Recurse -ErrorAction SilentlyContinue
22
Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.abstractions\ -Recurse -ErrorAction SilentlyContinue
3+
Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.appnetcore\ -Recurse -ErrorAction SilentlyContinue
34
Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.aspnetcore\ -Recurse -ErrorAction SilentlyContinue
45
Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.aspnetcore.abstractions\ -Recurse -ErrorAction SilentlyContinue
56
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
1314
Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.concurrency\ -Recurse -ErrorAction SilentlyContinue
1415
Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.core\ -Recurse -ErrorAction SilentlyContinue
1516
Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.extensions.configuration\ -Recurse -ErrorAction SilentlyContinue
17+
Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.extensions.collectors\ -Recurse -ErrorAction SilentlyContinue
1618
Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.extensions.dependencyinjection\ -Recurse -ErrorAction SilentlyContinue
1719
Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.extensions.healthchecks\ -Recurse -ErrorAction SilentlyContinue
1820
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
2224
Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.formatters.influxdb\ -Recurse -ErrorAction SilentlyContinue
2325
Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.formatters.json\ -Recurse -ErrorAction SilentlyContinue
2426
Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.formatters.prometheus\ -Recurse -ErrorAction SilentlyContinue
27+
Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.formatting.datadog\ -Recurse -ErrorAction SilentlyContinue
2528
Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.reporting.console\ -Recurse -ErrorAction SilentlyContinue
29+
Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.reporting.datadog\ -Recurse -ErrorAction SilentlyContinue
2630
Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.reporting.grafanacloudhostedmetrics\ -Recurse -ErrorAction SilentlyContinue
2731
Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.reporting.graphite\ -Recurse -ErrorAction SilentlyContinue
2832
Remove-Item $env:USERPROFILE\.nuget\packages\app.metrics.reporting.http\ -Recurse -ErrorAction SilentlyContinue

‎src/Directory.Build.targets

+13-3
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@
2222

2323
<!-- Extensions -->
2424
<PackageReference Update="App.Metrics.AppNetCore" Version="$(AppMetricsVersion)" />
25+
<PackageReference Update="App.Metrics.Extensions.Collectors" Version="$(AppMetricsVersion)" />
2526
<PackageReference Update="App.Metrics.Extensions.Configuration" Version="$(AppMetricsVersion)" />
26-
<PackageReference Update="App.Metrics.Extensions.HealthChecks" Version="$(AppMetricsVersion)" />
27+
<PackageReference Update="App.Metrics.Extensions.HealthChecks" Version="$(AppMetricsVersion)" />
2728
<PackageReference Update="App.Metrics.Extensions.DependencyInjection" Version="$(AppMetricsVersion)" />
2829
<PackageReference Update="App.Metrics.Extensions.Hosting" Version="$(AppMetricsVersion)" />
2930

3031
<!-- Reporting -->
31-
<PackageReference Update="App.Metrics.Formatting.DataDog" Version="$(AppMetricsVersion)" />
32-
<PackageReference Update="App.Metrics.Reporting.DataDog" Version="$(AppMetricsVersion)" />
32+
<PackageReference Update="App.Metrics.Formatting.DataDog" Version="$(AppMetricsVersion)" />
33+
<PackageReference Update="App.Metrics.Reporting.DataDog" Version="$(AppMetricsVersion)" />
3334
<PackageReference Update="App.Metrics.Reporting.Console" Version="$(AppMetricsVersion)" />
3435
<PackageReference Update="App.Metrics.Reporting.Http" Version="$(AppMetricsVersion)" />
3536
<PackageReference Update="App.Metrics.Reporting.Socket" Version="$(AppMetricsVersion)" />
@@ -64,6 +65,15 @@
6465

6566
<!-- NServiceBus -->
6667
<PackageReference Update="App.Metrics.Extensions.NServiceBus" Version="$(FrameworkVersion)" />
68+
69+
<!-- Meta Packages -->
70+
<PackageReference Update="App.Metrics.App.All" Version="$(AppMetricsVersion)" />
71+
<PackageReference Update="App.Metrics.AspNetCore.All" Version="$(AppMetricsVersion)" />
72+
<PackageReference Update="App.Metrics.Datadog" Version="$(AppMetricsVersion)" />
73+
<PackageReference Update="App.Metrics.GrafanaCloudHostedMetrics" Version="$(AppMetricsVersion)" />
74+
<PackageReference Update="App.Metrics.Graphite" Version="$(AppMetricsVersion)" />
75+
<PackageReference Update="App.Metrics.InfluxDB" Version="$(AppMetricsVersion)" />
76+
<PackageReference Update="App.Metrics.Prometheus" Version="$(AppMetricsVersion)" />
6777

6878
<!-- Tests -->
6979
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.3.0" />

‎src/Extensions/Extensions.sln

+14
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App.Metrics.AppNetCore", "s
4040
EndProject
4141
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}"
4242
EndProject
43+
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}"
44+
EndProject
45+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CollectorsSandbox", "sandbox\CollectorsSandbox\CollectorsSandbox.csproj", "{266F8348-5D24-4A75-9ABD-159D5E694C2D}"
46+
EndProject
4347
Global
4448
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4549
Debug|Any CPU = Debug|Any CPU
@@ -82,6 +86,14 @@ Global
8286
{49ED905C-6926-4F22-AF90-BF310F05B9E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
8387
{49ED905C-6926-4F22-AF90-BF310F05B9E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
8488
{49ED905C-6926-4F22-AF90-BF310F05B9E5}.Release|Any CPU.Build.0 = Release|Any CPU
89+
{F878DD28-6BC9-4028-95A3-87304F1C8482}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
90+
{F878DD28-6BC9-4028-95A3-87304F1C8482}.Debug|Any CPU.Build.0 = Debug|Any CPU
91+
{F878DD28-6BC9-4028-95A3-87304F1C8482}.Release|Any CPU.ActiveCfg = Release|Any CPU
92+
{F878DD28-6BC9-4028-95A3-87304F1C8482}.Release|Any CPU.Build.0 = Release|Any CPU
93+
{266F8348-5D24-4A75-9ABD-159D5E694C2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
94+
{266F8348-5D24-4A75-9ABD-159D5E694C2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
95+
{266F8348-5D24-4A75-9ABD-159D5E694C2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
96+
{266F8348-5D24-4A75-9ABD-159D5E694C2D}.Release|Any CPU.Build.0 = Release|Any CPU
8597
EndGlobalSection
8698
GlobalSection(SolutionProperties) = preSolution
8799
HideSolutionNode = FALSE
@@ -97,6 +109,8 @@ Global
97109
{68356D5D-1CB0-4943-83C0-94FFD2BE1AFA} = {82216E00-F815-4464-9316-144F47326679}
98110
{EA922A73-194C-43B8-872E-80C1E4774F87} = {2D805782-756E-4C98-B22E-F502BEE95318}
99111
{49ED905C-6926-4F22-AF90-BF310F05B9E5} = {2D805782-756E-4C98-B22E-F502BEE95318}
112+
{F878DD28-6BC9-4028-95A3-87304F1C8482} = {2D805782-756E-4C98-B22E-F502BEE95318}
113+
{266F8348-5D24-4A75-9ABD-159D5E694C2D} = {82216E00-F815-4464-9316-144F47326679}
100114
EndGlobalSection
101115
GlobalSection(ExtensibilityGlobals) = postSolution
102116
SolutionGuid = {A8699A1D-0BA1-403C-86E9-C789CD2645EB}

‎src/Extensions/sandbox/CollectorsSandbox/CollectorsSandbox.csproj

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<Import Project="..\..\build\common.props" />
4+
5+
<PropertyGroup>
6+
<TargetFramework>netcoreapp3.1</TargetFramework>
7+
<IsPackable>false</IsPackable>
8+
<LangVersion>Latest</LangVersion>
9+
<OutputType>exe</OutputType>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
14+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.5" />
15+
</ItemGroup>
16+
17+
<ItemGroup>
18+
<ProjectReference Include="..\..\src\App.Metrics.AppNetCore\App.Metrics.AppNetCore.csproj" />
19+
</ItemGroup>
20+
</Project>

‎src/Extensions/sandbox/CollectorsSandbox/Host.cs

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// <copyright file="Host.cs" company="App Metrics Contributors">
2+
// Copyright (c) App Metrics Contributors. All rights reserved.
3+
// </copyright>
4+
5+
using System;
6+
using System.Threading.Tasks;
7+
using MetricsMicrosoftExtensionsSandbox;
8+
using Microsoft.Extensions.DependencyInjection;
9+
using Microsoft.Extensions.Hosting;
10+
11+
namespace CollectorsSandbox
12+
{
13+
public class Host
14+
{
15+
public static async Task Main()
16+
{
17+
var host = new HostBuilder()
18+
.ConfigureMetrics(
19+
(context, builder) =>
20+
{
21+
builder.Report.Using<SimpleConsoleMetricsReporter>(TimeSpan.FromSeconds(5));
22+
})
23+
.ConfigureServices(services =>
24+
{
25+
services.AddAppMetricsCollectors(options =>
26+
{
27+
options.CollectIntervalMilliseconds = 10000;
28+
});
29+
})
30+
.Build();
31+
32+
await host.RunAsync();
33+
}
34+
}
35+
}

‎src/Extensions/sandbox/HealthHostingMicrosoftExtensionsSandbox/SimpleConsoleMetricsReporter.cs ‎src/Extensions/sandbox/CollectorsSandbox/SimpleConsoleMetricsReporter.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
using App.Metrics.Formatters.Ascii;
1414
using App.Metrics.Reporting;
1515

16-
namespace HealthHostingMicrosoftExtensionsSandbox
16+
namespace MetricsMicrosoftExtensionsSandbox
1717
{
1818
public class SimpleConsoleMetricsReporter : IReportMetrics
1919
{

‎src/Extensions/sandbox/CollectorsSandbox/appsettings.json

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{
2+
}

‎src/Extensions/sandbox/HealthHostingMicrosoftExtensionsSandbox/Extensions/HostExtensions.cs

-53
This file was deleted.

‎src/Extensions/sandbox/HealthHostingMicrosoftExtensionsSandbox/HealthHostingMicrosoftExtensionsSandbox.csproj

-42
This file was deleted.

‎src/Extensions/sandbox/HealthHostingMicrosoftExtensionsSandbox/Host.cs

-86
This file was deleted.

‎src/Extensions/sandbox/HealthHostingMicrosoftExtensionsSandbox/SampleHealthCheck.cs

-35
This file was deleted.

‎src/Extensions/sandbox/HealthHostingMicrosoftExtensionsSandbox/appsettings.json

-8
This file was deleted.

0 commit comments

Comments
 (0)