diff --git a/dvc/analytics.py b/dvc/analytics.py index 2ad66cb35..6fbb7a99a 100644 --- a/dvc/analytics.py +++ b/dvc/analytics.py @@ -1,10 +1,11 @@ import json -import logging import os +from dvc.log import logger + from .env import DVC_ANALYTICS_ENDPOINT, DVC_NO_ANALYTICS -logger = logging.getLogger(__name__) +logger = logger.getChild(__name__) def collect_and_send_report(args=None, return_code=None): @@ -35,9 +36,7 @@ def collect_and_send_report(args=None, return_code=None): with tempfile.NamedTemporaryFile(delete=False, mode="w") as fobj: json.dump(report, fobj) - logger.trace( # type: ignore[attr-defined] - "Saving analytics report to %s", fobj.name - ) + logger.trace("Saving analytics report to %s", fobj.name) daemon(["analytics", fobj.name]) @@ -78,15 +77,15 @@ def send(path): report.update(_runtime_info()) logger.debug("uploading report to %s", url) - logger.trace("Sending %s to %s", report, url) # type: ignore[attr-defined] + logger.trace("Sending %s to %s", report, url) try: requests.post(url, json=report, headers=headers, timeout=5) except requests.exceptions.RequestException as e: - logger.trace("", exc_info=True) # type: ignore[attr-defined] + logger.trace("", exc_info=True) logger.debug("failed to send analytics report %s", str(e)) - logger.trace("removing report %s", path) # type: ignore[attr-defined] + logger.trace("removing report %s", path) os.remove(path) diff --git a/dvc/cli/__init__.py b/dvc/cli/__init__.py index a5dd55e5d..a296ecc37 100644 --- a/dvc/cli/__init__.py +++ b/dvc/cli/__init__.py @@ -2,16 +2,15 @@ import logging import sys +from typing import Optional + +from dvc.log import logger # Workaround for CPython bug. See [1] and [2] for more info. # [1] https://github.com/aws/aws-cli/blob/1.16.277/awscli/clidriver.py#L55 # [2] https://bugs.python.org/issue29288 -from typing import Optional - "".encode("idna") -logger = logging.getLogger("dvc") - class DvcParserError(Exception): """Base class for CLI parser errors.""" @@ -197,7 +196,7 @@ def main(argv=None): # noqa: C901, PLR0912, PLR0915 logger.debug("v%s%s, %s on %s", __version__, pkg, pyv, platform()) logger.debug("command: %s", " ".join(argv or sys.argv)) - logger.trace(args) # type: ignore[attr-defined] + logger.trace(args) if sys.stdout and not sys.stdout.closed and not args.quiet: from dvc.ui import ui @@ -241,9 +240,7 @@ def main(argv=None): # noqa: C901, PLR0912, PLR0915 if analytics.is_enabled(): analytics.collect_and_send_report(args, ret) - logger.trace( # type: ignore[attr-defined] - "Process %s exiting with %s", os.getpid(), ret - ) + logger.trace("Process %s exiting with %s", os.getpid(), ret) return ret finally: diff --git a/dvc/cli/command.py b/dvc/cli/command.py index 8dc1db5b7..e94ea2583 100644 --- a/dvc/cli/command.py +++ b/dvc/cli/command.py @@ -1,12 +1,13 @@ -import logging import os from abc import ABC, abstractmethod from typing import TYPE_CHECKING, Any +from dvc.log import logger + if TYPE_CHECKING: from dvc.config import Config -logger = logging.getLogger(__name__) +logger = logger.getChild(__name__) class CmdBase(ABC): diff --git a/dvc/cli/parser.py b/dvc/cli/parser.py index 00110ce81..5ff5199af 100644 --- a/dvc/cli/parser.py +++ b/dvc/cli/parser.py @@ -1,6 +1,5 @@ """Main parser for the dvc cli.""" import argparse -import logging import os from functools import lru_cache @@ -46,10 +45,11 @@ from dvc.commands import ( update, version, ) +from dvc.log import logger from . import DvcParserError -logger = logging.getLogger(__name__) +logger = logger.getChild(__name__) COMMANDS = [ init, diff --git a/dvc/commands/add.py b/dvc/commands/add.py index f42f5e40c..4a0b246f3 100644 --- a/dvc/commands/add.py +++ b/dvc/commands/add.py @@ -1,11 +1,11 @@ import argparse -import logging from dvc.cli import completion from dvc.cli.command import CmdBase from dvc.cli.utils import append_doc_link +from dvc.log import logger -logger = logging.getLogger(__name__) +logger = logger.getChild(__name__) class CmdAdd(CmdBase): diff --git a/dvc/commands/artifacts.py b/dvc/commands/artifacts.py index a2a8a564f..ccd576c2f 100644 --- a/dvc/commands/artifacts.py +++ b/dvc/commands/artifacts.py @@ -1,12 +1,12 @@ import argparse -import logging from dvc.cli import completion from dvc.cli.command import CmdBaseNoRepo from dvc.cli.utils import DictAction, append_doc_link, fix_subparsers from dvc.exceptions import DvcException +from dvc.log import logger -logger = logging.getLogger(__name__) +logger = logger.getChild(__name__) class CmdArtifactsGet(CmdBaseNoRepo): diff --git a/dvc/commands/commit.py b/dvc/commands/commit.py index 21c53ea7d..714b2433f 100644 --- a/dvc/commands/commit.py +++ b/dvc/commands/commit.py @@ -1,11 +1,11 @@ import argparse -import logging from dvc.cli import completion from dvc.cli.command import CmdBase from dvc.cli.utils import append_doc_link +from dvc.log import logger -logger = logging.getLogger(__name__) +logger = logger.getChild(__name__) class CmdCommit(CmdBase): diff --git a/dvc/commands/completion.py b/dvc/commands/completion.py index 98401ca9a..119b60741 100644 --- a/dvc/commands/completion.py +++ b/dvc/commands/completion.py @@ -1,12 +1,12 @@ import argparse -import logging from dvc.cli.command import CmdBaseNoRepo from dvc.cli.completion import PREAMBLE from dvc.cli.utils import append_doc_link +from dvc.log import logger from dvc.ui import ui -logger = logging.getLogger(__name__) +logger = logger.getChild(__name__) SUPPORTED_SHELLS = ["bash", "zsh"] diff --git a/dvc/commands/config.py b/dvc/commands/config.py index 7117d1191..ff8461bc6 100644 --- a/dvc/commands/config.py +++ b/dvc/commands/config.py @@ -1,12 +1,12 @@ import argparse -import logging import os from dvc.cli.command import CmdBaseNoRepo from dvc.cli.utils import append_doc_link +from dvc.log import logger from dvc.ui import ui -logger = logging.getLogger(__name__) +logger = logger.getChild(__name__) NAME_REGEX = r"^(?Premote\.)?(?P
[^\.]*)\.(?P