-
Notifications
You must be signed in to change notification settings - Fork 10.3k
Fix duplicate error.type tags #55211
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Conversation
This file contains hidden or 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
Closed
1 task
amcasey
approved these changes
Apr 19, 2024
/backport to release/8.0 |
Started backporting to release/8.0: https://github.com/dotnet/aspnetcore/actions/runs/8792220010 |
@JamesNK backporting to release/8.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix duplicate error.type tags
.git/rebase-apply/patch:351: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M src/Hosting/Hosting/src/Internal/HostingMetrics.cs
M src/Middleware/Diagnostics/test/FunctionalTests/TestFixture.cs
M src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerTest.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerTest.cs
CONFLICT (content): Merge conflict in src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerTest.cs
Auto-merging src/Middleware/Diagnostics/test/FunctionalTests/TestFixture.cs
Auto-merging src/Hosting/Hosting/src/Internal/HostingMetrics.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix duplicate error.type tags
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 Please backport manually! |
@JamesNK an error occurred while backporting to release/8.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
JamesNK
added a commit
that referenced
this pull request
Apr 22, 2024
wtgodbe
pushed a commit
that referenced
this pull request
May 2, 2024
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.
Fixes #55159
Duplicate metrics tags can break some telemetry tooling. It's possible to have ASP.NET Core add multiple
error.type
tags to a counter. That's bad and should be fixed.error.type
can be added by exception middleware and it can be added in hosting if there is an unhandled exception. That means there can be duplicates if:Fix by conditionally adding
error.type
to tag collection only if it isn't present, aka first value wins.Before (duplicate tags):
After (one tag):