mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-06-01 08:23:33 +00:00
* fix(deps): bump minimum versions to address CVEs Pillow 10.4.0 → 12.2.0: CVE-2026-40192 (DoS via FITS decompression bomb), CVE-2026-25990 (OOB write via PSD image), CVE-2026-42311/42308/42310 requests 2.32.0 → 2.33.0: CVE-2026-25645 (temp file security bypass), CVE-2024-47081 (.netrc credentials leak) werkzeug 3.0.0 → 3.1.6: CVE-2023-46136, CVE-2024-49766/49767, CVE-2025-66221, CVE-2026-21860/27199 (DoS, path traversal, safe_join bypass) Flask 3.0.0 → 3.1.3: CVE-2026-27205 (session data caching info disclosure) spotipy 2.24.0 → 2.25.2: CVE-2025-27154, CVE-2025-66040 python-socketio 5.11.0 → 5.14.0: CVE-2025-61765 pytest 7.4.0 → 9.0.3: CVE-2025-71176 (insecure temp dir handling) Updated in requirements.txt, web_interface/requirements.txt, plugin-repos/starlark-apps/requirements.txt, and plugin-repos/march-madness/requirements.txt. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: resolve Pylint errors in executor, data service, and odds call Rename TimeoutError to PluginTimeoutError in plugin_executor.py to avoid shadowing the built-in; no external callers affected. Remove dead try/except in BackgroundDataService.shutdown: executor.shutdown() never accepted a timeout kwarg so the try branch always raised TypeError. Simplify to a direct shutdown(wait=wait) call. Remove is_live kwarg from odds_manager.get_odds() call in sports.py; BaseOddsManager.get_odds() has no such parameter. The live update interval is already encoded in the update_interval_seconds argument passed alongside. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: MD5→SHA-256, shellcheck warnings, and broken doc links config_service.py: replace MD5 with SHA-256 for config change detection; same semantics (equality comparison), no stored hashes affected. Shell scripts — shellcheck warnings: - diagnose_web_interface.sh: remove useless cat (SC2002) - dev_plugin_setup.sh: restructure A&&B||C into if/then (SC2015) - fix_assets_permissions.sh: remove unused REAL_HOME block (SC2034) - install_web_service.sh: remove unused USER_HOME assignment (SC2034) - diagnose_web_ui.sh: remove unused SUDO assignments (SC2034) - diagnose_plugin_permissions.sh: remove unused BLUE color var (SC2034) - first_time_install.sh: remove unused CLEAR var, PACKAGE_NAME assignment, and replace loop variable with _ (SC2034) docs/PLUGIN_ARCHITECTURE_SPEC.md: fix 10 broken TOC anchor links to include section numbers matching the actual headings (MD051). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: remove unused imports and bare exception aliases (pyflakes F401/F841) Remove unused imports across 86 files in src/, web_interface/, test/, and scripts/ using autoflake. No logic changes — only dead import statements and unused names in from-imports are removed. Also remove bare exception aliases where the variable is never referenced in the handler body: - src/cache/disk_cache.py: except (IOError, OSError, PermissionError) as e - src/cache_manager.py: except (OSError, IOError, PermissionError) as perm_error - src/plugin_system/resource_monitor.py: except Exception as e - web_interface/app.py: except Exception as read_err 86 files changed, 205 lines removed, 18 pre-existing test failures unchanged. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: remove unused local variable assignments (pyflakes F841) Dead assignments removed across src/ and web_interface/: - background_data_service: drop future= on fire-and-forget executor.submit - base_classes/baseball: drop font= (all rendering uses self.fonts['time']) - base_classes/hockey: drop status_short= (never referenced after assignment) - common/cli: drop game_helper=/config_helper= bindings in import-test block; constructors called for instantiation-only validation - common/display_helper: drop text_width= (x_position uses display_width directly); drop draw= in create_error_image (uses _draw_centered_text) - config_manager: remove dead secrets_content loading block in migration path (comment already noted save_config_atomic handles secrets internally) - display_manager: drop setup_start= (timing was never completed or read) - font_manager: drop target_path= (catalog uses font_file_path directly); drop face=/font= bindings in validate_font (validation by construction — TypeError on failure is the signal, not the return value) - font_test_manager: drop width=/height= (draw_text uses display_manager directly) - plugin_system/state_reconciliation: drop manager= (only config/disk/state_mgr used) - plugin_system/store_manager: drop result= on pip install subprocess.run (check=True raises on failure; stdout unused) - web_interface/blueprints/pages_v3: drop main_config_path=""/secrets_config_path="" (render_template uses config_manager.get_*_path() inline) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(js): resolve ESLint no-undef warnings across 6 JS files Three distinct patterns: 1. Vendor library globals — htmx is injected by <script> before these extension files load; ESLint lints files in isolation and doesn't know. Fix: add /* global htmx */ to htmx-sse.js and htmx-json-enc.js. 2. Cross-file globals — showNotification is defined as window.showNotification in app.js/notification.js but called bare in app.js and error_handler.js. ESLint doesn't connect window.X = Y with a bare call to X. Fix: add /* global showNotification */ to app.js and error_handler.js. 3. Forward-reference window.* functions — in array-table.js, checkbox-group.js, and custom-feeds.js, functions like removeArrayTableRow are called early inside event-handler closures but assigned to window.* later in the file. At runtime this works (the handler fires after the assignment), but ESLint sees the bare name at the call site. Fix: change bare calls to window.removeArrayTableRow(this) etc. so the reference is explicit and ESLint-safe. Also guard the updateSystemStats call in app.js reconnectSSE: the function is called but defined nowhere in the codebase. Guard with typeof check so it won't throw ReferenceError if the reconnect path is hit. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(js): resolve Biome lint warnings across 9 JS files noUnusedVariables (catch bindings → optional catch syntax): - app.js, file-upload.js, timezone-selector.js: } catch (e) { → } catch { ES2019 optional catch binding; e was unused in all three handlers noUnusedVariables (dead assignments): - app.js: remove const data= in display SSE stub (handler does nothing yet) - api_client.js: remove const timeoutId= (setTimeout ID never used to cancel) - custom-feeds.js: remove const oldIndex= (getAttribute result never read) - schedule-picker.js: remove const compactMode= (never used in HTML build) - select-dropdown.js: remove const icons= (icons not yet rendered in options) noPrototypeBuiltins: - day-selector.js: DAY_LABELS.hasOwnProperty(x) → Object.prototype.hasOwnProperty.call(DAY_LABELS, x) Safe form that works even on null-prototype objects useIterableCallbackReturn: - file-upload.js, notification.js: forEach(x => expr) → forEach(x => { expr; }) — forEach ignores return values; implicit return from arrow body was misleading htmx-sse.js is a vendor extension file with old-style var/== patterns that are correct for it; 18 Biome issues suppressed via Codacy API rather than modifying the vendor source. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(security): escape user input in raw HTML responses in pages_v3.py plugin_id comes directly from the URL path (/partials/plugin-config/<plugin_id>) and was interpolated into an HTML fragment without escaping. A crafted URL like /partials/plugin-config/<script>alert(1)</script> would inject that tag into the DOM via the HTMX partial response. Fix: wrap all user-controlled values in markupsafe.escape() before embedding in raw HTML strings. Affects the plugin-not-found 404 response and both error 500 responses in the plugin config partial. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: address Bandit B108/B110 across production code B110 (try/except/pass): - display_controller.py: narrow 'except Exception' to 'except AttributeError' for get_offset_frame() — plugins not having this optional method is the expected case, not all exceptions - config_manager.py: B110 already resolved by the earlier removal of the dead secrets-loading block (the except/pass was inside it) - All other except/pass blocks in src/ and web_interface/ are intentional (last-resort recovery, best-effort fallbacks, non-critical startup probes). Annotated each with # nosec B110 and a brief inline reason so the decision is explicit for future reviewers. - Test files and plugin-repos B110 suppressed via Codacy API (not prod code). B108 (/tmp usage): - permission_utils.py: /tmp listed to PREVENT permission changes on it — not used as a temp path. Annotated # nosec B108. - display_manager.py: fixed snapshot path is intentional (web UI reads same path); path-check guard also annotated. - wifi_manager.py: named /tmp files match the sudoers allowlist installed with the system (the paths are hard-coded in both places by design). Annotated all six open/cp references # nosec B108. - scripts/render_plugin.py: dev script default overridable by user. Annotated. - web_interface/app.py: reads the same fixed path written by display_manager. Annotated # nosec B108. - Test files suppressed via Codacy API. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: address remaining Codacy security findings Flask debug=True (real fix): - web_interface/app.py: debug=True in __main__ block exposes the Werkzeug interactive debugger (arbitrary code execution). Changed to os.environ.get('FLASK_DEBUG', '0') == '1' — off by default, opt-in via environment variable for local development. nosec annotations (accepted risk with documented rationale): - disk_cache.py: os.chmod(0o660) is intentional — web UI and LED matrix service share a group, 660 gives group write while denying world access (B103 + Semgrep insecure-file-permissions suppressed in Codacy) - wifi_manager.py: urlopen to hardcoded connectivity-check.ubuntu.com URL (B310 — no user input involved) - font_manager.py: urlretrieve URL comes from user's own config file on their local device (B310) - start_web_conditionally.py: os.execvp with both sys.executable and a fixed PROJECT_DIR-relative constant (B606) Confirmed false positives suppressed via Codacy API (15 issues): - SSRF (3x): client-side JS fetch — SSRF is server-side; browser fetch is CORS-restricted to same origin - B105 (3x): test fixtures use dummy secrets by design; store_manager checks for the placeholder string, it is not itself a secret - PMD numeric literal (2x): 10000000 is within Number.MAX_SAFE_INTEGER - Prototype pollution (1x): read-only schema traversal, no writes - no-unsanitized_method (1x): dynamic import() is CORS-restricted - detect-unsafe-regex (1x): operates on server-controlled config values - plugin-repos B103 (1x): vendor code chmod on executable - Semgrep insecure-file-permissions (3x): same disk_cache 0o660 as above Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: remove unnecessary f prefix from f-strings without placeholders (F541) Pyflakes F541 flags f-strings that contain no {} interpolation — they are identical to plain strings but trigger unnecessary string formatting overhead. Fixed in production code: - src/base_classes/data_sources.py (2 debug log calls) - src/logo_downloader.py (1 error log) - src/plugin_system/store_manager.py (5 strings across 3 log calls) - src/web_interface/validators.py (1 return value) - src/wifi_manager.py (4 log/message strings) - web_interface/start.py (1 print) F541 issues in test/, scripts/, and plugin-repos/ suppressed via Codacy API as non-production code. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * chore(dev): add Pillow compatibility smoke test script Covers all Pillow APIs used in LEDMatrix — image creation, drawing, font metrics, LANCZOS resampling, paste/alpha_composite, and PNG I/O. Run after any Pillow version bump to catch regressions before deploy. python3 scripts/dev/test_pillow_compat.py Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: resolve 8 new Codacy issues introduced by PR changes shellcheck SC2034: - first_time_install.sh: 'type' loop variable also unused in the wifi status loop (we previously fixed 'device' → '_' but left 'type'). Changed to '_ _ state' since neither device nor type is referenced. ESLint no-undef: - app.js: typeof guards don't satisfy no-undef; added updateSystemStats to the /* global */ declaration alongside showNotification. nosec annotation: - web_interface/app.py: app.run(host='0.0.0.0') line changed when we fixed debug=True, giving it a new issue ID. Re-added # nosec B104. pyflakes F401: - scripts/dev/test_pillow_compat.py: ImageFilter was imported but never used in the smoke test. Removed from the import. Codacy API suppressions (false positives on changed lines): - disk_cache.py 0o660 chmod (2x): lines changed when # nosec B103 was added, producing new Semgrep issue IDs. Re-suppressed. - pages_v3.py raw-html-concat: Semgrep does not recognise escape() as a sanitizer; the escape() call IS the correct fix. - app.py flask 0.0.0.0: same line as B104 above; Semgrep rule also re-suppressed. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: address PR review findings Fix (10 of 15 findings): plugin-repos/march-madness/requirements.txt: Add urllib3>=1.26.0 — manager.py directly imports from urllib3; it was an undeclared transitive dependency via requests. scripts/dev/dev_plugin_setup.sh: Restore subshell form (cd "$target_dir" && git pull --rebase) || true so the shell's working directory is not permanently changed after the if-cd block. Previous fix for SC2015 leaked cwd into the remainder of the script. src/base_classes/sports.py: Narrow 'except Exception' to 'except RuntimeError as e' and log via self.logger.debug — Path.home() raises only RuntimeError for service users; other exceptions should not be silently swallowed. src/config_service.py: Fix stale "MD5 checksum" in ConfigVersion.__init__ docstring (line 40); the implementation uses SHA-256 since the Codacy fix. src/wifi_manager.py: Log the last-resort AP enable failure with exc_info=True instead of silently passing — failure here means the device may be unreachable. web_interface/blueprints/pages_v3.py: Log the outer metadata pre-load exception at debug level instead of swallowing it silently; schema still loads fully below. src/background_data_service.py: Remove unused 'timeout' parameter from shutdown() — executor.shutdown() does not accept timeout; update __del__ caller accordingly. src/font_manager.py: Validate URL scheme before urlretrieve — reject non-http/https schemes (e.g. file://) to prevent reading local files from config-supplied URLs. src/plugin_system/plugin_executor.py: Simplify redundant except tuple: (PluginTimeoutError, PluginError, Exception) → Exception, which already covers the others. test/test_display_controller.py: Mark empty test_plugin_discovery_and_loading as @pytest.mark.skip with reason. Move duplicate 'from datetime import datetime' to module header and remove the stray mid-module copy. Skip (5 of 15 findings, with reasons): - pytest 9.0.3 concerns: full suite already verified (467 pass, 18 pre-existing) - Pillow 12.2.0 API concerns: no deprecated APIs in codebase; tests + Pi smoke test pass - diagnose_web_ui.sh sudo validation: set -e already ensures fail-fast on any sudo failure - app.py request-logging except: must stay silent (recursive logging risk); annotated - app.py SSE file-read except: genuinely transient I/O; annotated Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Chuck <chuck@example.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
344 lines
13 KiB
Python
344 lines
13 KiB
Python
"""
|
|
Plugin Resource Monitor
|
|
|
|
Tracks resource usage (memory, CPU, execution time) for plugins.
|
|
Provides resource limits and performance monitoring.
|
|
"""
|
|
|
|
import time
|
|
import logging
|
|
import threading
|
|
from typing import Dict, Optional, Any, Callable
|
|
from dataclasses import dataclass, field
|
|
|
|
try:
|
|
import psutil
|
|
PSUTIL_AVAILABLE = True
|
|
except ImportError:
|
|
PSUTIL_AVAILABLE = False
|
|
|
|
|
|
class ResourceLimitExceeded(Exception):
|
|
"""Raised when a plugin exceeds its resource limits."""
|
|
|
|
|
|
@dataclass
|
|
class ResourceLimits:
|
|
"""Resource limits for a plugin."""
|
|
max_memory_mb: Optional[float] = None # Maximum memory in MB
|
|
max_cpu_percent: Optional[float] = None # Maximum CPU percentage
|
|
max_execution_time: Optional[float] = None # Maximum execution time in seconds
|
|
warning_threshold: float = 0.8 # Warning at 80% of limit
|
|
|
|
|
|
@dataclass
|
|
class ResourceMetrics:
|
|
"""Resource usage metrics for a plugin."""
|
|
memory_mb: float = 0.0
|
|
cpu_percent: float = 0.0
|
|
execution_time: float = 0.0
|
|
call_count: int = 0
|
|
total_execution_time: float = 0.0
|
|
max_execution_time: float = 0.0
|
|
min_execution_time: float = float('inf')
|
|
last_update_time: float = field(default_factory=time.time)
|
|
|
|
def update_average_execution_time(self):
|
|
"""Update average execution time."""
|
|
if self.call_count > 0:
|
|
self.total_execution_time = self.total_execution_time / self.call_count
|
|
|
|
|
|
class PluginResourceMonitor:
|
|
"""
|
|
Monitors resource usage for plugins.
|
|
|
|
Tracks:
|
|
- Memory usage (if psutil available)
|
|
- CPU usage (if psutil available)
|
|
- Execution time for update() and display() calls
|
|
- Call counts and statistics
|
|
"""
|
|
|
|
def __init__(self, cache_manager, enable_monitoring: bool = True):
|
|
"""
|
|
Initialize resource monitor.
|
|
|
|
Args:
|
|
cache_manager: Cache manager for persisting metrics
|
|
enable_monitoring: Enable resource monitoring (requires psutil)
|
|
"""
|
|
self.cache_manager = cache_manager
|
|
self.enable_monitoring = enable_monitoring and PSUTIL_AVAILABLE
|
|
self.logger = logging.getLogger(__name__)
|
|
|
|
# Resource metrics per plugin
|
|
self._metrics: Dict[str, ResourceMetrics] = {}
|
|
self._limits: Dict[str, ResourceLimits] = {}
|
|
|
|
# Thread-local storage for execution tracking
|
|
self._local = threading.local()
|
|
|
|
# Lock for thread-safe access
|
|
self._lock = threading.Lock()
|
|
|
|
if not PSUTIL_AVAILABLE and enable_monitoring:
|
|
self.logger.warning(
|
|
"psutil not available - resource monitoring will be limited to execution time only"
|
|
)
|
|
|
|
def _get_metrics_key(self, plugin_id: str) -> str:
|
|
"""Get cache key for plugin metrics."""
|
|
return f"plugin_metrics:{plugin_id}"
|
|
|
|
def _get_limits_key(self, plugin_id: str) -> str:
|
|
"""Get cache key for plugin limits."""
|
|
return f"plugin_limits:{plugin_id}"
|
|
|
|
def get_metrics(self, plugin_id: str) -> ResourceMetrics:
|
|
"""Get current metrics for a plugin."""
|
|
with self._lock:
|
|
if plugin_id not in self._metrics:
|
|
# Try to load from cache
|
|
cache_key = self._get_metrics_key(plugin_id)
|
|
cached = self.cache_manager.get(cache_key, max_age=None)
|
|
if cached:
|
|
metrics = ResourceMetrics(**cached)
|
|
else:
|
|
metrics = ResourceMetrics()
|
|
self._metrics[plugin_id] = metrics
|
|
return self._metrics[plugin_id]
|
|
|
|
def set_limits(self, plugin_id: str, limits: ResourceLimits) -> None:
|
|
"""Set resource limits for a plugin."""
|
|
with self._lock:
|
|
self._limits[plugin_id] = limits
|
|
# Persist to cache
|
|
cache_key = self._get_limits_key(plugin_id)
|
|
self.cache_manager.set(cache_key, {
|
|
'max_memory_mb': limits.max_memory_mb,
|
|
'max_cpu_percent': limits.max_cpu_percent,
|
|
'max_execution_time': limits.max_execution_time,
|
|
'warning_threshold': limits.warning_threshold
|
|
})
|
|
|
|
def get_limits(self, plugin_id: str) -> Optional[ResourceLimits]:
|
|
"""Get resource limits for a plugin."""
|
|
with self._lock:
|
|
if plugin_id not in self._limits:
|
|
# Try to load from cache
|
|
cache_key = self._get_limits_key(plugin_id)
|
|
cached = self.cache_manager.get(cache_key, max_age=None)
|
|
if cached:
|
|
self._limits[plugin_id] = ResourceLimits(**cached)
|
|
else:
|
|
return None
|
|
return self._limits[plugin_id]
|
|
|
|
def _get_process_memory_mb(self) -> float:
|
|
"""Get current process memory usage in MB."""
|
|
if not self.enable_monitoring:
|
|
return 0.0
|
|
try:
|
|
process = psutil.Process()
|
|
return process.memory_info().rss / 1024 / 1024
|
|
except Exception:
|
|
return 0.0
|
|
|
|
def _get_process_cpu_percent(self, interval: float = 0.1) -> float:
|
|
"""Get current process CPU usage percentage."""
|
|
if not self.enable_monitoring:
|
|
return 0.0
|
|
try:
|
|
process = psutil.Process()
|
|
return process.cpu_percent(interval=interval)
|
|
except Exception:
|
|
return 0.0
|
|
|
|
def monitor_call(self, plugin_id: str, func: Callable, *args, **kwargs) -> Any:
|
|
"""
|
|
Monitor a plugin method call.
|
|
|
|
Tracks execution time and resource usage, enforces limits.
|
|
|
|
Args:
|
|
plugin_id: Plugin identifier
|
|
func: Function to call
|
|
*args: Function arguments
|
|
**kwargs: Function keyword arguments
|
|
|
|
Returns:
|
|
Function return value
|
|
|
|
Raises:
|
|
ResourceLimitExceeded: If resource limits are exceeded
|
|
"""
|
|
metrics = self.get_metrics(plugin_id)
|
|
limits = self.get_limits(plugin_id)
|
|
|
|
# Record start time and memory
|
|
start_time = time.time()
|
|
start_memory = self._get_process_memory_mb()
|
|
|
|
try:
|
|
# Execute the function
|
|
result = func(*args, **kwargs)
|
|
|
|
# Calculate execution time
|
|
execution_time = time.time() - start_time
|
|
|
|
# Update metrics
|
|
with self._lock:
|
|
metrics.execution_time = execution_time
|
|
metrics.call_count += 1
|
|
metrics.total_execution_time += execution_time
|
|
metrics.max_execution_time = max(metrics.max_execution_time, execution_time)
|
|
if metrics.min_execution_time == float('inf'):
|
|
metrics.min_execution_time = execution_time
|
|
else:
|
|
metrics.min_execution_time = min(metrics.min_execution_time, execution_time)
|
|
metrics.last_update_time = time.time()
|
|
|
|
# Update memory and CPU if monitoring enabled
|
|
if self.enable_monitoring:
|
|
end_memory = self._get_process_memory_mb()
|
|
metrics.memory_mb = max(metrics.memory_mb, end_memory - start_memory)
|
|
# CPU is harder to measure per-call, so we track it separately
|
|
metrics.cpu_percent = self._get_process_cpu_percent()
|
|
|
|
# Persist metrics
|
|
cache_key = self._get_metrics_key(plugin_id)
|
|
self.cache_manager.set(cache_key, {
|
|
'memory_mb': metrics.memory_mb,
|
|
'cpu_percent': metrics.cpu_percent,
|
|
'execution_time': metrics.execution_time,
|
|
'call_count': metrics.call_count,
|
|
'total_execution_time': metrics.total_execution_time,
|
|
'max_execution_time': metrics.max_execution_time,
|
|
'min_execution_time': metrics.min_execution_time if metrics.min_execution_time != float('inf') else 0.0,
|
|
'last_update_time': metrics.last_update_time
|
|
})
|
|
|
|
# Check limits
|
|
if limits:
|
|
self._check_limits(plugin_id, metrics, limits, execution_time)
|
|
|
|
return result
|
|
|
|
except ResourceLimitExceeded:
|
|
raise
|
|
except Exception:
|
|
# Still record execution time even on error
|
|
execution_time = time.time() - start_time
|
|
with self._lock:
|
|
metrics.execution_time = execution_time
|
|
metrics.last_update_time = time.time()
|
|
raise
|
|
|
|
def _check_limits(self, plugin_id: str, metrics: ResourceMetrics,
|
|
limits: ResourceLimits, execution_time: float) -> None:
|
|
"""Check if plugin has exceeded resource limits."""
|
|
warnings = []
|
|
errors = []
|
|
|
|
# Check execution time
|
|
if limits.max_execution_time and execution_time > limits.max_execution_time:
|
|
errors.append(
|
|
f"Execution time {execution_time:.2f}s exceeds limit {limits.max_execution_time:.2f}s"
|
|
)
|
|
elif limits.max_execution_time and execution_time > limits.max_execution_time * limits.warning_threshold:
|
|
warnings.append(
|
|
f"Execution time {execution_time:.2f}s approaching limit {limits.max_execution_time:.2f}s"
|
|
)
|
|
|
|
# Check memory
|
|
if limits.max_memory_mb and metrics.memory_mb > limits.max_memory_mb:
|
|
errors.append(
|
|
f"Memory usage {metrics.memory_mb:.2f}MB exceeds limit {limits.max_memory_mb:.2f}MB"
|
|
)
|
|
elif limits.max_memory_mb and metrics.memory_mb > limits.max_memory_mb * limits.warning_threshold:
|
|
warnings.append(
|
|
f"Memory usage {metrics.memory_mb:.2f}MB approaching limit {limits.max_memory_mb:.2f}MB"
|
|
)
|
|
|
|
# Check CPU
|
|
if limits.max_cpu_percent and metrics.cpu_percent > limits.max_cpu_percent:
|
|
errors.append(
|
|
f"CPU usage {metrics.cpu_percent:.2f}% exceeds limit {limits.max_cpu_percent:.2f}%"
|
|
)
|
|
elif limits.max_cpu_percent and metrics.cpu_percent > limits.max_cpu_percent * limits.warning_threshold:
|
|
warnings.append(
|
|
f"CPU usage {metrics.cpu_percent:.2f}% approaching limit {limits.max_cpu_percent:.2f}%"
|
|
)
|
|
|
|
# Log warnings
|
|
for warning in warnings:
|
|
self.logger.warning(f"Plugin {plugin_id}: {warning}")
|
|
|
|
# Raise exception for errors
|
|
if errors:
|
|
error_msg = f"Plugin {plugin_id} exceeded resource limits: {'; '.join(errors)}"
|
|
self.logger.error(error_msg)
|
|
raise ResourceLimitExceeded(error_msg)
|
|
|
|
def get_metrics_summary(self, plugin_id: str) -> Dict[str, Any]:
|
|
"""Get metrics summary for a plugin."""
|
|
metrics = self.get_metrics(plugin_id)
|
|
limits = self.get_limits(plugin_id)
|
|
|
|
avg_execution_time = 0.0
|
|
if metrics.call_count > 0:
|
|
avg_execution_time = metrics.total_execution_time / metrics.call_count
|
|
|
|
summary = {
|
|
'plugin_id': plugin_id,
|
|
'memory_mb': round(metrics.memory_mb, 2),
|
|
'cpu_percent': round(metrics.cpu_percent, 2),
|
|
'execution_time': round(metrics.execution_time, 3),
|
|
'avg_execution_time': round(avg_execution_time, 3),
|
|
'min_execution_time': round(metrics.min_execution_time if metrics.min_execution_time != float('inf') else 0.0, 3),
|
|
'max_execution_time': round(metrics.max_execution_time, 3),
|
|
'call_count': metrics.call_count,
|
|
'last_update_time': metrics.last_update_time
|
|
}
|
|
|
|
if limits:
|
|
summary['limits'] = {
|
|
'max_memory_mb': limits.max_memory_mb,
|
|
'max_cpu_percent': limits.max_cpu_percent,
|
|
'max_execution_time': limits.max_execution_time,
|
|
'warning_threshold': limits.warning_threshold
|
|
}
|
|
|
|
# Calculate usage percentages
|
|
if limits.max_memory_mb:
|
|
summary['memory_usage_percent'] = round(
|
|
(metrics.memory_mb / limits.max_memory_mb) * 100, 2
|
|
)
|
|
if limits.max_cpu_percent:
|
|
summary['cpu_usage_percent'] = round(
|
|
(metrics.cpu_percent / limits.max_cpu_percent) * 100, 2
|
|
)
|
|
if limits.max_execution_time:
|
|
summary['execution_time_usage_percent'] = round(
|
|
(avg_execution_time / limits.max_execution_time) * 100, 2
|
|
)
|
|
|
|
return summary
|
|
|
|
def get_all_metrics_summaries(self) -> Dict[str, Dict[str, Any]]:
|
|
"""Get metrics summaries for all tracked plugins."""
|
|
summaries = {}
|
|
for plugin_id in self._metrics.keys():
|
|
summaries[plugin_id] = self.get_metrics_summary(plugin_id)
|
|
return summaries
|
|
|
|
def reset_metrics(self, plugin_id: str) -> None:
|
|
"""Reset metrics for a plugin."""
|
|
with self._lock:
|
|
if plugin_id in self._metrics:
|
|
self._metrics[plugin_id] = ResourceMetrics()
|
|
cache_key = self._get_metrics_key(plugin_id)
|
|
self.cache_manager.delete(cache_key)
|
|
|