codecov-cli 11.2.7__tar.gz → 11.2.8__tar.gz

{codecov_cli-11.2.7/codecov_cli.egg-info → codecov_cli-11.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codecov-cli
-Version: 11.2.7
+Version: 11.2.8
 Summary: Codecov Command Line Interface
 Author-email: Tom Hu <thomas.hu@sentry.io>
 Maintainer-email: Codecov Support <support@codecov.io>
@@ -15,7 +15,7 @@ License-File: LICENSE
 Requires-Dist: click<8.3.0,>=8.0.0
 Requires-Dist: ijson==3.*
 Requires-Dist: PyYAML==6.*
-Requires-Dist: responses==0.21.*
+Requires-Dist: requests>=2.25.0
 Requires-Dist: sentry-sdk==2.*
 Requires-Dist: test-results-parser==0.6.1
 Dynamic: license-file

{codecov_cli-11.2.7 → codecov_cli-11.2.8}/codecov_cli/helpers/args.py

@@ -5,6 +5,7 @@ from pathlib import PosixPath
 import click
 
 from codecov_cli import __version__
+from codecov_cli.opentelemetry import set_cli_tags
 
 logger = logging.getLogger("codecovcli")
 
@@ -28,4 +29,6 @@ def get_cli_args(ctx: click.Context):
         except Exception:
             continue
 
+    set_cli_tags(filtered_args, ctx)
+
     return filtered_args

{codecov_cli-11.2.7 → codecov_cli-11.2.8}/codecov_cli/helpers/request.py

@@ -152,7 +152,7 @@ def log_warnings_and_errors_if_any(
     sending_result: RequestResult, process_desc: str, fail_on_error: bool = False
 ):
     logger.info(
-        f"Process {process_desc} complete",
+        f"{process_desc} complete",
     )
     logger.debug(
         f"{process_desc} result",

codecov_cli-11.2.8/codecov_cli/opentelemetry.py

@@ -0,0 +1,84 @@
+import os
+import random
+
+import sentry_sdk
+
+from codecov_cli import __version__
+
+_SAMPLED_MESSAGES = [
+    "Token required",
+]
+_SAMPLE_RATE = 100
+_SKIP_TAG_KEYS = {"branch", "flags", "commit_sha", "env_vars"}
+
+
+def _before_send(event, hint):
+    messages = []
+    if "message" in event and event.get("message") is not None:
+        messages.append(event.get("message"))
+    if "logentry" in event and "message" in event.get("logentry", {}) and event.get("logentry", {}).get("message") is not None:
+        messages.append(event.get("logentry", {}).get("message"))
+    if "exception" in event and event.get("exception") is not None:
+        for exc in event.get("exception", {}).get("values", []):
+            if "value" in exc:
+                messages.append(exc.get("value"))
+
+    matched = False
+    for message in messages:
+        for pattern in _SAMPLED_MESSAGES:
+            if pattern in message:
+                matched = True
+                break
+
+    if matched and random.randint(1, _SAMPLE_RATE) != 1:
+        return None
+    return event
+
+
+def init_telem(ctx):
+    if ctx["disable_telem"]:
+        return
+    if ctx["enterprise_url"]:  # dont run on dedicated cloud
+        return
+    if os.getenv("CODECOV_ENV", "production") == "test":
+        return
+
+    sentry_sdk.init(
+        dsn="https://0bea75c61745c221a6ef1ac1709b1f4d@o26192.ingest.us.sentry.io/4508615876083713",
+        enable_tracing=True,
+        environment=os.getenv("CODECOV_ENV", "production"),
+        release=f"cli@{__version__}",
+        before_send=_before_send,
+    )
+
+
+def set_cli_tags(args: dict, ctx):
+    """Set Sentry tags from resolved CLI arguments."""
+    for key, value in args.items():
+        if key in _SKIP_TAG_KEYS:
+            continue
+        if value is None or value in ([], (), {}):
+            continue
+        if isinstance(value, (list, tuple)):
+            value = ",".join(str(v) for v in value)
+        elif isinstance(value, dict):
+            value = ",".join(
+                f"{k}={v}" for k, v in value.items() if v is not None
+            )
+        sentry_sdk.set_tag(f"cli.{key}", str(value)[:200])
+
+    token = ctx.params.get("token") if hasattr(ctx, "params") else None
+    sentry_sdk.set_tag("cli.token_provided", str(bool(token)).lower())
+
+    ci_adapter = (
+        ctx.obj.get("ci_adapter") if hasattr(ctx, "obj") and ctx.obj else None
+    )
+    if ci_adapter is not None:
+        try:
+            sentry_sdk.set_tag("cli.ci_adapter", ci_adapter.get_service_name())
+        except Exception:
+            pass
+
+
+def close_telem():
+    sentry_sdk.flush()

{codecov_cli-11.2.7 → codecov_cli-11.2.8}/codecov_cli/services/upload/__init__.py

@@ -165,5 +165,5 @@ def do_upload_logic(
             status_code=200,
             text="Data NOT sent to Codecov because of dry-run option",
         )
-    log_warnings_and_errors_if_any(sending_result, "Upload", fail_on_error)
+    log_warnings_and_errors_if_any(sending_result, "Upload queued for processing", fail_on_error)
     return sending_result

{codecov_cli-11.2.7 → codecov_cli-11.2.8}/codecov_cli/services/upload/upload_sender.py

@@ -117,7 +117,7 @@ class UploadSender(object):
                 resp_json_obj = json.loads(resp_from_codecov.text)
                 if resp_json_obj.get("url"):
                     logger.info(
-                        f"Your upload is now processing. When finished, results will be available at: {resp_json_obj.get('url')}"
+                        f"Your upload is now queued for processing. When finished, results will be available at: {resp_json_obj.get('url')}"
                     )
                 logger.debug(
                     "Upload request to Codecov complete.",

{codecov_cli-11.2.7 → codecov_cli-11.2.8/codecov_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codecov-cli
-Version: 11.2.7
+Version: 11.2.8
 Summary: Codecov Command Line Interface
 Author-email: Tom Hu <thomas.hu@sentry.io>
 Maintainer-email: Codecov Support <support@codecov.io>
@@ -15,7 +15,7 @@ License-File: LICENSE
 Requires-Dist: click<8.3.0,>=8.0.0
 Requires-Dist: ijson==3.*
 Requires-Dist: PyYAML==6.*
-Requires-Dist: responses==0.21.*
+Requires-Dist: requests>=2.25.0
 Requires-Dist: sentry-sdk==2.*
 Requires-Dist: test-results-parser==0.6.1
 Dynamic: license-file

{codecov_cli-11.2.7 → codecov_cli-11.2.8}/codecov_cli.egg-info/requires.txt

@@ -1,6 +1,6 @@
 click<8.3.0,>=8.0.0
 ijson==3.*
 PyYAML==6.*
-responses==0.21.*
+requests>=2.25.0
 sentry-sdk==2.*
 test-results-parser==0.6.1

{codecov_cli-11.2.7 → codecov_cli-11.2.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "codecov-cli"
-version = "11.2.7"
+version = "11.2.8"
 description = "Codecov Command Line Interface"
 readme = "README.md"
 license-files = ["LICENSE"]
@@ -15,7 +15,7 @@ dependencies = [
     "click>=8.0.0,<8.3.0",
     "ijson==3.*",
     "PyYAML==6.*",
-    "responses==0.21.*",
+    "requests>=2.25.0",
     "sentry-sdk==2.*",
     "test-results-parser==0.6.1",
 ]
@@ -28,6 +28,7 @@ dev = [
     "pytest-cov==4.*",
     "pytest-env==1.*",
     "pytest-mock==3.*",
+    "responses==0.21.*",
 ]
 
 [project.scripts]

{codecov_cli-11.2.7 → codecov_cli-11.2.8}/tests/commands/test_invoke_upload.py

@@ -40,7 +40,7 @@ def test_upload_raise_Z_option(mocker):
     result = runner.invoke(cli, ["do-upload", "--fail-on-error"], obj={})
     upload_sender.assert_called()
     upload_collector.assert_called()
-    assert ("error", "Upload failed: Unauthorized") in parse_outstreams_into_log_lines(
+    assert ("error", "Upload queued for processing failed: Unauthorized") in parse_outstreams_into_log_lines(
         result.output
     )
     assert str(result) == "<Result SystemExit(1)>"

{codecov_cli-11.2.7 → codecov_cli-11.2.8}/tests/services/commit/test_commit_service.py

@@ -31,7 +31,7 @@ def test_commit_command_with_warnings(mocker):
 
     out_bytes = parse_outstreams_into_log_lines(outstreams[0].getvalue())
     assert out_bytes == [
-        ("info", "Process Commit creating complete"),
+        ("info", "Commit creating complete"),
         ("info", "Commit creating process had 1 warning"),
         ("warning", "Warning 1: somewarningmessage"),
     ]
@@ -81,7 +81,7 @@ def test_commit_command_with_error(mocker):
     assert out_bytes == [
         (
             "info",
-            "Process Commit creating complete",
+            "Commit creating complete",
         ),
         ("error", "Commit creating failed: Permission denied"),
     ]

{codecov_cli-11.2.7 → codecov_cli-11.2.8}/tests/services/empty_upload/test_empty_upload.py

@@ -34,7 +34,7 @@ def test_empty_upload_with_warnings(mocker):
         )
     out_bytes = parse_outstreams_into_log_lines(outstreams[0].getvalue())
     assert out_bytes == [
-        ("info", "Process Empty Upload complete"),
+        ("info", "Empty Upload complete"),
         ("info", "Empty Upload process had 1 warning"),
         ("warning", "Warning 1: somewarningmessage"),
     ]
@@ -71,7 +71,7 @@ def test_empty_upload_with_error(mocker):
 
     out_bytes = parse_outstreams_into_log_lines(outstreams[0].getvalue())
     assert out_bytes == [
-        ("info", "Process Empty Upload complete"),
+        ("info", "Empty Upload complete"),
         ("error", "Empty Upload failed: Permission denied"),
     ]
     assert res == mock_send_commit_data.return_value
@@ -97,7 +97,7 @@ def test_empty_upload_200(mocker):
         )
     out_bytes = parse_outstreams_into_log_lines(outstreams[0].getvalue())
     assert out_bytes == [
-        ("info", "Process Empty Upload complete"),
+        ("info", "Empty Upload complete"),
         ("info", "All changed files are ignored. Triggering passing notifications."),
         ("info", "Non ignored files []"),
     ]
@@ -142,7 +142,7 @@ def test_empty_upload_force(mocker):
         )
     out_bytes = parse_outstreams_into_log_lines(outstreams[0].getvalue())
     assert out_bytes == [
-        ("info", "Process Empty Upload complete"),
+        ("info", "Empty Upload complete"),
         ("info", "Force option was enabled. Triggering passing notifications."),
         ("info", "Non ignored files []"),
     ]
@@ -170,7 +170,7 @@ def test_empty_upload_no_token(mocker):
 
     out_bytes = parse_outstreams_into_log_lines(outstreams[0].getvalue())
     assert out_bytes == [
-        ("info", "Process Empty Upload complete"),
+        ("info", "Empty Upload complete"),
         ("info", "All changed files are ignored. Triggering passing notifications."),
         ("info", "Non ignored files []"),
     ]

{codecov_cli-11.2.7 → codecov_cli-11.2.8}/tests/services/report/test_report_results.py

@@ -36,7 +36,7 @@ def test_report_results_command_with_warnings(mocker):
 
     out_bytes = parse_outstreams_into_log_lines(outstreams[0].getvalue())
     assert out_bytes == [
-        ("info", "Process Report results creating complete"),
+        ("info", "Report results creating complete"),
         ("info", "Report results creating process had 1 warning"),
         ("warning", "Warning 1: somewarningmessage"),
     ]
@@ -81,7 +81,7 @@ def test_report_results_command_with_error(mocker):
 
     out_bytes = parse_outstreams_into_log_lines(outstreams[0].getvalue())
     assert out_bytes == [
-        ("info", "Process Report results creating complete"),
+        ("info", "Report results creating complete"),
         ("error", "Report results creating failed: Permission denied"),
     ]
     assert res == mock_send_reports_result_request.return_value

{codecov_cli-11.2.7 → codecov_cli-11.2.8}/tests/services/report/test_report_service.py

@@ -87,7 +87,7 @@ def test_create_report_command_with_warnings(mocker):
 
     out_bytes = parse_outstreams_into_log_lines(outstreams[0].getvalue())
     assert out_bytes == [
-        ("info", "Process Report creating complete"),
+        ("info", "Report creating complete"),
         ("info", "Report creating process had 1 warning"),
         ("warning", "Warning 1: somewarningmessage"),
     ]
@@ -130,7 +130,7 @@ def test_create_report_command_with_error(mocker):
 
     out_bytes = parse_outstreams_into_log_lines(outstreams[0].getvalue())
     assert out_bytes == [
-        ("info", "Process Report creating complete"),
+        ("info", "Report creating complete"),
         ("error", "Report creating failed: Permission denied"),
     ]
     assert res == RequestResult(

{codecov_cli-11.2.7 → codecov_cli-11.2.8}/tests/services/upload/test_upload_service.py

@@ -80,8 +80,8 @@ def test_do_upload_logic_happy_path_legacy_uploader(mocker):
         )
     out_bytes = parse_outstreams_into_log_lines(outstreams[0].getvalue())
     assert out_bytes == [
-        ("info", "Process Upload complete"),
-        ("info", "Upload process had 1 warning"),
+        ("info", "Upload queued for processing complete"),
+        ("info", "Upload queued for processing process had 1 warning"),
         ("warning", "Warning 1: somewarningmessage"),
     ]
 
@@ -195,8 +195,8 @@ def test_do_upload_logic_happy_path(mocker):
         )
     out_bytes = parse_outstreams_into_log_lines(outstreams[0].getvalue())
     assert out_bytes == [
-        ("info", "Process Upload complete"),
-        ("info", "Upload process had 1 warning"),
+        ("info", "Upload queued for processing complete"),
+        ("info", "Upload queued for processing process had 1 warning"),
         ("warning", "Warning 1: somewarningmessage"),
     ]
 
@@ -333,7 +333,7 @@ def test_do_upload_logic_dry_run(mocker):
     )
     assert out_bytes == [
         ("info", "dry-run option activated. NOT sending data to Codecov."),
-        ("info", "Process Upload complete"),
+        ("info", "Upload queued for processing complete"),
     ]
     assert res == RequestResult(
         error=None,
@@ -399,10 +399,10 @@ def test_do_upload_logic_verbose(mocker, use_verbose_option):
             "Selected uploader to use: <class 'codecov_cli.services.upload.legacy_upload_sender.LegacyUploadSender'>",
         ),
         ("info", "dry-run option activated. NOT sending data to Codecov."),
-        ("info", "Process Upload complete"),
+        ("info", "Upload queued for processing complete"),
         (
             "debug",
-            'Upload result --- {"result": "RequestResult(error=None, warnings=None, status_code=200, text=\'Data NOT sent to Codecov because of dry-run option\')"}',
+            'Upload queued for processing result --- {"result": "RequestResult(error=None, warnings=None, status_code=200, text=\'Data NOT sent to Codecov because of dry-run option\')"}',
         ),
     ]
     assert res == RequestResult(
@@ -671,8 +671,8 @@ def test_do_upload_logic_happy_path_test_results(mocker):
         )
     out_bytes = parse_outstreams_into_log_lines(outstreams[0].getvalue())
     assert out_bytes == [
-        ("info", "Process Upload complete"),
-        ("info", "Upload process had 1 warning"),
+        ("info", "Upload queued for processing complete"),
+        ("info", "Upload queued for processing process had 1 warning"),
         ("warning", "Warning 1: somewarningmessage"),
     ]
 

{codecov_cli-11.2.7 → codecov_cli-11.2.8}/tests/services/upload_completion/test_upload_completion.py

@@ -27,7 +27,7 @@ def test_upload_completion_with_warnings(mocker):
         )
     out_bytes = parse_outstreams_into_log_lines(outstreams[0].getvalue())
     assert out_bytes == [
-        ("info", "Process Upload Completion complete"),
+        ("info", "Upload Completion complete"),
         ("info", "Upload Completion process had 1 warning"),
         ("warning", "Warning 1: somewarningmessage"),
     ]
@@ -56,7 +56,7 @@ def test_upload_completion_with_error(mocker):
         )
     out_bytes = parse_outstreams_into_log_lines(outstreams[0].getvalue())
     assert out_bytes == [
-        ("info", "Process Upload Completion complete"),
+        ("info", "Upload Completion complete"),
         ("error", "Upload Completion failed: Permission denied"),
     ]
     assert res == mock_send_commit_data.return_value
@@ -84,7 +84,7 @@ def test_upload_completion_200(mocker):
         )
     out_bytes = parse_outstreams_into_log_lines(outstreams[0].getvalue())
     assert out_bytes == [
-        ("info", "Process Upload Completion complete"),
+        ("info", "Upload Completion complete"),
         (
             "info",
             "{'uploads_total': 2, 'uploads_success': 2, 'uploads_processing': 0, 'uploads_error': 0}",
@@ -113,7 +113,7 @@ def test_upload_completion_no_token(mocker):
         res = upload_completion_logic("commit_sha", "owner/repo", None, "service", None)
     out_bytes = parse_outstreams_into_log_lines(outstreams[0].getvalue())
     assert out_bytes == [
-        ("info", "Process Upload Completion complete"),
+        ("info", "Upload Completion complete"),
         (
             "info",
             "{'uploads_total': 2, 'uploads_success': 2, 'uploads_processing': 0, 'uploads_error': 0}",

codecov_cli-11.2.7/codecov_cli/opentelemetry.py

@@ -1,26 +0,0 @@
-import os
-import time
-
-import sentry_sdk
-
-from codecov_cli import __version__
-
-
-def init_telem(ctx):
-    if ctx["disable_telem"]:
-        return
-    if ctx["enterprise_url"]:  # dont run on dedicated cloud
-        return
-    if os.getenv("CODECOV_ENV", "production") == "test":
-        return
-
-    sentry_sdk.init(
-        dsn="https://0bea75c61745c221a6ef1ac1709b1f4d@o26192.ingest.us.sentry.io/4508615876083713",
-        enable_tracing=True,
-        environment=os.getenv("CODECOV_ENV", "production"),
-        release=f"cli@{__version__}",
-    )
-
-
-def close_telem():
-    sentry_sdk.flush()