Skip to content

Commit

Permalink
Merge pull request #48 from Particular/develop
Browse files Browse the repository at this point in the history
NServiceBus.Metrics.PerformanceCounters 2.0
  • Loading branch information
dvdstelt authored Nov 14, 2017
2 parents 6f1c916 + 22fc35c commit d10061c
Show file tree
Hide file tree
Showing 77 changed files with 825 additions and 1,920 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,6 @@ src/scaffolding.config
.idea/
*.sln.iml
src/ForIntegration/*
src/Integration/Directory.Build.props

.learningtransport
6 changes: 4 additions & 2 deletions GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
assembly-versioning-scheme: Major
next-version: 1.0.0
next-version: 2.0.0
commit-message-incrementing: Disabled
branches:
release:
tag: beta
develop:
tag: alpha
tag: alpha
24 changes: 0 additions & 24 deletions packaging/nuget/NServiceBus.Metrics.PerformanceCounters.nuspec

This file was deleted.

8 changes: 8 additions & 0 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project>

<PropertyGroup>
<LangVersion>latest</LangVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

</Project>
56 changes: 0 additions & 56 deletions src/GuardTemplates.DotSettings

This file was deleted.

22 changes: 0 additions & 22 deletions src/Integration/Integration.sln

This file was deleted.

64 changes: 0 additions & 64 deletions src/Integration/MyEndpoint/MyEndpoint.csproj

This file was deleted.

47 changes: 0 additions & 47 deletions src/Integration/MyEndpoint/Program.cs

This file was deleted.

5 changes: 0 additions & 5 deletions src/Integration/MyEndpoint/packages.config

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
namespace NServiceBus.Metrics.PerformanceCounters
[assembly: System.Runtime.CompilerServices.InternalsVisibleToAttribute(@"NServiceBus.Metrics.PerformanceCounters.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100D32BC524DCB1205998C155A4F36BF873587D3602822ECD7B49CD775B2E6A006EE6B9164AB2E3103A6A4D1310C6E5C26818A32FE86710141A2D1F02EB564381CD64C88131BCCA478CDB5072F06DB991DE33DAC1C82BAF40D9F61DD6B40300A4673B693B51CD10A8B9B7D8AB64450431FA422514D6DABCAF70DF785B1E4E6E8AAF")]
[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5.2", FrameworkDisplayName=".NET Framework 4.5.2")]
namespace NServiceBus.Metrics.PerformanceCounters
{
[System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.All)]
public sealed class PerformanceCounterSettingsAttribute : System.Attribute
Expand All @@ -18,6 +20,8 @@ namespace NServiceBus
public class PerformanceCountersSettings
{
public void EnableSLAPerformanceCounters(System.TimeSpan sla) { }
[System.ObsoleteAttribute("This interval is no longer used for reporting. Counters values are updated as soo" +
"n as they are reported. Will be removed in version 3.0.0.", true)]
public void UpdateCounterEvery(System.TimeSpan updateInterval) { }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@ public void Approve()

string Filter(string text)
{
return string.Join(Environment.NewLine, text.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries)
.Where(l => !l.StartsWith("[assembly: "))
return string.Join(Environment.NewLine, text.Split(new[]
{
Environment.NewLine
}, StringSplitOptions.RemoveEmptyEntries)
.Where(l => !l.StartsWith("[assembly: ReleaseDateAttribute("))
.Where(l => !string.IsNullOrWhiteSpace(l))
);
);
}

}
Loading

0 comments on commit d10061c

Please sign in to comment.