hcs-core 0.1.290__tar.gz → 0.1.291__tar.gz

{hcs_core-0.1.290 → hcs_core-0.1.291}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-core
-Version: 0.1.290
+Version: 0.1.291
 Summary: Horizon Cloud Service CLI module.
 Project-URL: Homepage, https://github.com/euc-eng/hcs-cli
 Project-URL: Bug Tracker, https://github.com/euc-eng/hcs-cli/issues

hcs_core-0.1.291/hcs_core/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.291"

{hcs_core-0.1.290 → hcs_core-0.1.291}/hcs_core/ctxp/_init.py

@@ -19,7 +19,7 @@ from pathlib import Path
 
 import click
 
-from . import cli_processor, config, profile, state
+from . import cli_processor, config, profile, state, telemetry
 
 
 def _get_store_path():
@@ -79,8 +79,11 @@ def app_name():
 
 def init_cli(main_cli: click.Group, commands_dir: str = "./cmds"):
     try:
-        return cli_processor.init(main_cli, commands_dir)
-    except Exception as e:
+        ret = cli_processor.init(main_cli, commands_dir)
+        telemetry.end()
+        return ret
+    except BaseException as e:
+        telemetry.end(error=e)
         if _need_stack_trace(e):
             raise e
         else:

{hcs_core-0.1.290 → hcs_core-0.1.291}/hcs_core/ctxp/cli_processor.py

@@ -24,7 +24,6 @@ from pathlib import Path
 import click
 from click.core import Group
 
-from .extension import ensure_extension
 from .util import avoid_trace_for_ctrl_c, print_error, print_output, validate_error_return
 
 _eager_loading = os.environ.get("_CTXP_EAGER_LOAD")
@@ -61,6 +60,8 @@ class LazyGroup(click.Group):
 
     def _ensure_extension(self):
         if self._extension:
+            from .extension import ensure_extension
+
             ensure_extension(self._extension)
 
 
@@ -186,6 +187,11 @@ def _default_io(cmd: click.Command):
             "first": kwargs.pop("first"),
             "exclude_field": kwargs.pop("exclude_field"),
         }
+        ctx = click.get_current_context()
+        from .telemetry import start as telemetry_start
+
+        telemetry_start(ctx.command_path, ctx.params)
+
         if io_args["output"] == "table":
 
             def _format(data):

hcs_core-0.1.291/hcs_core/ctxp/telemetry.py

@@ -0,0 +1,88 @@
+import json
+import logging
+import sys
+import time
+from datetime import datetime, timezone
+
+import click
+import httpx
+from yumako import env
+
+log = logging.getLogger(__name__)
+
+_record = None
+_enabled = None
+
+
+def disable():
+    global _enabled
+    _enabled = False
+
+
+def _is_disabled():
+    global _enabled
+    if _enabled is None:
+        _enabled = env.bool("HCS_CLI_TELEMETRY", True)
+    return not _enabled
+
+
+def start(cmd_path: str, params: dict):
+    if _is_disabled():
+        return
+
+    global _record
+    _record = {
+        "@timestamp": datetime.now(timezone.utc).isoformat(timespec="milliseconds"),
+        "command": cmd_path,
+        "options": [k.replace("_", "-") for k, v in params.items() if v],
+        "return": -1,
+        "error": None,
+        "time_ms": -1,
+        "env": {
+            "python_version": sys.version,
+            "platform": sys.platform,
+            "executable": sys.executable,
+        },
+    }
+
+
+def end(return_code: int = 0, error: Exception = None):
+    if _is_disabled():
+        return
+
+    if _record is None:
+        return
+
+    if error:
+        if isinstance(error, click.exceptions.Exit):
+            return_code = error.exit_code
+        elif isinstance(error, SystemExit):
+            return_code = error.code
+        else:
+            _record["error"] = str(error)
+            if return_code == 0:
+                return_code = 1
+    _record["return"] = return_code
+    _record["time_ms"] = int((time.time() - datetime.fromisoformat(_record["@timestamp"]).timestamp()) * 1000)
+
+    # print('TELEMETRY end', json.dumps(_record, indent=4), flush=True)
+
+    _injest(_record)
+    return _record
+
+
+def _injest(doc):
+    try:
+        response = httpx.post(
+            f"https://collie.omnissa.com/es/hcs-cli/_doc",
+            auth=("append_user", "public"),
+            headers={"Content-Type": "application/json"},
+            content=json.dumps(doc),
+            timeout=4,
+        )
+        response.raise_for_status()
+    except Exception as e:
+        log.debug(f"Telemetry ingestion failed: {e}", exc_info=True)
+        return
+
+    log.debug(f"Telemetry ingestion successful: {response.status_code}")

{hcs_core-0.1.290 → hcs_core-0.1.291}/hcs_core/ctxp/util.py

@@ -189,6 +189,10 @@ def _exclude_fields(obj: Any, fields_exclude: str):
 
 
 def panic(reason: Any = None, code: int = 1):
+    if isinstance(reason, SystemExit):
+        os._exit(reason.code)
+    if isinstance(reason, click.exceptions.Exit):
+        os._exit(reason.exit_code)
     if isinstance(reason, Exception):
         text = error_details(reason)
     else:

hcs_core-0.1.290/hcs_core/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.290"