-
Notifications
You must be signed in to change notification settings - Fork 25.1k
WN Update: SignalR ActivitySource #34183
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 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
551a690
WN Update SignalR ActivitySource
wadepickett 2c98fbf
WN Update: SignalR ActivitySource
wadepickett 1eb35ca
Corrected ending snippet tag in program.cs
wadepickett d5917c0
Corrected formatting for ActivitySource name.
wadepickett 62af44c
Update aspnetcore/release-notes/aspnetcore-9/includes/signalrActiviti…
wadepickett 591a848
Removed dupe code in program.cs
wadepickett 3fda76e
Updated code highlight to match code change
wadepickett 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
File renamed without changes
58 changes: 0 additions & 58 deletions
58
...release-notes/aspnetcore-9/includes/signalr-distributed-tracing-improvements.md
This file was deleted.
Oops, something went wrong.
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
12 changes: 12 additions & 0 deletions
12
aspnetcore/release-notes/aspnetcore-9/samples/SignalRChatTraceExample/ChatHub/ChatHub.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,12 @@ | ||
| using Microsoft.AspNetCore.SignalR; | ||
|
|
||
| namespace SignalRChat.Hubs | ||
| { | ||
| public class ChatHub : Hub | ||
| { | ||
| public async Task SendMessage(string user, string message) | ||
| { | ||
| await Clients.All.SendAsync("ReceiveMessage", user, message); | ||
| } | ||
| } | ||
| } |
26 changes: 26 additions & 0 deletions
26
aspnetcore/release-notes/aspnetcore-9/samples/SignalRChatTraceExample/Pages/Error.cshtml
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,26 @@ | ||
| @page | ||
| @model ErrorModel | ||
| @{ | ||
| ViewData["Title"] = "Error"; | ||
| } | ||
|
|
||
| <h1 class="text-danger">Error.</h1> | ||
| <h2 class="text-danger">An error occurred while processing your request.</h2> | ||
|
|
||
| @if (Model.ShowRequestId) | ||
| { | ||
| <p> | ||
| <strong>Request ID:</strong> <code>@Model.RequestId</code> | ||
| </p> | ||
| } | ||
|
|
||
| <h3>Development Mode</h3> | ||
| <p> | ||
| Swapping to the <strong>Development</strong> environment displays detailed information about the error that occurred. | ||
| </p> | ||
| <p> | ||
| <strong>The Development environment shouldn't be enabled for deployed applications.</strong> | ||
| It can result in displaying sensitive information from exceptions to end users. | ||
| For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong> | ||
| and restarting the app. | ||
| </p> |
28 changes: 28 additions & 0 deletions
28
aspnetcore/release-notes/aspnetcore-9/samples/SignalRChatTraceExample/Pages/Error.cshtml.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,28 @@ | ||
| using System.Diagnostics; | ||
| using Microsoft.AspNetCore.Mvc; | ||
| using Microsoft.AspNetCore.Mvc.RazorPages; | ||
|
|
||
| namespace SignalRChat.Pages | ||
| { | ||
| [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] | ||
| [IgnoreAntiforgeryToken] | ||
| public class ErrorModel : PageModel | ||
| { | ||
| public string? RequestId { get; set; } | ||
|
|
||
| public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); | ||
|
|
||
| private readonly ILogger<ErrorModel> _logger; | ||
|
|
||
| public ErrorModel(ILogger<ErrorModel> logger) | ||
| { | ||
| _logger = logger; | ||
| } | ||
|
|
||
| public void OnGet() | ||
| { | ||
| RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier; | ||
| } | ||
| } | ||
|
|
||
| } |
28 changes: 28 additions & 0 deletions
28
aspnetcore/release-notes/aspnetcore-9/samples/SignalRChatTraceExample/Pages/Index.cshtml
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,28 @@ | ||
| @page | ||
| <div class="container"> | ||
| <div class="row p-1"> | ||
| <div class="col-1">User</div> | ||
| <div class="col-5"><input type="text" id="userInput" /></div> | ||
| </div> | ||
| <div class="row p-1"> | ||
| <div class="col-1">Message</div> | ||
| <div class="col-5"><input type="text" class="w-100" id="messageInput" /></div> | ||
| </div> | ||
| <div class="row p-1"> | ||
| <div class="col-6 text-end"> | ||
| <input type="button" id="sendButton" value="Send Message" /> | ||
| </div> | ||
| </div> | ||
| <div class="row p-1"> | ||
| <div class="col-6"> | ||
| <hr /> | ||
| </div> | ||
| </div> | ||
| <div class="row p-1"> | ||
| <div class="col-6"> | ||
| <ul id="messagesList"></ul> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <script src="~/js/signalr/dist/browser/signalr.js"></script> | ||
| <script src="~/js/chat.js"></script> |
20 changes: 20 additions & 0 deletions
20
aspnetcore/release-notes/aspnetcore-9/samples/SignalRChatTraceExample/Pages/Index.cshtml.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,20 @@ | ||
| using Microsoft.AspNetCore.Mvc; | ||
| using Microsoft.AspNetCore.Mvc.RazorPages; | ||
|
|
||
| namespace SignalRChat.Pages | ||
| { | ||
| public class IndexModel : PageModel | ||
| { | ||
| private readonly ILogger<IndexModel> _logger; | ||
|
|
||
| public IndexModel(ILogger<IndexModel> logger) | ||
| { | ||
| _logger = logger; | ||
| } | ||
|
|
||
| public void OnGet() | ||
| { | ||
|
|
||
| } | ||
| } | ||
| } |
8 changes: 8 additions & 0 deletions
8
aspnetcore/release-notes/aspnetcore-9/samples/SignalRChatTraceExample/Pages/Privacy.cshtml
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,8 @@ | ||
| @page | ||
| @model PrivacyModel | ||
| @{ | ||
| ViewData["Title"] = "Privacy Policy"; | ||
| } | ||
| <h1>@ViewData["Title"]</h1> | ||
|
|
||
| <p>Use this page to detail your site's privacy policy.</p> |
20 changes: 20 additions & 0 deletions
20
...etcore/release-notes/aspnetcore-9/samples/SignalRChatTraceExample/Pages/Privacy.cshtml.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,20 @@ | ||
| using Microsoft.AspNetCore.Mvc; | ||
| using Microsoft.AspNetCore.Mvc.RazorPages; | ||
|
|
||
| namespace SignalRChat.Pages | ||
| { | ||
| public class PrivacyModel : PageModel | ||
| { | ||
| private readonly ILogger<PrivacyModel> _logger; | ||
|
|
||
| public PrivacyModel(ILogger<PrivacyModel> logger) | ||
| { | ||
| _logger = logger; | ||
| } | ||
|
|
||
| public void OnGet() | ||
| { | ||
| } | ||
| } | ||
|
|
||
| } |
52 changes: 52 additions & 0 deletions
52
...re/release-notes/aspnetcore-9/samples/SignalRChatTraceExample/Pages/Shared/_Layout.cshtml
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,52 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="utf-8" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <title>@ViewData["Title"] - SignalRChat</title> | ||
| <script type="importmap"></script> | ||
| <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" /> | ||
| <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" /> | ||
| <link rel="stylesheet" href="~/SignalRChat.styles.css" asp-append-version="true" /> | ||
| </head> | ||
| <body> | ||
| <header> | ||
| <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3"> | ||
| <div class="container"> | ||
| <a class="navbar-brand" asp-area="" asp-page="/Index">SignalRChat</a> | ||
| <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent" | ||
| aria-expanded="false" aria-label="Toggle navigation"> | ||
| <span class="navbar-toggler-icon"></span> | ||
| </button> | ||
| <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between"> | ||
| <ul class="navbar-nav flex-grow-1"> | ||
| <li class="nav-item"> | ||
| <a class="nav-link text-dark" asp-area="" asp-page="/Index">Home</a> | ||
| </li> | ||
| <li class="nav-item"> | ||
| <a class="nav-link text-dark" asp-area="" asp-page="/Privacy">Privacy</a> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| </nav> | ||
| </header> | ||
| <div class="container"> | ||
| <main role="main" class="pb-3"> | ||
| @RenderBody() | ||
| </main> | ||
| </div> | ||
|
|
||
| <footer class="border-top footer text-muted"> | ||
| <div class="container"> | ||
| © 2024 - SignalRChat - <a asp-area="" asp-page="/Privacy">Privacy</a> | ||
| </div> | ||
| </footer> | ||
|
|
||
| <script src="~/lib/jquery/dist/jquery.js"></script> | ||
| <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.js"></script> | ||
| <script src="~/js/site.js" asp-append-version="true"></script> | ||
|
|
||
| @await RenderSectionAsync("Scripts", required: false) | ||
| </body> | ||
| </html> |
48 changes: 48 additions & 0 deletions
48
...elease-notes/aspnetcore-9/samples/SignalRChatTraceExample/Pages/Shared/_Layout.cshtml.css
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,48 @@ | ||
| /* Please see documentation at https://learn.microsoft.com/aspnet/core/client-side/bundling-and-minification | ||
| for details on configuring this project to bundle and minify static web assets. */ | ||
|
|
||
| a.navbar-brand { | ||
| white-space: normal; | ||
| text-align: center; | ||
| word-break: break-all; | ||
| } | ||
|
|
||
| a { | ||
| color: #0077cc; | ||
| } | ||
|
|
||
| .btn-primary { | ||
| color: #fff; | ||
| background-color: #1b6ec2; | ||
| border-color: #1861ac; | ||
| } | ||
|
|
||
| .nav-pills .nav-link.active, .nav-pills .show > .nav-link { | ||
| color: #fff; | ||
| background-color: #1b6ec2; | ||
| border-color: #1861ac; | ||
| } | ||
|
|
||
| .border-top { | ||
| border-top: 1px solid #e5e5e5; | ||
| } | ||
| .border-bottom { | ||
| border-bottom: 1px solid #e5e5e5; | ||
| } | ||
|
|
||
| .box-shadow { | ||
| box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); | ||
| } | ||
|
|
||
| button.accept-policy { | ||
| font-size: 1rem; | ||
| line-height: inherit; | ||
| } | ||
|
|
||
| .footer { | ||
| position: absolute; | ||
| bottom: 0; | ||
| width: 100%; | ||
| white-space: nowrap; | ||
| line-height: 60px; | ||
| } |
2 changes: 2 additions & 0 deletions
2
...spnetcore-9/samples/SignalRChatTraceExample/Pages/Shared/_ValidationScriptsPartial.cshtml
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,2 @@ | ||
| <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script> | ||
| <script src="~/lib/jquery-validation-unobtrusive/dist/jquery.validate.unobtrusive.js"></script> |
3 changes: 3 additions & 0 deletions
3
...core/release-notes/aspnetcore-9/samples/SignalRChatTraceExample/Pages/_ViewImports.cshtml
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,3 @@ | ||
| @using SignalRChat | ||
| @namespace SignalRChat.Pages | ||
| @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers |
3 changes: 3 additions & 0 deletions
3
...etcore/release-notes/aspnetcore-9/samples/SignalRChatTraceExample/Pages/_ViewStart.cshtml
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,3 @@ | ||
| @{ | ||
| Layout = "_Layout"; | ||
| } |
Oops, something went wrong.
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.