Skip to content

Commit

Permalink
Merge pull request serilog#834 from serilog/dev
Browse files Browse the repository at this point in the history
2.2.0 Release
  • Loading branch information
nblumhardt authored Aug 26, 2016
2 parents a29e472 + ff63c8e commit 75442ed
Show file tree
Hide file tree
Showing 43 changed files with 957 additions and 498 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ addons:
- zlib1g

os:
- osx
- linux

env:
Expand Down
21 changes: 8 additions & 13 deletions RunPerfTests.ps1
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
Push-Location $PSScriptRoot

if(Test-Path .\artifacts) { Remove-Item .\artifacts -Force -Recurse }
./Build.ps1

& dotnet restore
foreach ($test in ls test/*.PerformanceTests) {
Push-Location $test

$revision = @{ $true = $env:APPVEYOR_BUILD_NUMBER; $false = 1 }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL];
echo "perf: Running performance test project in $test"

Push-Location src/Serilog
& dotnet test -c Release
if($LASTEXITCODE -ne 0) { exit 2 }

& dotnet build -c Release -o ..\..\.\artifacts --version-suffix=$revision
if($LASTEXITCODE -ne 0) { exit 1 }

Pop-Location
Push-Location test/Serilog.PerformanceTests

& dotnet test -c Release
if($LASTEXITCODE -ne 0) { exit 2 }
Pop-Location
}

Pop-Location
Pop-Location
5 changes: 4 additions & 1 deletion Serilog.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25123.0
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{037440DE-440B-4129-9F7A-09B42D00397E}"
EndProject
Expand All @@ -12,10 +12,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{E9D1B5
.editorconfig = .editorconfig
appveyor.yml = appveyor.yml
Build.ps1 = Build.ps1
build.sh = build.sh
CHANGES.md = CHANGES.md
global.json = global.json
NuGet.config = NuGet.config
README.md = README.md
run_perf_tests.sh = run_perf_tests.sh
RunPerfTests.ps1 = RunPerfTests.ps1
assets\Serilog.snk = assets\Serilog.snk
EndProjectSection
EndProject
Expand Down
20 changes: 20 additions & 0 deletions results/net4.5.2/LevelControlBenchmark-report-github.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
```ini

Host Process Environment Information:
BenchmarkDotNet.Core=v0.9.9.0
OS=Microsoft Windows NT 6.2.9200.0
Processor=Intel(R) Core(TM) i7-3720QM CPU 2.60GHz, ProcessorCount=8
Frequency=2533306 ticks, Resolution=394.7411 ns, Timer=TSC
CLR=MS.NET 4.0.30319.42000, Arch=64-bit RELEASE [RyuJIT]
GC=Concurrent Workstation
JitModules=clrjit-v4.6.1080.0

Type=LevelControlBenchmark Mode=Throughput

```
Method | Median | StdDev | Scaled | Scaled-SD |
--------------- |----------- |---------- |------- |---------- |
Off | 4.1028 ns | 0.0534 ns | 1.00 | 0.00 |
LevelSwitchOff | 4.9870 ns | 0.0728 ns | 1.21 | 0.02 |
MinimumLevelOn | 14.6336 ns | 0.2279 ns | 3.58 | 0.07 |
LevelSwitchOn | 14.0402 ns | 0.2001 ns | 3.42 | 0.07 |
20 changes: 20 additions & 0 deletions results/net4.5.2/LogContextEnrichmentBenchmark-report-github.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
```ini

Host Process Environment Information:
BenchmarkDotNet.Core=v0.9.9.0
OS=Microsoft Windows NT 6.2.9200.0
Processor=Intel(R) Core(TM) i7-3720QM CPU 2.60GHz, ProcessorCount=8
Frequency=2533306 ticks, Resolution=394.7411 ns, Timer=TSC
CLR=MS.NET 4.0.30319.42000, Arch=64-bit RELEASE [RyuJIT]
GC=Concurrent Workstation
JitModules=clrjit-v4.6.1080.0

Type=LogContextEnrichmentBenchmark Mode=Throughput

```
Method | Median | StdDev | Scaled | Scaled-SD |
--------------------- |------------ |----------- |------- |---------- |
Bare | 14.5935 ns | 0.2010 ns | 1.00 | 0.00 |
PushProperty | 384.9070 ns | 2.4957 ns | 26.61 | 0.41 |
PushPropertyNested | 778.8093 ns | 51.8017 ns | 55.46 | 3.59 |
PushPropertyEnriched | 598.1650 ns | 12.3394 ns | 41.52 | 1.01 |
18 changes: 18 additions & 0 deletions results/net4.5.2/MessageTemplateParsingBenchmark-report-github.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
```ini

Host Process Environment Information:
BenchmarkDotNet.Core=v0.9.9.0
OS=Microsoft Windows NT 6.2.9200.0
Processor=Intel(R) Core(TM) i7-3720QM CPU 2.60GHz, ProcessorCount=8
Frequency=2533306 ticks, Resolution=394.7411 ns, Timer=TSC
CLR=MS.NET 4.0.30319.42000, Arch=64-bit RELEASE [RyuJIT]
GC=Concurrent Workstation
JitModules=clrjit-v4.6.1080.0

Type=MessageTemplateParsingBenchmark Mode=Throughput

```
Method | Median | StdDev | Scaled | Scaled-SD |
----------------------------- |-------------- |----------- |------- |---------- |
EmptyTemplate | 183.3209 ns | 3.9928 ns | 1.00 | 0.00 |
DefaultConsoleOutputTemplate | 2,636.2172 ns | 77.3304 ns | 14.40 | 0.50 |
18 changes: 18 additions & 0 deletions results/net4.5.2/NestedLoggerCreationBenchmark-report-github.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
```ini

Host Process Environment Information:
BenchmarkDotNet.Core=v0.9.9.0
OS=Microsoft Windows NT 6.2.9200.0
Processor=Intel(R) Core(TM) i7-3720QM CPU 2.60GHz, ProcessorCount=8
Frequency=2533306 ticks, Resolution=394.7411 ns, Timer=TSC
CLR=MS.NET 4.0.30319.42000, Arch=64-bit RELEASE [RyuJIT]
GC=Concurrent Workstation
JitModules=clrjit-v4.6.1080.0

Type=NestedLoggerCreationBenchmark Mode=Throughput

```
Method | Median | StdDev |
----------------- |------------ |---------- |
ForContextString | 91.0471 ns | 0.5325 ns |
ForContextType | 159.5909 ns | 1.3952 ns |
18 changes: 18 additions & 0 deletions results/net4.5.2/NestedLoggerLatencyBenchmark-report-github.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
```ini

Host Process Environment Information:
BenchmarkDotNet.Core=v0.9.9.0
OS=Microsoft Windows NT 6.2.9200.0
Processor=Intel(R) Core(TM) i7-3720QM CPU 2.60GHz, ProcessorCount=8
Frequency=2533306 ticks, Resolution=394.7411 ns, Timer=TSC
CLR=MS.NET 4.0.30319.42000, Arch=64-bit RELEASE [RyuJIT]
GC=Concurrent Workstation
JitModules=clrjit-v4.6.1080.0

Type=NestedLoggerLatencyBenchmark Mode=Throughput

```
Method | Median | StdDev | Scaled | Scaled-SD |
------------- |----------- |---------- |------- |---------- |
RootLogger | 14.5315 ns | 0.6035 ns | 1.00 | 0.00 |
NestedLogger | 52.6109 ns | 1.0453 ns | 3.60 | 0.15 |
17 changes: 17 additions & 0 deletions results/net4.5.2/PipelineBenchmark-report-github.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
```ini

Host Process Environment Information:
BenchmarkDotNet.Core=v0.9.9.0
OS=Microsoft Windows NT 6.2.9200.0
Processor=Intel(R) Core(TM) i7-3720QM CPU 2.60GHz, ProcessorCount=8
Frequency=2533306 ticks, Resolution=394.7411 ns, Timer=TSC
CLR=MS.NET 4.0.30319.42000, Arch=64-bit RELEASE [RyuJIT]
GC=Concurrent Workstation
JitModules=clrjit-v4.6.1080.0

Type=PipelineBenchmark Mode=Throughput

```
Method | Median | StdDev |
------------- |------------ |---------- |
EmitLogEvent | 419.2931 ns | 4.3815 ns |
20 changes: 20 additions & 0 deletions results/netcoreapp1.0/LevelControlBenchmark-report-github.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
```ini

Host Process Environment Information:
BenchmarkDotNet.Core=v0.9.9.0
OS=Windows
Processor=?, ProcessorCount=8
Frequency=2533306 ticks, Resolution=394.7411 ns, Timer=TSC
CLR=CORE, Arch=64-bit ? [RyuJIT]
GC=Concurrent Workstation
dotnet cli version: 1.0.0-preview2-003121

Type=LevelControlBenchmark Mode=Throughput

```
Method | Median | StdDev | Scaled | Scaled-SD |
--------------- |----------- |---------- |------- |---------- |
Off | 4.1095 ns | 0.1013 ns | 1.00 | 0.00 |
LevelSwitchOff | 4.9570 ns | 0.0807 ns | 1.20 | 0.03 |
MinimumLevelOn | 14.5884 ns | 0.1821 ns | 3.54 | 0.10 |
LevelSwitchOn | 13.9769 ns | 0.1802 ns | 3.38 | 0.09 |
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
```ini

Host Process Environment Information:
BenchmarkDotNet.Core=v0.9.9.0
OS=Windows
Processor=?, ProcessorCount=8
Frequency=2533306 ticks, Resolution=394.7411 ns, Timer=TSC
CLR=CORE, Arch=64-bit ? [RyuJIT]
GC=Concurrent Workstation
dotnet cli version: 1.0.0-preview2-003121

Type=LogContextEnrichmentBenchmark Mode=Throughput

```
Method | Median | StdDev | Scaled | Scaled-SD |
--------------------- |------------ |----------- |------- |---------- |
Bare | 14.3441 ns | 0.2826 ns | 1.00 | 0.00 |
PushProperty | 450.5621 ns | 3.2270 ns | 31.42 | 0.65 |
PushPropertyNested | 920.1179 ns | 45.1624 ns | 63.81 | 3.30 |
PushPropertyEnriched | 730.4018 ns | 4.5812 ns | 50.92 | 1.03 |
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
```ini

Host Process Environment Information:
BenchmarkDotNet.Core=v0.9.9.0
OS=Windows
Processor=?, ProcessorCount=8
Frequency=2533306 ticks, Resolution=394.7411 ns, Timer=TSC
CLR=CORE, Arch=64-bit ? [RyuJIT]
GC=Concurrent Workstation
dotnet cli version: 1.0.0-preview2-003121

Type=MessageTemplateParsingBenchmark Mode=Throughput

```
Method | Median | StdDev | Scaled | Scaled-SD |
----------------------------- |-------------- |----------- |------- |---------- |
EmptyTemplate | 188.2760 ns | 2.4773 ns | 1.00 | 0.00 |
DefaultConsoleOutputTemplate | 2,753.6243 ns | 22.7107 ns | 14.54 | 0.22 |
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
```ini

Host Process Environment Information:
BenchmarkDotNet.Core=v0.9.9.0
OS=Windows
Processor=?, ProcessorCount=8
Frequency=2533306 ticks, Resolution=394.7411 ns, Timer=TSC
CLR=CORE, Arch=64-bit ? [RyuJIT]
GC=Concurrent Workstation
dotnet cli version: 1.0.0-preview2-003121

Type=NestedLoggerCreationBenchmark Mode=Throughput

```
Method | Median | StdDev |
----------------- |------------ |---------- |
ForContextString | 92.1957 ns | 0.8786 ns |
ForContextType | 155.5276 ns | 0.8364 ns |
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
```ini

Host Process Environment Information:
BenchmarkDotNet.Core=v0.9.9.0
OS=Windows
Processor=?, ProcessorCount=8
Frequency=2533306 ticks, Resolution=394.7411 ns, Timer=TSC
CLR=CORE, Arch=64-bit ? [RyuJIT]
GC=Concurrent Workstation
dotnet cli version: 1.0.0-preview2-003121

Type=NestedLoggerLatencyBenchmark Mode=Throughput

```
Method | Median | StdDev | Scaled | Scaled-SD |
------------- |----------- |---------- |------- |---------- |
RootLogger | 14.0131 ns | 0.2212 ns | 1.00 | 0.00 |
NestedLogger | 59.4502 ns | 1.3198 ns | 4.23 | 0.11 |
17 changes: 17 additions & 0 deletions results/netcoreapp1.0/PipelineBenchmark-report-github.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
```ini

Host Process Environment Information:
BenchmarkDotNet.Core=v0.9.9.0
OS=Windows
Processor=?, ProcessorCount=8
Frequency=2533306 ticks, Resolution=394.7411 ns, Timer=TSC
CLR=CORE, Arch=64-bit ? [RyuJIT]
GC=Concurrent Workstation
dotnet cli version: 1.0.0-preview2-003121

Type=PipelineBenchmark Mode=Throughput

```
Method | Median | StdDev |
------------- |------------ |---------- |
EmitLogEvent | 712.9876 ns | 7.2272 ns |
Loading

0 comments on commit 75442ed

Please sign in to comment.