Master to develop #44
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ary (#37) * exptected script content * cs script generator * ps1 script writer
Timers are reset after not receiving pipeline completion for 2 seconds
# Conflicts: # src/NServiceBus.Metrics.PerformanceCounters.Tests/PerformanceCounterUpdaterTests.cs # src/NServiceBus.Metrics.PerformanceCounters/PerformanceCounterUpdater.cs # src/NServiceBus.Metrics.PerformanceCounters/PerformanceCountersFeature.cs # src/ScriptBuilder/CSharpCounterWriter.cs # src/ScriptBuilder/PowerShellCounterWriter.cs # src/ScriptBuilderTask.Tests/CSharpCodeGenerationTests.Generates.approved.cs # src/ScriptBuilderTask.Tests/PowershellCodeGenerationTests.Generates.approved.ps1
tmasternak
previously approved these changes
Nov 13, 2017
| @@ -46,5 +66,34 @@ public void Observe(ProbeContext context) | |||
|
|
|||
| readonly PerformanceCountersCache cache; | |||
| readonly Dictionary<string, CounterInstanceName?> legacyInstanceNameMap; | |||
| readonly ConcurrentDictionary<CounterInstanceName, IPerformanceCounterInstance> expirable = new ConcurrentDictionary<CounterInstanceName, IPerformanceCounterInstance>(); | |||
There was a problem hiding this comment.
How about we change the name to resettable? This would align with resetEvery vairable name
|
Aside from this PR I think that we should obsolete the script generators before we release 2.0. |
tmasternak
approved these changes
Nov 13, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges back
mastertodevelopbringing back resetting counters and all the fixes we did on1.*. It needs to be carefully reviewed as it required a lot of work related to merging these two diverged streams of work.Details
The merge was quite demanding. The main aspect that took a lot of time was the updater component that is now being cleaned by a separate task. It required to start a cleaning task as there's no longer
.Updatethat is periodically called by theMetricspackage.