codecov-cli 9.1.1__tar.gz → 10.0.0__tar.gz

{codecov-cli-9.1.1/codecov_cli.egg-info → codecov-cli-10.0.0}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: codecov-cli
-Version: 9.1.1
+Version: 10.0.0
 Summary: Codecov Command Line Interface
 Author: Codecov
 Author-email: support@codecov.io
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
@@ -293,7 +293,7 @@ The CLI can perform basic static analysis on Python code today. This static anal
 
 # Contributions
 
-This repository, like all of Codecov's repositories, strives to follow our general [Contributing guidlines](https://github.com/codecov/contributing). If you're considering making a contribution to this repository, we encourage review of our Contributing guidelines first. 
+This repository, like all of Codecov's repositories, strives to follow our general [Contributing guidelines](https://github.com/codecov/contributing). If you're considering making a contribution to this repository, we encourage review of our Contributing guidelines first. 
 
 ## Requirements
 

{codecov-cli-9.1.1 → codecov-cli-10.0.0}/README.md

@@ -283,7 +283,7 @@ The CLI can perform basic static analysis on Python code today. This static anal
 
 # Contributions
 
-This repository, like all of Codecov's repositories, strives to follow our general [Contributing guidlines](https://github.com/codecov/contributing). If you're considering making a contribution to this repository, we encourage review of our Contributing guidelines first. 
+This repository, like all of Codecov's repositories, strives to follow our general [Contributing guidelines](https://github.com/codecov/contributing). If you're considering making a contribution to this repository, we encourage review of our Contributing guidelines first. 
 
 ## Requirements
 

codecov-cli-10.0.0/codecov_cli/commands/upload_coverage.py

@@ -0,0 +1,180 @@
+import logging
+import pathlib
+import typing
+
+import click
+from opentelemetry import trace
+
+from codecov_cli.commands.commit import create_commit
+from codecov_cli.commands.report import create_report
+from codecov_cli.commands.upload import do_upload, global_upload_options
+from codecov_cli.helpers.args import get_cli_args
+from codecov_cli.helpers.options import global_options
+from codecov_cli.opentelemetry import close_telem
+from codecov_cli.services.upload_coverage import upload_coverage_logic
+from codecov_cli.types import CommandContext
+
+logger = logging.getLogger("codecovcli")
+tracer = trace.get_tracer(__name__)
+
+
+# These options are the combined options of commit, report and upload commands
+@click.command()
+@global_options
+@global_upload_options
+@click.option(
+    "--parent-sha",
+    help="SHA (with 40 chars) of what should be the parent of this commit",
+)
+@click.pass_context
+def upload_coverage(
+    ctx: CommandContext,
+    branch: typing.Optional[str],
+    build_code: typing.Optional[str],
+    build_url: typing.Optional[str],
+    commit_sha: str,
+    disable_file_fixes: bool,
+    disable_search: bool,
+    dry_run: bool,
+    env_vars: typing.Dict[str, str],
+    fail_on_error: bool,
+    files_search_exclude_folders: typing.List[pathlib.Path],
+    files_search_explicitly_listed_files: typing.List[pathlib.Path],
+    files_search_root_folder: pathlib.Path,
+    flags: typing.List[str],
+    gcov_args: typing.Optional[str],
+    gcov_executable: typing.Optional[str],
+    gcov_ignore: typing.Optional[str],
+    gcov_include: typing.Optional[str],
+    git_service: typing.Optional[str],
+    handle_no_reports_found: bool,
+    job_code: typing.Optional[str],
+    name: typing.Optional[str],
+    network_filter: typing.Optional[str],
+    network_prefix: typing.Optional[str],
+    network_root_folder: pathlib.Path,
+    parent_sha: typing.Optional[str],
+    plugin_names: typing.List[str],
+    pull_request_number: typing.Optional[str],
+    report_code: str,
+    report_type: str,
+    slug: typing.Optional[str],
+    swift_project: typing.Optional[str],
+    token: typing.Optional[str],
+    use_legacy_uploader: bool,
+):
+    with tracer.start_as_current_span("upload_coverage"):
+        args = get_cli_args(ctx)
+        logger.debug(
+            "Starting upload coverage",
+            extra=dict(
+                extra_log_attributes=args,
+            ),
+        )
+
+        if not use_legacy_uploader and report_type == "coverage":
+            versioning_system = ctx.obj["versioning_system"]
+            codecov_yaml = ctx.obj["codecov_yaml"] or {}
+            cli_config = codecov_yaml.get("cli", {})
+            ci_adapter = ctx.obj.get("ci_adapter")
+            enterprise_url = ctx.obj.get("enterprise_url")
+            args = get_cli_args(ctx)
+            ctx.invoke(
+                upload_coverage_logic,
+                cli_config,
+                versioning_system,
+                ci_adapter,
+                branch=branch,
+                build_code=build_code,
+                build_url=build_url,
+                commit_sha=commit_sha,
+                disable_file_fixes=disable_file_fixes,
+                disable_search=disable_search,
+                dry_run=dry_run,
+                enterprise_url=enterprise_url,
+                env_vars=env_vars,
+                fail_on_error=fail_on_error,
+                files_search_exclude_folders=files_search_exclude_folders,
+                files_search_explicitly_listed_files=files_search_explicitly_listed_files,
+                files_search_root_folder=files_search_root_folder,
+                flags=flags,
+                gcov_args=gcov_args,
+                gcov_executable=gcov_executable,
+                gcov_ignore=gcov_ignore,
+                gcov_include=gcov_include,
+                git_service=git_service,
+                handle_no_reports_found=handle_no_reports_found,
+                job_code=job_code,
+                name=name,
+                network_filter=network_filter,
+                network_prefix=network_prefix,
+                network_root_folder=network_root_folder,
+                parent_sha=parent_sha,
+                plugin_names=plugin_names,
+                pull_request_number=pull_request_number,
+                report_code=report_code,
+                slug=slug,
+                swift_project=swift_project,
+                token=token,
+                upload_file_type=report_type,
+                use_legacy_uploader=use_legacy_uploader,
+                args=args,
+            )
+        else:
+            ctx.invoke(
+                create_commit,
+                commit_sha=commit_sha,
+                parent_sha=parent_sha,
+                pull_request_number=pull_request_number,
+                branch=branch,
+                slug=slug,
+                token=token,
+                git_service=git_service,
+                fail_on_error=True,
+            )
+            if report_type == "coverage":
+                ctx.invoke(
+                    create_report,
+                    token=token,
+                    code=report_code,
+                    fail_on_error=True,
+                    commit_sha=commit_sha,
+                    slug=slug,
+                    git_service=git_service,
+                )
+            ctx.invoke(
+                do_upload,
+                branch=branch,
+                build_code=build_code,
+                build_url=build_url,
+                commit_sha=commit_sha,
+                disable_file_fixes=disable_file_fixes,
+                disable_search=disable_search,
+                dry_run=dry_run,
+                env_vars=env_vars,
+                fail_on_error=fail_on_error,
+                files_search_exclude_folders=files_search_exclude_folders,
+                files_search_explicitly_listed_files=files_search_explicitly_listed_files,
+                files_search_root_folder=files_search_root_folder,
+                flags=flags,
+                gcov_args=gcov_args,
+                gcov_executable=gcov_executable,
+                gcov_ignore=gcov_ignore,
+                gcov_include=gcov_include,
+                git_service=git_service,
+                handle_no_reports_found=handle_no_reports_found,
+                job_code=job_code,
+                name=name,
+                network_filter=network_filter,
+                network_prefix=network_prefix,
+                network_root_folder=network_root_folder,
+                plugin_names=plugin_names,
+                pull_request_number=pull_request_number,
+                report_code=report_code,
+                report_type=report_type,
+                slug=slug,
+                swift_project=swift_project,
+                token=token,
+                use_legacy_uploader=use_legacy_uploader,
+            )
+    close_telem()

{codecov-cli-9.1.1 → codecov-cli-10.0.0}/codecov_cli/helpers/ci_adapters/azure_pipelines.py

@@ -16,7 +16,7 @@ class AzurePipelinesCIAdapter(CIAdapterBase):
 
     def _get_build_url(self):
         if os.getenv("SYSTEM_TEAMPROJECT") and os.getenv("BUILD_BUILDID"):
-            return f'{os.getenv("SYSTEM_TEAMFOUNDATIONCOLLECTIONURI")}{os.getenv("SYSTEM_TEAMPROJECT")}/_build/results?buildId={os.getenv("BUILD_BUILDID")}'
+            return f"{os.getenv('SYSTEM_TEAMFOUNDATIONCOLLECTIONURI')}{os.getenv('SYSTEM_TEAMPROJECT')}/_build/results?buildId={os.getenv('BUILD_BUILDID')}"
 
     def _get_build_code(self):
         return os.getenv("BUILD_BUILDNUMBER")

{codecov-cli-9.1.1 → codecov-cli-10.0.0}/codecov_cli/main.py

@@ -5,6 +5,7 @@ import typing
 import click
 
 from codecov_cli import __version__
+from codecov_cli.opentelemetry import init_telem
 from codecov_cli.commands.base_picking import pr_base_picking
 from codecov_cli.commands.commit import create_commit
 from codecov_cli.commands.create_report_result import create_report_results
@@ -43,6 +44,9 @@ logger = logging.getLogger("codecovcli")
     "--enterprise-url", "--url", "-u", help="Change the upload host (Enterprise use)"
 )
 @click.option("-v", "--verbose", "verbose", help="Use verbose logging", is_flag=True)
+@click.option(
+    "--disable-telem", help="Disable sending telemetry data to Codecov", is_flag=True
+)
 @click.pass_context
 @click.version_option(__version__, prog_name="codecovcli")
 def cli(
@@ -51,6 +55,7 @@ def cli(
     codecov_yml_path: pathlib.Path,
     enterprise_url: str,
     verbose: bool = False,
+    disable_telem: bool = False,
 ):
     ctx.obj["cli_args"] = ctx.params
     ctx.obj["cli_args"]["version"] = f"cli-{__version__}"
@@ -65,6 +70,9 @@ def cli(
         ctx.default_map = {ctx.invoked_subcommand: {"token": token}}
     ctx.obj["enterprise_url"] = enterprise_url
 
+    if not disable_telem:
+        init_telem(__version__, enterprise_url)
+
 
 cli.add_command(do_upload)
 cli.add_command(create_commit)

codecov-cli-10.0.0/codecov_cli/opentelemetry.py

@@ -0,0 +1,32 @@
+import os
+import time
+
+from opentelemetry import trace
+from opentelemetry.propagate import set_global_textmap
+from opentelemetry.sdk.trace import TracerProvider
+import sentry_sdk
+from sentry_sdk.integrations.opentelemetry import SentrySpanProcessor, SentryPropagator
+
+
+def init_telem(version, url):
+    if url:  # dont run on dedicated cloud
+        return
+
+    if os.getenv("IS_CI", False):
+        return
+
+    sentry_sdk.init(
+        dsn="https://0bea75c61745c221a6ef1ac1709b1f4d@o26192.ingest.us.sentry.io/4508615876083713",
+        enable_tracing=True,
+        release=f"cli@{version}",
+        instrumenter="otel",
+    )
+
+    provider = TracerProvider()
+    provider.add_span_processor(SentrySpanProcessor())
+    trace.set_tracer_provider(provider)
+    set_global_textmap(SentryPropagator())
+
+
+def close_telem():
+    sentry_sdk.flush()

{codecov-cli-9.1.1 → codecov-cli-10.0.0}/codecov_cli/plugins/__init__.py

@@ -58,7 +58,7 @@ def _load_plugin_from_yaml(plugin_dict: typing.Dict):
 
     except TypeError:
         click.secho(
-            f"Unable to instantiate {class_obj} with provided parameters { plugin_dict.get('params', '') }",
+            f"Unable to instantiate {class_obj} with provided parameters {plugin_dict.get('params', '')}",
             err=True,
         )
         return NoopPlugin()

{codecov-cli-9.1.1 → codecov-cli-10.0.0}/codecov_cli/plugins/compress_pycoverage_contexts.py

@@ -5,10 +5,12 @@ from decimal import Decimal
 from typing import Any, List
 
 import ijson
+from opentelemetry import trace
 
 from codecov_cli.plugins.types import PreparationPluginReturn
 
 logger = logging.getLogger("codecovcli")
+tracer = trace.get_tracer(__name__)
 
 
 class Encoder(json.JSONEncoder):
@@ -47,6 +49,7 @@ class CompressPycoverageContexts(object):
             str(self.file_to_compress).replace(".json", "") + ".codecov.json"
         )
 
+    @tracer.start_as_current_span("compress_pycoverage")
     def run_preparation(self, collector) -> PreparationPluginReturn:
         if not self.file_to_compress.exists():
             logger.warning(
@@ -120,7 +123,7 @@ class CompressPycoverageContexts(object):
         # Save the inverted index of labels table in the report
         # So when we are processing the result we have int -> label
         fd_out.write(
-            f'"labels_table": {json.dumps({ value: key for key, value in labels_table.items() })}'
+            f'"labels_table": {json.dumps({value: key for key, value in labels_table.items()})}'
         )
 
     def _copy_file_details(self, file_name, file_details, fd_out) -> None:

{codecov-cli-9.1.1 → codecov-cli-10.0.0}/codecov_cli/plugins/gcov.py

@@ -5,10 +5,13 @@ import shutil
 import subprocess
 import typing
 
+from opentelemetry import trace
+
 from codecov_cli.helpers.folder_searcher import globs_to_regex, search_files
 from codecov_cli.plugins.types import PreparationPluginReturn
 
 logger = logging.getLogger("codecovcli")
+tracer = trace.get_tracer(__name__)
 
 
 class GcovPlugin(object):
@@ -28,6 +31,7 @@ class GcovPlugin(object):
         self.patterns_to_include = patterns_to_include or []
         self.project_root = project_root or pathlib.Path(os.getcwd())
 
+    @tracer.start_as_current_span("gcov")
     def run_preparation(self, collector) -> PreparationPluginReturn:
         logger.debug(
             f"Running {self.executable} plugin...",

{codecov-cli-9.1.1 → codecov-cli-10.0.0}/codecov_cli/plugins/pycoverage.py

@@ -6,11 +6,14 @@ import subprocess
 import typing
 from glob import iglob
 
+from opentelemetry import trace
+
 from codecov_cli.helpers.folder_searcher import globs_to_regex, search_files
 from codecov_cli.plugins.types import PreparationPluginReturn
 
 coverage_files_regex = globs_to_regex([".coverage", ".coverage.*"])
 logger = logging.getLogger("codecovcli")
+tracer = trace.get_tracer(__name__)
 
 
 class PycoverageConfig(dict):
@@ -53,6 +56,7 @@ class Pycoverage(object):
     def __init__(self, config: dict):
         self.config = PycoverageConfig(config)
 
+    @tracer.start_as_current_span("pycoverage")
     def run_preparation(self, collector) -> PreparationPluginReturn:
         if shutil.which("coverage") is None:
             logger.warning("coverage.py is not installed or can't be found.")
@@ -68,7 +72,8 @@ class Pycoverage(object):
         if self.config.report_type == "json":
             return self._generate_JSON_report(coverage_dir)
         return PreparationPluginReturn(
-            success=False, messages=[f"report type {self.config.report_type} unknown"]
+            success=False,
+            messages=[f"report type {self.config.report_type} unknown"],
         )
 
     def _get_path_to_coverage(self) -> pathlib.Path:

{codecov-cli-9.1.1 → codecov-cli-10.0.0}/codecov_cli/plugins/xcode.py

@@ -7,10 +7,13 @@ import subprocess
 import typing
 from fnmatch import translate
 
+from opentelemetry import trace
+
 from codecov_cli.helpers.folder_searcher import globs_to_regex, search_files
 from codecov_cli.plugins.types import PreparationPluginReturn
 
 logger = logging.getLogger("codecovcli")
+tracer = trace.get_tracer(__name__)
 
 
 class XcodePlugin(object):
@@ -28,6 +31,7 @@ class XcodePlugin(object):
         # if empty the plugin will build reports for every xcode project it finds
         self.app_name = app_name or ""
 
+    @tracer.start_as_current_span("xcode")
     def run_preparation(self, collector) -> PreparationPluginReturn:
         logger.debug("Running xcode plugin...")
 

{codecov-cli-9.1.1 → codecov-cli-10.0.0}/codecov_cli/runners/pytest_standard_runner.py

@@ -172,7 +172,7 @@ class PytestStandardRunner(LabelAnalysisRunnerInterface):
         logger.info(
             "Running tests. (run in verbose mode to get list of tests executed)"
         )
-        logger.info(f"  pytest options: \"{' '.join(default_options)}\"")
+        logger.info(f'  pytest options: "{" ".join(default_options)}"')
         logger.info(f"  executed tests: {len(tests_to_run)}")
         logger.debug(
             "List of tests executed",
@@ -180,5 +180,5 @@ class PytestStandardRunner(LabelAnalysisRunnerInterface):
         )
         output = self._execute_pytest(command_array, capture_output=False)
         logger.info(f"Finished running {len(tests_to_run)} tests successfully")
-        logger.info(f"  pytest options: \"{' '.join(default_options)}\"")
+        logger.info(f'  pytest options: "{" ".join(default_options)}"')
         logger.debug(output)

{codecov-cli-9.1.1 → codecov-cli-10.0.0}/codecov_cli/services/commit/__init__.py

@@ -65,7 +65,7 @@ def send_commit_data(
             f"Branch `{branch}` is protected but no token was provided\nFor information on Codecov upload tokens, see https://docs.codecov.com/docs/codecov-tokens"
         )
     else:
-        logger.info("Using token to create a commit for protected branch `{branch}`")
+        logger.info(f"Using token to create a commit for protected branch `{branch}`")
 
     headers = get_token_header(token)
 

{codecov-cli-9.1.1 → codecov-cli-10.0.0}/codecov_cli/services/upload/__init__.py

@@ -102,7 +102,7 @@ def do_upload_logic(
     except click.ClickException as exp:
         if handle_no_reports_found:
             logger.info(
-                "No coverage reports found. Triggering notificaions without uploading."
+                "No coverage reports found. Triggering notifications without uploading."
             )
             upload_completion_logic(
                 commit_sha=commit_sha,
@@ -116,7 +116,7 @@ def do_upload_logic(
                 error=None,
                 warnings=None,
                 status_code=200,
-                text="No coverage reports found. Triggering notificaions without uploading.",
+                text="No coverage reports found. Triggering notifications without uploading.",
             )
         else:
             raise exp

{codecov-cli-9.1.1 → codecov-cli-10.0.0}/codecov_cli/services/upload/file_finder.py

@@ -3,10 +3,14 @@ import os
 from pathlib import Path
 from typing import Iterable, List, Optional, Pattern
 
+from opentelemetry import trace
+
 from codecov_cli.helpers.folder_searcher import globs_to_regex, search_files
 from codecov_cli.types import UploadCollectionResultFile
 
 logger = logging.getLogger("codecovcli")
+tracer = trace.get_tracer(__name__)
+
 
 coverage_files_patterns = [
     "*.clover",
@@ -118,6 +122,7 @@ coverage_files_excluded_patterns = [
     "*.yaml",
     "*/classycle/report.xml",
     "*codecov.yml",
+    "codecov.yaml",
     "*~",
     ".*coveragerc",
     ".coverage*",
@@ -197,6 +202,7 @@ class FileFinder(object):
         self.disable_search = disable_search
         self.report_type = report_type
 
+    @tracer.start_as_current_span("find_files")
     def find_files(self) -> List[UploadCollectionResultFile]:
         if self.report_type == "coverage":
             files_excluded_patterns = coverage_files_excluded_patterns

{codecov-cli-9.1.1 → codecov-cli-10.0.0}/codecov_cli/services/upload/legacy_upload_sender.py

@@ -2,12 +2,15 @@ import logging
 import typing
 from dataclasses import dataclass
 
+from opentelemetry import trace
+
 from codecov_cli import __version__ as codecov_cli_version
 from codecov_cli.helpers.config import LEGACY_CODECOV_API_URL
 from codecov_cli.helpers.request import send_post_request, send_put_request
 from codecov_cli.types import UploadCollectionResult, UploadCollectionResultFile
 
 logger = logging.getLogger("codecovcli")
+tracer = trace.get_tracer(__name__)
 
 
 @dataclass
@@ -32,6 +35,7 @@ class UploadSendingResult(object):
 
 
 class LegacyUploadSender(object):
+    @tracer.start_as_current_span("upload_legacy")
     def send_upload_data(
         self,
         upload_data: UploadCollectionResult,

{codecov-cli-9.1.1 → codecov-cli-10.0.0}/codecov_cli/services/upload/upload_collector.py

@@ -7,6 +7,7 @@ from collections import namedtuple
 from fnmatch import fnmatch
 
 import click
+from opentelemetry import trace
 
 from codecov_cli.services.upload.file_finder import FileFinder
 from codecov_cli.services.upload.network_finder import NetworkFinder
@@ -17,6 +18,7 @@ from codecov_cli.types import (
 )
 
 logger = logging.getLogger("codecovcli")
+tracer = trace.get_tracer(__name__)
 
 fix_patterns_to_apply = namedtuple(
     "fix_patterns_to_apply", ["without_reason", "with_reason", "eof"]
@@ -148,13 +150,15 @@ class UploadCollector(object):
             path, fixed_lines_without_reason, fixed_lines_with_reason, eof
         )
 
+    @tracer.start_as_current_span("upload_collector")
     def generate_upload_data(self, report_type="coverage") -> UploadCollectionResult:
         for prep in self.preparation_plugins:
             logger.debug(f"Running preparation plugin: {type(prep)}")
             prep.run_preparation(self)
         logger.debug("Collecting relevant files")
-        network = self.network_finder.find_files()
-        report_files = self.file_finder.find_files()
+        with tracer.start_as_current_span("file_collector"):
+            network = self.network_finder.find_files()
+            report_files = self.file_finder.find_files()
         logger.info(f"Found {len(report_files)} {report_type} files to report")
         if not report_files:
             if report_type == "test_results":