Skip to content
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.

Sign up for GitHub

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

[main] Update dependencies from dotnet/efcore dotnet/runtime #46055

Merged
merged 14 commits into from
Jan 17, 2023
Merged

[main] Update dependencies from dotnet/efcore dotnet/runtime #46055

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
957fb04
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Jan 12, 2023
8af87ef
Fix duplicate event name to resolve build failure
SteveSandersonMS Jan 12, 2023
ea3fb29
Suppress new SYSLIB1025 warning in HealthChecks.
eerhardt Jan 12, 2023
f6d255a
Fix duplicate event name in RedisLog.
eerhardt Jan 12, 2023
6d24b84
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Jan 12, 2023
6f96531
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Jan 12, 2023
71f1c90
Resolve duplicate EventNames in LoggerMessage attributes in Components.
eerhardt Jan 13, 2023
6479ba9
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Jan 13, 2023
3559e61
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Jan 14, 2023
aa27102
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Jan 15, 2023
c227f5d
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Jan 16, 2023
7aedb59
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Jan 16, 2023
5648453
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Jan 17, 2023
025251a
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
276 changes: 138 additions & 138 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

138 changes: 69 additions & 69 deletions eng/Versions.props
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion src/Components/Server/src/Circuits/CircuitHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ public static void BeginInvokeDotNet(ILogger logger, string callId, string assem
}
}

[LoggerMessage(218, LogLevel.Debug, "Failed to invoke static method with identifier '{MethodIdentifier}' on assembly '{Assembly}' with callback id '{CallId}'.", EventName = "BeginInvokeDotNetFailed")]
[LoggerMessage(218, LogLevel.Debug, "Failed to invoke static method with identifier '{MethodIdentifier}' on assembly '{Assembly}' with callback id '{CallId}'.", EventName = "BeginInvokeDotNetStaticFailed")]
private static partial void BeginInvokeDotNetStaticFailed(ILogger logger, string methodIdentifier, string assembly, string callId, Exception exception);

public static void BeginInvokeDotNetFailed(ILogger logger, string callId, string assemblyName, string methodIdentifier, long dotNetObjectId, Exception exception)
Expand All @@ -809,7 +809,9 @@ public static void BeginInvokeDotNetFailed(ILogger logger, string callId, string
}
}

#pragma warning disable SYSLIB1025
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the warning from?

Copy link
Member

@JamesNK JamesNK Jan 14, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, it's from LocationChangeFailed. Should change to LocationChangeFailedInCircuit.

Edit: The log content is the same, but one is error, and the other is info. I don't know what is going on with why it was added 😕

[LoggerMessage(219, LogLevel.Error, "Location change to '{URI}' in circuit '{CircuitId}' failed.", EventName = "LocationChangeFailed")]
public static partial void LocationChangeFailedInCircuit(ILogger logger, string uri, CircuitId circuitId, Exception exception);
#pragma warning restore SYSLIB1025
}
}
2 changes: 1 addition & 1 deletion src/Components/Server/src/Circuits/CircuitRegistry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ public static void ExceptionDisposingTokenSource(ILogger logger, Exception excep
[LoggerMessage(114, LogLevel.Error, "Exception handler for {CircuitId} failed.", EventName = "CircuitExceptionHandlerFailed")]
public static partial void CircuitExceptionHandlerFailed(ILogger logger, CircuitId circuitId, Exception exception);

[LoggerMessage(115, LogLevel.Debug, "Reconnect to circuit with id {CircuitId} succeeded.", EventName = "FailedToReconnectToCircuit")]
[LoggerMessage(115, LogLevel.Debug, "Reconnect to circuit with id {CircuitId} succeeded.", EventName = "ReconnectionSucceeded")]
public static partial void ReconnectionSucceeded(ILogger logger, CircuitId circuitId);
}
}
4 changes: 4 additions & 0 deletions src/Components/Server/src/Circuits/RemoteJSRuntime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,14 +199,18 @@ public static partial class Log
[LoggerMessage(2, LogLevel.Debug, "There was an error invoking the static method '[{AssemblyName}]::{MethodIdentifier}' with callback id '{CallbackId}'.", EventName = "InvokeDotNetMethodException")]
private static partial void InvokeStaticDotNetMethodException(ILogger logger, string assemblyName, string methodIdentifier, string? callbackId, Exception exception);

#pragma warning disable SYSLIB1025
[LoggerMessage(4, LogLevel.Debug, "There was an error invoking the instance method '{MethodIdentifier}' on reference '{DotNetObjectReference}' with callback id '{CallbackId}'.", EventName = "InvokeDotNetMethodException")]
private static partial void InvokeInstanceDotNetMethodException(ILogger logger, string methodIdentifier, long dotNetObjectReference, string? callbackId, Exception exception);
#pragma warning restore SYSLIB1025

[LoggerMessage(3, LogLevel.Debug, "Invocation of '[{AssemblyName}]::{MethodIdentifier}' with callback id '{CallbackId}' completed successfully.", EventName = "InvokeDotNetMethodSuccess")]
private static partial void InvokeStaticDotNetMethodSuccess(ILogger<RemoteJSRuntime> logger, string assemblyName, string methodIdentifier, string? callbackId);

#pragma warning disable SYSLIB1025
[LoggerMessage(5, LogLevel.Debug, "Invocation of '{MethodIdentifier}' on reference '{DotNetObjectReference}' with callback id '{CallbackId}' completed successfully.", EventName = "InvokeDotNetMethodSuccess")]
private static partial void InvokeInstanceDotNetMethodSuccess(ILogger<RemoteJSRuntime> logger, string methodIdentifier, long dotNetObjectReference, string? callbackId);
#pragma warning restore SYSLIB1025
Comment on lines +202 to +213
Copy link
Member

@JamesNK JamesNK Jan 14, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What are the warnings from?

These names look intentionally the same again, but the log ID is different. Should the log names change? @javiercn


internal static void InvokeDotNetMethodException(ILogger logger, in DotNetInvocationInfo invocationInfo, Exception exception)
{
Expand Down
2 changes: 2 additions & 0 deletions src/HealthChecks/HealthChecks/src/DefaultHealthCheckService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ public static void HealthCheckProcessingEnd(ILogger logger, HealthStatus status,
private const string HealthCheckEndText = "Health check {HealthCheckName} with status {HealthStatus} completed after {ElapsedMilliseconds}ms with message '{HealthCheckDescription}'";

#pragma warning disable SYSLIB1006
#pragma warning disable SYSLIB1025
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure about reusing the same error ID with different log levels. I don't think we do this anywhere else. Suppressing now is fine, but should look into improving this in the future: #46099

[LoggerMessage(EventIds.HealthCheckEndId, LogLevel.Debug, HealthCheckEndText, EventName = EventIds.HealthCheckEndName)]
private static partial void HealthCheckEndHealthy(ILogger logger, string HealthCheckName, HealthStatus HealthStatus, double ElapsedMilliseconds, string? HealthCheckDescription);

Expand All @@ -226,6 +227,7 @@ public static void HealthCheckProcessingEnd(ILogger logger, HealthStatus status,

[LoggerMessage(EventIds.HealthCheckEndId, LogLevel.Error, HealthCheckEndText, EventName = EventIds.HealthCheckEndName)]
private static partial void HealthCheckEndUnhealthy(ILogger logger, string HealthCheckName, HealthStatus HealthStatus, double ElapsedMilliseconds, string? HealthCheckDescription, Exception? exception);
#pragma warning restore SYSLIB1025
#pragma warning restore SYSLIB1006

public static void HealthCheckEnd(ILogger logger, HealthCheckRegistration registration, HealthReportEntry entry, TimeSpan duration)
Expand Down
2 changes: 1 addition & 1 deletion src/Middleware/ResponseCaching/src/LoggerExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ internal static partial class LoggerExtensions
EventName = "ResponseWithUnsuccessfulStatusCodeNotCacheable")]
internal static partial void ResponseWithUnsuccessfulStatusCodeNotCacheable(this ILogger logger, int statusCode);

[LoggerMessage(18, LogLevel.Debug, "The 'IfNoneMatch' header of the request contains a value of *.", EventName = "ExpirationExpiresExceeded")]
[LoggerMessage(18, LogLevel.Debug, "The 'IfNoneMatch' header of the request contains a value of *.", EventName = "NotModifiedIfNoneMatchStar")]
internal static partial void NotModifiedIfNoneMatchStar(this ILogger logger);

[LoggerMessage(19, LogLevel.Debug, "The ETag {ETag} in the 'IfNoneMatch' header matched the ETag of a cached entry.",
Expand Down
2 changes: 1 addition & 1 deletion src/SignalR/server/StackExchangeRedis/src/Internal/RedisLog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static void ConnectingToEndpoints(ILogger logger, EndPointCollection endp
[LoggerMessage(6, LogLevel.Trace, "Unsubscribing from channel: {Channel}.", EventName = "Unsubscribe")]
public static partial void Unsubscribe(ILogger logger, string channel);

[LoggerMessage(7, LogLevel.Error, "Not connected to Redis.", EventName = "Connected")]
[LoggerMessage(7, LogLevel.Error, "Not connected to Redis.", EventName = "NotConnected")]
public static partial void NotConnected(ILogger logger);

[LoggerMessage(8, LogLevel.Information, "Connection to Redis restored.", EventName = "ConnectionRestored")]
Expand Down