Skip to content
This repository has been archived by the owner on Mar 26, 2019. It is now read-only.

Commit

Permalink
Merge pull request #39 from AppMetrics/dev
Browse files Browse the repository at this point in the history
2.1.0 release
  • Loading branch information
alhardy authored Dec 2, 2018
2 parents bb85a2f + 53fefa5 commit 475e5e0
Show file tree
Hide file tree
Showing 144 changed files with 2,841 additions and 702 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ If you're unable to find an open issue related to the bug you've found go ahead

### **Contributing to the documentation**

App Metrics documentation is built using [docfx](https://dotnet.github.io/docfx/), you can find the github repo [here](https://github.com/alhardy/AppMetrics.DocFx) and create a new pull request on the `master` branch.
App Metrics documentation is built using [Hugo](https://gohugo.io/documentation/), you can find the github repo [here](https://github.com/AppMetrics/Docs.V2.Hugo) and create a new pull request on the `master` branch.
18 changes: 18 additions & 0 deletions Health.sln
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
AppMetrics.ruleset = AppMetrics.ruleset
appveyor.yml = appveyor.yml
global.json = global.json
README.md = README.md
stylecop.json = stylecop.json
version.props = version.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{DD2E4647-7125-4CE3-9BA5-B45A26113A31}"
ProjectSection(SolutionItems) = preProject
test\Directory.Build.props = test\Directory.Build.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{A335612E-C4C6-4AF4-98A9-EB9FF40CA258}"
EndProject
Expand Down Expand Up @@ -84,6 +88,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App.Metrics.Health.Abstract
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App.Metrics.Health.Checks.Sql", "src\App.Metrics.Health.Checks.Sql\App.Metrics.Health.Checks.Sql.csproj", "{ABF2C6E2-815B-495E-9E50-12FEFEA3E383}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App.Metrics.Health.Reporting.Slack", "src\App.Metrics.Health.Reporting.Slack\App.Metrics.Health.Reporting.Slack.csproj", "{C3B21944-33F3-40D7-BEB0-8681A40F7DB2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App.Metrics.Health.Reporting.Metrics", "src\App.Metrics.Health.Reporting.Metrics\App.Metrics.Health.Reporting.Metrics.csproj", "{6F39E4F0-BCA1-4CE2-AD65-C338B8B0EF2A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -154,6 +162,14 @@ Global
{ABF2C6E2-815B-495E-9E50-12FEFEA3E383}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ABF2C6E2-815B-495E-9E50-12FEFEA3E383}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ABF2C6E2-815B-495E-9E50-12FEFEA3E383}.Release|Any CPU.Build.0 = Release|Any CPU
{C3B21944-33F3-40D7-BEB0-8681A40F7DB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C3B21944-33F3-40D7-BEB0-8681A40F7DB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C3B21944-33F3-40D7-BEB0-8681A40F7DB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C3B21944-33F3-40D7-BEB0-8681A40F7DB2}.Release|Any CPU.Build.0 = Release|Any CPU
{6F39E4F0-BCA1-4CE2-AD65-C338B8B0EF2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6F39E4F0-BCA1-4CE2-AD65-C338B8B0EF2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6F39E4F0-BCA1-4CE2-AD65-C338B8B0EF2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6F39E4F0-BCA1-4CE2-AD65-C338B8B0EF2A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -179,6 +195,8 @@ Global
{ED057808-8377-46BB-95EA-2F03865B0116} = {DD2E4647-7125-4CE3-9BA5-B45A26113A31}
{6F6F9F53-4A1B-4F2B-96E3-A75BA47BCA1D} = {2D805782-756E-4C98-B22E-F502BEE95318}
{ABF2C6E2-815B-495E-9E50-12FEFEA3E383} = {2D805782-756E-4C98-B22E-F502BEE95318}
{C3B21944-33F3-40D7-BEB0-8681A40F7DB2} = {2D805782-756E-4C98-B22E-F502BEE95318}
{6F39E4F0-BCA1-4CE2-AD65-C338B8B0EF2A} = {2D805782-756E-4C98-B22E-F502BEE95318}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A8699A1D-0BA1-403C-86E9-C789CD2645EB}
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ App Metrics Health is an open-source and cross-platform .NET library used define
|App.Metrics.Health.Checks.Process|[![MyGet Status](https://img.shields.io/myget/appmetrics/v/App.Metrics.Health.Checks.Process.svg?style=flat-square0)](https://www.myget.org/feed/appmetrics/package/nuget/App.Metrics.Health.Checks.Process)|[![NuGet Status](https://img.shields.io/nuget/vpre/App.Metrics.Health.Checks.Process.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.Health.Checks.Process/)|[![NuGet Status](https://img.shields.io/nuget/v/App.Metrics.Health.Checks.Process.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.Health.Checks.Process/)
|App.Metrics.Health.Core|[![MyGet Status](https://img.shields.io/myget/appmetrics/v/App.Metrics.Health.Core.svg?style=flat-square0)](https://www.myget.org/feed/appmetrics/package/nuget/App.Metrics.Health.Core)|[![NuGet Status](https://img.shields.io/nuget/vpre/App.Metrics.Health.Core.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.Health.Core/)|[![NuGet Status](https://img.shields.io/nuget/v/App.Metrics.Health.Core.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.Health.Core/)
|App.Metrics.Health.Formatters.Ascii|[![MyGet Status](https://img.shields.io/myget/appmetrics/v/App.Metrics.Health.Formatters.Ascii.svg?style=flat-square&maxAge=7200)](https://www.myget.org/feed/appmetrics/package/nuget/App.Metrics.Health.Formatters.Ascii)|[![NuGet Status](https://img.shields.io/nuget/vpre/App.Metrics.Health.Formatters.Ascii.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.Health.Formatters.Ascii/)|[![NuGet Status](https://img.shields.io/nuget/v/App.Metrics.Health.Formatters.Ascii.svg)](https://www.nuget.org/packages/App.Metrics.Health.Formatters.Ascii/)
|App.Metrics.Health.Formatters.Json|[![MyGet Status](https://img.shields.io/myget/appmetrics/v/App.Metrics.Health.Formatters.Json.svg?style=flat-square)](https://www.myget.org/feed/appmetrics/package/nuget/App.Metrics.Health.Formatters.Json)|[![NuGet Status](https://img.shields.io/nuget/vpre/App.Metrics.Health.Formatters.Json.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.Health.Formatters.Json/)|[![NuGet Status](https://img.shields.io/nuget/v/App.Metrics.Health.Formatters.Json.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.Health.Formatters.Json/)|
|App.Metrics.Health.Formatters.Json|[![MyGet Status](https://img.shields.io/myget/appmetrics/v/App.Metrics.Health.Formatters.Json.svg?style=flat-square)](https://www.myget.org/feed/appmetrics/package/nuget/App.Metrics.Health.Formatters.Json)|[![NuGet Status](https://img.shields.io/nuget/vpre/App.Metrics.Health.Formatters.Json.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.Health.Formatters.Json/)|[![NuGet Status](https://img.shields.io/nuget/v/App.Metrics.Health.Formatters.Json.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.Health.Formatters.Json/)
|App.Metrics.Health.Reporting.Slack|[![MyGet Status](https://img.shields.io/myget/appmetrics/v/App.Metrics.Health.Reporting.Slack.svg?style=flat-square)](https://www.myget.org/feed/appmetrics/package/nuget/App.Metrics.Health.Reporting.Slack)|[![NuGet Status](https://img.shields.io/nuget/vpre/App.Metrics.Health.Reporting.Slack.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.Health.Reporting.Slack/)|[![NuGet Status](https://img.shields.io/nuget/v/App.Metrics.Health.Reporting.Slack.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.Health.Reporting.Slack/)
|App.Metrics.Health.Reporting.Metrics|[![MyGet Status](https://img.shields.io/myget/appmetrics/v/App.Metrics.Health.Reporting.Metrics.svg?style=flat-square)](https://www.myget.org/feed/appmetrics/package/nuget/App.Metrics.Health.Reporting.Metrics)|[![NuGet Status](https://img.shields.io/nuget/vpre/App.Metrics.Health.Reporting.Metrics.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.Health.Reporting.Metrics/)|[![NuGet Status](https://img.shields.io/nuget/v/App.Metrics.Health.Reporting.Metrics.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.Health.Reporting.Metrics/)|

----------

Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ deploy:
skip_symbols: true
symbol_server: https://www.myget.org/F/appmetrics/symbol
install:
- cmd: curl -O https://download.microsoft.com/download/0/F/D/0FD852A4-7EA1-4E2A-983A-0484AC19B92C/dotnet-sdk-2.0.0-win-x64.exe
- cmd: dotnet-sdk-2.0.0-win-x64.exe /install /quiet /norestart /log install.log
- cmd: curl -O https://download.microsoft.com/download/8/8/5/88544F33-836A-49A5-8B67-451C24709A8F/dotnet-sdk-2.1.300-win-x64.exe
- cmd: dotnet-sdk-2.1.300-win-x64.exe /install /quiet /norestart /log install.log
skip_commits:
files:
- '**/*.md'
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<Import Project="..\..\build\common.props" />

<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<OutputType>exe</OutputType>
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461</TargetFrameworks>
<LangVersion>latest</LangVersion>
<ServerGarbageCollection>true</ServerGarbageCollection>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
<PackageReference Include="BenchmarkDotNet.Core" Version="$(BenchmarkDotNetVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/App.Metrics.Benchmarks.Runner/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// <copyright file="Program.cs" company="Allan Hardy">
// Copyright (c) Allan Hardy. All rights reserved.
// <copyright file="Program.cs" company="App Metrics Contributors">
// Copyright (c) App Metrics Contributors. All rights reserved.
// </copyright>

using System;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
<Import Project="..\..\build\common.props" />

<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461</TargetFrameworks>
<LangVersion>latest</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand All @@ -20,7 +21,6 @@
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
<PackageReference Include="xunit" Version="$(XunitVersion)" />
<PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
<PackageReference Include="BenchmarkDotNet.Core" Version="$(BenchmarkDotNetVersion)" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// <copyright file="MeasureReadHealthStatusBenchmark.cs" company="Allan Hardy">
// Copyright (c) Allan Hardy. All rights reserved.
// <copyright file="MeasureReadHealthStatusBenchmark.cs" company="App Metrics Contributors">
// Copyright (c) App Metrics Contributors. All rights reserved.
// </copyright>

using System.Diagnostics;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// <copyright file="DefaultConfig.cs" company="Allan Hardy">
// Copyright (c) Allan Hardy. All rights reserved.
// <copyright file="DefaultConfig.cs" company="App Metrics Contributors">
// Copyright (c) App Metrics Contributors. All rights reserved.
// </copyright>

using BenchmarkDotNet.Configs;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// <copyright file="DefaultBenchmarkBase.cs" company="Allan Hardy">
// Copyright (c) Allan Hardy. All rights reserved.
// <copyright file="DefaultBenchmarkBase.cs" company="App Metrics Contributors">
// Copyright (c) App Metrics Contributors. All rights reserved.
// </copyright>

using App.Metrics.Health.Benchmarks.Configs;
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/App.Metrics.Health.Benchmarks/Facts/HealthCheck.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// <copyright file="HealthCheck.cs" company="Allan Hardy">
// Copyright (c) Allan Hardy. All rights reserved.
// <copyright file="HealthCheck.cs" company="App Metrics Contributors">
// Copyright (c) App Metrics Contributors. All rights reserved.
// </copyright>

using System.Diagnostics;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// <copyright file="HealthTestFixture.cs" company="Allan Hardy">
// Copyright (c) Allan Hardy. All rights reserved.
// <copyright file="HealthTestFixture.cs" company="App Metrics Contributors">
// Copyright (c) App Metrics Contributors. All rights reserved.
// </copyright>

using System;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// <copyright file="BenchmarkTestExecutor.cs" company="Allan Hardy">
// Copyright (c) Allan Hardy. All rights reserved.
// <copyright file="BenchmarkTestExecutor.cs" company="App Metrics Contributors">
// Copyright (c) App Metrics Contributors. All rights reserved.
// </copyright>

using System;
Expand Down Expand Up @@ -81,7 +81,7 @@ private Summary CanExecute(Type type, IConfig config = null, bool fullValidation

Assert.True(
summary.Reports.All(r => r.BuildResult.IsBuildSuccess),
"The following benchmarks are failed to build: " + string.Join(", ", summary.Reports.Where(r => !r.BuildResult.IsBuildSuccess).Select(r => r.Benchmark.DisplayInfo)));
"The following benchmarks are failed to build: " + string.Join(", ", summary.Reports.Where(r => !r.BuildResult.IsBuildSuccess).Select(r => r.BenchmarkCase.DisplayInfo)));

Assert.True(
summary.Reports.All(r => r.ExecuteResults.Any(er => er.FoundExecutable && er.Data.Any())),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// <copyright file="BenchmarkTestRunner.cs" company="Allan Hardy">
// Copyright (c) Allan Hardy. All rights reserved.
// <copyright file="BenchmarkTestRunner.cs" company="App Metrics Contributors">
// Copyright (c) App Metrics Contributors. All rights reserved.
// </copyright>

using System.Linq;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// <copyright file="BenchmarksAssemblyMarker.cs" company="Allan Hardy">
// Copyright (c) Allan Hardy. All rights reserved.
// <copyright file="BenchmarksAssemblyMarker.cs" company="App Metrics Contributors">
// Copyright (c) App Metrics Contributors. All rights reserved.
// </copyright>

namespace App.Metrics.Health.Benchmarks.Support
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// <copyright file="OutputLogger.cs" company="Allan Hardy">
// Copyright (c) Allan Hardy. All rights reserved.
// <copyright file="OutputLogger.cs" company="App Metrics Contributors">
// Copyright (c) App Metrics Contributors. All rights reserved.
// </copyright>

using System;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// <copyright file="SimpleBenchmarkRunner.cs" company="Allan Hardy">
// Copyright (c) Allan Hardy. All rights reserved.
// <copyright file="SimpleBenchmarkRunner.cs" company="App Metrics Contributors">
// Copyright (c) App Metrics Contributors. All rights reserved.
// </copyright>

using System;
Expand Down
10 changes: 5 additions & 5 deletions benchmarks/App.Metrics.Health.Benchmarks/Support/TestConfigs.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// <copyright file="TestConfigs.cs" company="Allan Hardy">
// Copyright (c) Allan Hardy. All rights reserved.
// <copyright file="TestConfigs.cs" company="App Metrics Contributors">
// Copyright (c) App Metrics Contributors. All rights reserved.
// </copyright>

using BenchmarkDotNet.Configs;
Expand All @@ -17,20 +17,20 @@ public class SingleRunFastConfig : ManualConfig

public class SingleRunMediumConfig : ManualConfig
{
public SingleRunMediumConfig() { Add(new Job(Job.Dry) { Run = { TargetCount = 5 } }); }
public SingleRunMediumConfig() { Add(new Job(Job.Dry) { Run = { IterationCount = 5 } }); }
}

public class ThroughputFastConfig : ManualConfig
{
public ThroughputFastConfig() { Add(new Job(Job.Dry) { Run = { RunStrategy = RunStrategy.Throughput, TargetCount = 1 } }); }
public ThroughputFastConfig() { Add(new Job(Job.Dry) { Run = { RunStrategy = RunStrategy.Throughput, IterationCount = 1 } }); }
}

public class DiagnoserConfig : ManualConfig
{
public DiagnoserConfig()
{
// Diagnosers need enough runs to collects the statistics!
Add(new Job { Run = { LaunchCount = 1, WarmupCount = 1, TargetCount = 50 } });
Add(new Job { Run = { LaunchCount = 1, WarmupCount = 1, IterationCount = 50 } });
}
}
#pragma warning restore SA1649, SA1402
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// <copyright file="Health.cs" company="Allan Hardy">
// Copyright (c) Allan Hardy. All rights reserved.
// <copyright file="Health.cs" company="App Metrics Contributors">
// Copyright (c) App Metrics Contributors. All rights reserved.
// </copyright>

using App.Metrics.Health.Benchmarks.BenchmarkDotNetBenchmarks;
Expand Down
Loading

0 comments on commit 475e5e0

Please sign in to comment.