Allow per provider interval specification #3591
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsSettingsFactory.cs
Outdated
Show resolved
Hide resolved
src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsSettingsTests.cs
Outdated
Show resolved
Hide resolved
src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsSettingsTests.cs
Outdated
Show resolved
Hide resolved
src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsSettingsTests.cs
Outdated
Show resolved
Hide resolved
src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsSettingsTests.cs
Outdated
Show resolved
Hide resolved
kkeirstead
reviewed
Feb 7, 2023
…tingsFactory.cs Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
jander-msft
reviewed
Feb 7, 2023
src/Microsoft.Diagnostics.Monitoring.Options/GlobalCounterOptions.cs
Outdated
Show resolved
Hide resolved
kkeirstead
reviewed
Feb 7, 2023
src/Microsoft.Diagnostics.Monitoring.Options/GlobalCounterOptions.cs
Outdated
Show resolved
Hide resolved
wiktork
added
the
update-release-notes
…icsSettingsTests.cs Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsSettingsTests.cs
Outdated
Show resolved
Hide resolved
src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsSettingsTests.cs
Outdated
Show resolved
Hide resolved
src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsSettingsTests.cs
Outdated
Show resolved
Hide resolved
src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/CollectionRuleOptionsTests.cs
Outdated
Show resolved
Hide resolved
src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/CollectionRuleOptionsTests.cs
Outdated
Show resolved
Hide resolved
schmittjoseph
previously approved these changes
Feb 10, 2023
jander-msft
previously approved these changes
Feb 10, 2023
src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsSettingsFactory.cs
Show resolved
Hide resolved
src/Tools/dotnet-monitor/CollectionRules/Triggers/AspNetRequestDurationTriggerFactory.cs
Show resolved
Hide resolved
wiktork
dismissed stale reviews from jander-msft and schmittjoseph
via
d366226
jander-msft
previously approved these changes
Feb 11, 2023
src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsSettingsFactory.cs
Outdated
Show resolved
Hide resolved
…tingsFactory.cs Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
jander-msft
approved these changes
Feb 11, 2023
|
/backport to release/7.x |
|
Started backporting to release/7.x: https://github.com/dotnet/dotnet-monitor/actions/runs/4566584470 |
|
@wiktork backporting to release/7.x failed, the patch most likely resulted in conflicts. Please backport manually using one of the below commands, followed by PowerShell (Invoke-WebRequest "https://github.com/dotnet/dotnet-monitor/commit/92217cd12cbaf926c40eb7f9fcf2ab6228279142.patch").Content | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patchBash curl -sSL "https://github.com/dotnet/dotnet-monitor/commit/92217cd12cbaf926c40eb7f9fcf2ab6228279142.patch" | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch
$ git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch changes.patch
Applying: Allow per provider interval specification (#3591)
.git/rebase-apply/patch:207: trailing whitespace.
.git/rebase-apply/patch:223: trailing whitespace.
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M documentation/schema.json
M src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.Designer.cs
M src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.resx
M src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs
M src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsSettingsFactory.cs
M src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Options/OptionsExtensions.cs
M src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/CollectionRuleOptionsTests.cs
M src/Tools/dotnet-monitor/CollectionRules/Actions/CollectTraceAction.cs
M src/Tools/dotnet-monitor/ServiceCollectionExtensions.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Tools/dotnet-monitor/ServiceCollectionExtensions.cs
Auto-merging src/Tools/dotnet-monitor/CollectionRules/Actions/CollectTraceAction.cs
Auto-merging src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/CollectionRuleOptionsTests.cs
Auto-merging src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Options/OptionsExtensions.cs
CONFLICT (content): Merge conflict in src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Options/OptionsExtensions.cs
Auto-merging src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsSettingsFactory.cs
Auto-merging src/Microsoft.Diagnostics.Monitoring.WebApi/Controllers/DiagController.cs
Auto-merging src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.resx
CONFLICT (content): Merge conflict in src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.resx
Auto-merging src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.Designer.cs
Auto-merging documentation/schema.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Allow per provider interval specification (#3591)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128 |
wiktork
added a commit
to wiktork/dotnet-monitor
that referenced
this pull request
Apr 4, 2023
* Allow per provider interval specification * Update src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsSettingsFactory.cs Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsSettingsTests.cs Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Pr feedback * pr feedback * pr feedback --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
wiktork
added a commit
that referenced
this pull request
Apr 4, 2023
#4144) * Allow per provider interval specification (#3591) * Allow per provider interval specification * Update src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsSettingsFactory.cs Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsSettingsTests.cs Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Pr feedback * pr feedback * pr feedback --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Fixup merge --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
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.
Summary
Requires dotnet/diagnostics#3639
Release Notes Entry