Custom TagWithContext to extend EF Core TagWith with caller class name, method and tag/purpose (optional)

TagWithExtensions.cs

public static class TagWithExtensions
{
    public static IQueryable<T> TagWithContext<T>(this IQueryable<T> queryable, string? message = "", [CallerFilePath] string callerFileName = "", [CallerMemberName] string callerName = "")
    {
        string logScopeName = GenerateLogScopeName(message, callerFileName, callerName);
        return queryable.TagWith(logScopeName);
    }

    private static string GenerateLogScopeName(string? message = null, string callerFileName = "", string callerName = "")
    {
        if (!string.IsNullOrWhiteSpace(message))
        {
            message = "-" + message;
        }

        string className = Path.GetFileNameWithoutExtension(callerFileName);
        return className + "-" + callerName + message;
    }
}