-
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
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
2 changes: 1 addition & 1 deletion
2
src/Middleware/Diagnostics/test/FunctionalTests/ExceptionHandlerSampleTest.cs
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
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
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
49 changes: 49 additions & 0 deletions
49
src/Middleware/Diagnostics/test/testassets/ExceptionHandlerSample/StartupWithWebSocket.cs
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
|
||
using System.Diagnostics; | ||
using System.Text; | ||
using System.Text.Encodings.Web; | ||
using Microsoft.AspNetCore.Diagnostics; | ||
using Microsoft.AspNetCore.Http.Metadata; | ||
|
||
namespace ExceptionHandlerSample; | ||
|
||
// Note that this class isn't used in tests as TestServer doesn't have the right behavior to test web sockets | ||
// in the way we need. But leaving here so it can be used in Program.cs when starting the app manually. | ||
public class StartupWithWebSocket | ||
{ | ||
public void ConfigureServices(IServiceCollection services) | ||
{ | ||
} | ||
|
||
public void Configure(IApplicationBuilder app) | ||
{ | ||
app.UseExceptionHandler(options => { }); // Exception handling middleware introduces duplicate tag | ||
app.UseWebSockets(); | ||
|
||
app.Use(async (HttpContext context, Func<Task> next) => | ||
{ | ||
try | ||
{ | ||
if (context.WebSockets.IsWebSocketRequest) | ||
{ | ||
using var ws = await context.WebSockets.AcceptWebSocketAsync(); | ||
await ws.SendAsync(new ArraySegment<byte>(Encoding.UTF8.GetBytes("Hello")), System.Net.WebSockets.WebSocketMessageType.Text, true, context.RequestAborted); | ||
await ws.CloseAsync(System.Net.WebSockets.WebSocketCloseStatus.NormalClosure, "done", context.RequestAborted); | ||
throw new InvalidOperationException("Throw after websocket request completion to produce the bug"); | ||
} | ||
else | ||
{ | ||
await context.Response.WriteAsync($"Not a web socket request. PID: {Process.GetCurrentProcess().Id}"); | ||
} | ||
} | ||
catch (Exception ex) | ||
{ | ||
_ = ex; | ||
throw; | ||
} | ||
}); | ||
} | ||
} | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
|
||
using System.Diagnostics; | ||
using Microsoft.AspNetCore.Http.Features; | ||
|
||
namespace Microsoft.AspNetCore.Http; | ||
|
||
internal static class MetricsExtensions | ||
{ | ||
public static bool TryAddTag(this IHttpMetricsTagsFeature feature, string name, object? value) | ||
{ | ||
var tags = feature.Tags; | ||
|
||
// Tags is internally represented as a List<T>. | ||
// Prefer looping through the list to avoid allocating an enumerator. | ||
if (tags is List<KeyValuePair<string, object?>> list) | ||
{ | ||
foreach (var tag in list) | ||
amcasey marked this conversation as resolved.
Show resolved
Hide resolved
|
||
{ | ||
if (tag.Key == name) | ||
{ | ||
return false; | ||
} | ||
} | ||
} | ||
else | ||
{ | ||
foreach (var tag in tags) | ||
{ | ||
if (tag.Key == name) | ||
{ | ||
return false; | ||
} | ||
} | ||
} | ||
|
||
tags.Add(new KeyValuePair<string, object?>(name, value)); | ||
return true; | ||
} | ||
|
||
public static bool TryAddTag(this ref TagList tags, string name, object? value) | ||
{ | ||
for (var i = 0; i < tags.Count; i++) | ||
{ | ||
if (tags[i].Key == name) | ||
{ | ||
return false; | ||
} | ||
} | ||
|
||
tags.Add(new KeyValuePair<string, object?>(name, value)); | ||
return true; | ||
} | ||
} |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.