[Blazor] Remove InternalsVisibleTo from Components to Components.Server #62085
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| // 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; | ||
|
|
||
| namespace Microsoft.AspNetCore.Components.Server.Circuits; | ||
|
|
||
| /// <summary> | ||
| /// Activity source for circuit-related activities. | ||
| /// </summary> | ||
| public class CircuitActivitySource | ||
|
|
||
| { | ||
| internal const string Name = "Microsoft.AspNetCore.Components.Server"; | ||
| internal const string OnCircuitName = $"{Name}.CircuitStart"; | ||
|
|
||
| private ActivitySource ActivitySource { get; } = new ActivitySource(Name); | ||
|
|
||
| /// <summary> | ||
| /// Creates and starts a new activity for circuit initialization. | ||
| /// </summary> | ||
| /// <param name="circuitId">The ID of the circuit being initialized.</param> | ||
| /// <param name="httpContext">The HTTP context associated with the request that created the circuit.</param> | ||
| /// <returns>The created activity.</returns> | ||
| public Activity? StartCircuitActivity(string circuitId, ActivityContext httpContext) | ||
| { | ||
| var activity = ActivitySource.CreateActivity(OnCircuitName, ActivityKind.Internal, parentId: null, null, null); | ||
| if (activity is not null) | ||
| { | ||
| if (activity.IsAllDataRequested) | ||
| { | ||
| if (circuitId != null) | ||
| { | ||
| activity.SetTag("aspnetcore.components.circuit.id", circuitId); | ||
| } | ||
|
Comment on lines
+31
to
+34
|
||
| if (httpContext != default) | ||
| { | ||
| activity.AddLink(new ActivityLink(httpContext)); | ||
| } | ||
| } | ||
| activity.DisplayName = $"Circuit {circuitId ?? ""}"; | ||
| activity.Start(); | ||
| } | ||
| return activity; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Stops a circuit activity that was previously started. | ||
| /// </summary> | ||
| /// <param name="activity">The activity to stop.</param> | ||
| public void StopCircuitActivity(Activity? activity) | ||
| { | ||
| if (activity != null && !activity.IsStopped) | ||
| { | ||
| activity.Stop(); | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Marks a circuit activity as failed and stops it. | ||
| /// </summary> | ||
| /// <param name="activity">The activity to mark as failed.</param> | ||
| /// <param name="ex">The exception that caused the failure.</param> | ||
| public void FailCircuitActivity(Activity? activity, Exception ex) | ||
| { | ||
| if (activity != null && !activity.IsStopped) | ||
| { | ||
| activity.SetTag("error.type", ex.GetType().FullName); | ||
| activity.SetStatus(ActivityStatusCode.Error); | ||
| activity.Stop(); | ||
| } | ||
| } | ||
|
Comment on lines
+63
to
+71
There was a problem hiding this comment. Should receive the circuitId and add it as a tag |
||
|
|
||
| /// <summary> | ||
| /// Captures the current HTTP context activity. | ||
| /// </summary> | ||
| /// <returns>The captured HTTP context activity.</returns> | ||
| public static ActivityContext CaptureHttpContext() | ||
| { | ||
| var parentActivity = Activity.Current; | ||
| if (parentActivity is not null && parentActivity.OperationName == "Microsoft.AspNetCore.Hosting.HttpRequestIn" && parentActivity.Recorded) | ||
| { | ||
| return parentActivity.Context; | ||
| } | ||
| return default; | ||
| } | ||
| } | ||
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,24 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using Microsoft.AspNetCore.Components.Server.Circuits; | ||
| using Microsoft.Extensions.DependencyInjection.Extensions; | ||
|
|
||
| namespace Microsoft.Extensions.DependencyInjection; | ||
|
|
||
| /// <summary> | ||
| /// Extension methods for adding <see cref="CircuitActivitySource"/> to the service collection. | ||
| /// </summary> | ||
| internal static class CircuitActivitySourceServiceCollectionExtensions | ||
| { | ||
| /// <summary> | ||
| /// Adds <see cref="CircuitActivitySource"/> to the service collection. | ||
| /// </summary> | ||
| /// <param name="services">The <see cref="IServiceCollection"/>.</param> | ||
| /// <returns>The <see cref="IServiceCollection"/>.</returns> | ||
| public static IServiceCollection AddCircuitActivitySource(this IServiceCollection services) | ||
| { | ||
| services.TryAddSingleton<CircuitActivitySource>(); | ||
| return services; | ||
| } | ||
| } |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Copy all the tags or don't copy any. but don't look for the specific circuit id tag here