Add support for System.Diagnostics.Metrics #3479
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
…rsing (#3137) * Fix ICountersLogger contract * MetadataUpdates * Fixup merge issues * Fixup api protection levels * Fixup tests and add CounterEnded payload * Fixup metadata parsing
…ck. Still need to address erroneusly printing error message when doing live metrics without Sys.Diag.Metrics, and add configuration option to allow users to specify eventcounter/sys.diag.metrics
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsStore.cs
Outdated
Show resolved
Hide resolved
src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsFormattingTests.cs
Show resolved
Hide resolved
src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsFormattingTests.cs
Outdated
Show resolved
Hide resolved
…20230130.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 6.0.0-preview.23077.1 -> To Version 6.0.0-preview.23080.1
wiktork
commented
Jan 31, 2023
wiktork
commented
Jan 31, 2023
jander-msft
reviewed
Jan 31, 2023
src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/JsonCounterLogger.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsStore.cs
Outdated
Show resolved
Hide resolved
wiktork
commented
Jan 31, 2023
Co-authored-by: Justin Anderson <[email protected]>
Co-authored-by: Justin Anderson <[email protected]>
jander-msft
approved these changes
Feb 1, 2023
wiktork
added
the
update-release-notes
|
/backport to release/7.x |
|
Started backporting to release/7.x: https://github.com/dotnet/dotnet-monitor/actions/runs/4236876361 |
|
@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/7725e816a3144ccd277c8e71c7ad04dc2980ff28.patch").Content | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patchBash curl -sSL "https://github.com/dotnet/dotnet-monitor/commit/7725e816a3144ccd277c8e71c7ad04dc2980ff28.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: Add support for System.Diagnostics.Metrics (#3479)
.git/rebase-apply/patch:474: trailing whitespace.
.git/rebase-apply/patch:490: trailing whitespace.
.git/rebase-apply/patch:499: trailing whitespace.
.git/rebase-apply/patch:1174: trailing whitespace.
.git/rebase-apply/patch:1190: trailing whitespace.
warning: 5 lines add whitespace errors.
Using index info to reconstruct a base tree...
M cspell.json
M documentation/schema.json
M eng/Version.Details.xml
M eng/Versions.props
M src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.Designer.cs
M src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.resx
M src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Program.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Program.cs
CONFLICT (content): Merge conflict in src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Program.cs
Auto-merging src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.resx
Auto-merging src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.Designer.cs
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
Auto-merging eng/Version.Details.xml
CONFLICT (content): Merge conflict in eng/Version.Details.xml
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 Add support for System.Diagnostics.Metrics (#3479)
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
Feb 22, 2023
* Add prototype support for system diagnostics metrics * [feature branch, do not review] Update counter api, fixup metadata parsing (dotnet#3137) * Fix ICountersLogger contract * MetadataUpdates * Fixup merge issues * Fixup api protection levels * Fixup tests and add CounterEnded payload * Fixup metadata parsing * [System Diagnostics Metrics] Quantile->Percentile Changes & Testing Improvements (dotnet#3165) * Rename counterpipeline * Fix invariant * Fixup regex * Added tests for histogram and timeseries; addressed some other feedback. Still need to address erroneusly printing error message when doing live metrics without Sys.Diag.Metrics, and add configuration option to allow users to specify eventcounter/sys.diag.metrics * Fix counter name * Use one payload for Histogram * Added MetricType option for configuration; added testing to go along with it * Move documentation to correct file * Initial PR feedback * Do not allow CounterEnded events to displace existing metrics * Deduplicate errors * Update dependencies from https://github.com/dotnet/diagnostics build 20230130.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 6.0.0-preview.23077.1 -> To Version 6.0.0-preview.23080.1 * Fix minor formatting issues * Fix spell check issues * Update documentation/configuration/metrics-configuration.md Co-authored-by: Justin Anderson <[email protected]> * Update documentation/configuration/metrics-configuration.md Co-authored-by: Justin Anderson <[email protected]> * PR Feedback * Add comment from PR --------- Co-authored-by: kkeirstead <[email protected]> Co-authored-by: kkeirstead <[email protected]> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Justin Anderson <[email protected]>
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
Relies on dotnet/diagnostics#3587
Release Notes Entry
Add support for System.Diagnostics.Metrics