telemetry: enable tool_execution across tools via strict, async-aware decorator; add endpoint env override + urllib fallback; enrich OS fields; fix TelemetryHelper invocation

Author: dsarno

UnityMcpBridge/Editor/Helpers/TelemetryHelper.cs

@@ -118,7 +118,7 @@ public static void RecordBridgeStartup()
             RecordEvent("bridge_startup", new Dictionary<string, object>
             {
                 ["bridge_version"] = "3.0.2",
-                ["auto_connect"] = MCPForUnityBridge.IsAutoConnectMode
+                ["auto_connect"] = MCPForUnityBridge.IsAutoConnectMode()
             });
         }
 

UnityMcpBridge/UnityMcpServer~/src/telemetry.py

@@ -9,6 +9,8 @@
 import json
 import time
 import os
+import sys
+import platform
 import logging
 from enum import Enum
 from dataclasses import dataclass, asdict
@@ -61,8 +63,11 @@ def __init__(self):
         # Check environment variables for opt-out
         self.enabled = not self._is_disabled()
 
-        # Telemetry endpoint - hardcoded to Coplay production API
-        self.endpoint = "https://api-prod.coplay.dev/telemetry/events"
+        # Telemetry endpoint (Cloud Run default; override via env)
+        self.endpoint = os.environ.get(
+            "UNITY_MCP_TELEMETRY_ENDPOINT",
+            "https://unity-mcp-telemetry-375728817078.us-central1.run.app/telemetry/events"
+        )
 
         # Local storage for UUID and milestones
         self.data_dir = self._get_data_directory()
@@ -172,9 +177,7 @@ def record(self,
         if not self.config.enabled:
             return
 
-        if not HAS_HTTPX:
-            logger.debug("Telemetry disabled: httpx not available")
-            return
+        # Allow fallback sender when httpx is unavailable (no early return)
 
         record = TelemetryRecord(
             record_type=record_type,
@@ -196,34 +199,63 @@ def record(self,
     def _send_telemetry(self, record: TelemetryRecord):
         """Send telemetry data to endpoint"""
         try:
+            # System fingerprint (top-level remains concise; details stored in data JSON)
+            _platform = platform.system()          # 'Darwin' | 'Linux' | 'Windows'
+            _source = sys.platform                 # 'darwin' | 'linux' | 'win32'
+            _platform_detail = f"{_platform} {platform.release()} ({platform.machine()})"
+            _python_version = platform.python_version()
+
+            # Enrich data JSON so BigQuery stores detailed fields without schema change
+            enriched_data = dict(record.data or {})
+            enriched_data.setdefault("platform_detail", _platform_detail)
+            enriched_data.setdefault("python_version", _python_version)
+
             payload = {
                 "record": record.record_type.value,
                 "timestamp": record.timestamp,
                 "customer_uuid": record.customer_uuid,
                 "session_id": record.session_id,
-                "data": record.data,
+                "data": enriched_data,
                 "version": "3.0.2",  # Unity MCP version
-                "platform": os.name
+                "platform": _platform,
+                "source": _source,
             }
-            
+
             if record.milestone:
                 payload["milestone"] = record.milestone.value
-                
-            if not httpx:
-                return
-                
-            with httpx.Client(timeout=self.config.timeout) as client:
-                response = client.post(self.config.endpoint, json=payload)
-                
-                if response.status_code == 200:
-                    logger.debug(f"Telemetry sent: {record.record_type}")
-                else:
-                    logger.debug(f"Telemetry failed: HTTP {response.status_code}")
-                    
+
+            # Prefer httpx when available; otherwise fall back to urllib
+            if httpx:
+                with httpx.Client(timeout=self.config.timeout) as client:
+                    response = client.post(self.config.endpoint, json=payload)
+                    if response.status_code == 200:
+                        logger.debug(f"Telemetry sent: {record.record_type}")
+                    else:
+                        logger.debug(f"Telemetry failed: HTTP {response.status_code}")
+            else:
+                import urllib.request
+                import urllib.error
+                data_bytes = json.dumps(payload).encode("utf-8")
+                req = urllib.request.Request(
+                    self.config.endpoint,
+                    data=data_bytes,
+                    headers={"Content-Type": "application/json"},
+                    method="POST",
+                )
+                try:
+                    with urllib.request.urlopen(req, timeout=self.config.timeout) as resp:
+                        if 200 <= resp.getcode() < 300:
+                            logger.debug(f"Telemetry sent (urllib): {record.record_type}")
+                        else:
+                            logger.debug(f"Telemetry failed (urllib): HTTP {resp.getcode()}")
+                except urllib.error.URLError as ue:
+                    logger.debug(f"Telemetry send failed (urllib): {ue}")
+
         except Exception as e:
             # Never let telemetry errors interfere with app functionality
             logger.debug(f"Telemetry send failed: {e}")
 
+
 # Global telemetry instance
 _telemetry_collector: Optional[TelemetryCollector] = None
 

UnityMcpBridge/UnityMcpServer~/src/telemetry_decorator.py

@@ -4,39 +4,66 @@
 
 import functools
 import time
+import inspect
+import logging
 from typing import Callable, Any
 from telemetry import record_tool_usage, record_milestone, MilestoneType
 
+_log = logging.getLogger("unity-mcp-telemetry")
+_decorator_log_count = 0
+
 def telemetry_tool(tool_name: str):
     """Decorator to add telemetry tracking to MCP tools"""
     def decorator(func: Callable) -> Callable:
         @functools.wraps(func)
-        def wrapper(*args, **kwargs) -> Any:
+        def _sync_wrapper(*args, **kwargs) -> Any:
             start_time = time.time()
             success = False
             error = None
-            
             try:
+                global _decorator_log_count
+                if _decorator_log_count < 10:
+                    _log.info(f"telemetry_decorator sync: tool={tool_name}")
+                    _decorator_log_count += 1
                 result = func(*args, **kwargs)
                 success = True
-                
-                # Record tool-specific milestones
                 if tool_name == "manage_script" and kwargs.get("action") == "create":
                     record_milestone(MilestoneType.FIRST_SCRIPT_CREATION)
                 elif tool_name.startswith("manage_scene"):
                     record_milestone(MilestoneType.FIRST_SCENE_MODIFICATION)
-                
-                # Record general first tool usage
                 record_milestone(MilestoneType.FIRST_TOOL_USAGE)
-                
                 return result
-                
             except Exception as e:
                 error = str(e)
                 raise
             finally:
                 duration_ms = (time.time() - start_time) * 1000
                 record_tool_usage(tool_name, success, duration_ms, error)
-                
-        return wrapper
+
+        @functools.wraps(func)
+        async def _async_wrapper(*args, **kwargs) -> Any:
+            start_time = time.time()
+            success = False
+            error = None
+            try:
+                global _decorator_log_count
+                if _decorator_log_count < 10:
+                    _log.info(f"telemetry_decorator async: tool={tool_name}")
+                    _decorator_log_count += 1
+                result = await func(*args, **kwargs)
+                success = True
+                if tool_name == "manage_script" and kwargs.get("action") == "create":
+                    record_milestone(MilestoneType.FIRST_SCRIPT_CREATION)
+                elif tool_name.startswith("manage_scene"):
+                    record_milestone(MilestoneType.FIRST_SCENE_MODIFICATION)
+                record_milestone(MilestoneType.FIRST_TOOL_USAGE)
+                return result
+            except Exception as e:
+                error = str(e)
+                raise
+            finally:
+                duration_ms = (time.time() - start_time) * 1000
+                record_tool_usage(tool_name, success, duration_ms, error)
+
+        return _async_wrapper if inspect.iscoroutinefunction(func) else _sync_wrapper
     return decorator

UnityMcpBridge/UnityMcpServer~/src/tools/execute_menu_item.py

@@ -7,12 +7,15 @@
 from config import config
 import time
 
+from telemetry_decorator import telemetry_tool
+
 def register_execute_menu_item_tools(mcp: FastMCP):
     """Registers the execute_menu_item tool with the MCP server."""
 
     @mcp.tool()
+    @telemetry_tool("execute_menu_item")
     async def execute_menu_item(
-        ctx: Context,
+        ctx: Any,
         menu_path: str,
         action: str = 'execute',
         parameters: Dict[str, Any] = None,

UnityMcpBridge/UnityMcpServer~/src/tools/manage_asset.py

@@ -9,12 +9,15 @@
 from config import config
 import time
 
+from telemetry_decorator import telemetry_tool
+
 def register_manage_asset_tools(mcp: FastMCP):
     """Registers the manage_asset tool with the MCP server."""
 
     @mcp.tool()
+    @telemetry_tool("manage_asset")
     async def manage_asset(
-        ctx: Context,
+        ctx: Any,
         action: str,
         path: str,
         asset_type: str = None,

UnityMcpBridge/UnityMcpServer~/src/tools/manage_editor.py

@@ -4,12 +4,16 @@
 from unity_connection import get_unity_connection, send_command_with_retry
 from config import config
 
+from telemetry_decorator import telemetry_tool
+from telemetry import is_telemetry_enabled, record_tool_usage
+
 def register_manage_editor_tools(mcp: FastMCP):
     """Register all editor management tools with the MCP server."""
 
     @mcp.tool()
+    @telemetry_tool("manage_editor")
     def manage_editor(
-        ctx: Context,
+        ctx: Any,
         action: str,
         wait_for_completion: bool = None,
         # --- Parameters for specific actions ---
@@ -28,6 +32,13 @@ def manage_editor(
             Dictionary with operation results ('success', 'message', 'data').
         """
         try:
+            # Diagnostics: quick telemetry checks
+            if action == "telemetry_status":
+                return {"success": True, "telemetry_enabled": is_telemetry_enabled()}
+
+            if action == "telemetry_ping":
+                record_tool_usage("diagnostic_ping", True, 1.0, None)
+                return {"success": True, "message": "telemetry ping queued"}
             # Prepare parameters, removing None values
             params = {
                 "action": action,

UnityMcpBridge/UnityMcpServer~/src/tools/manage_gameobject.py

@@ -4,12 +4,15 @@
 from config import config
 import time
 
+from telemetry_decorator import telemetry_tool
+
 def register_manage_gameobject_tools(mcp: FastMCP):
     """Register all GameObject management tools with the MCP server."""
 
     @mcp.tool()
+    @telemetry_tool("manage_gameobject")
     def manage_gameobject(
-        ctx: Context,
+        ctx: Any,
         action: str,
         target: str = None,  # GameObject identifier by name or path
         search_method: str = None,

UnityMcpBridge/UnityMcpServer~/src/tools/manage_scene.py

@@ -4,12 +4,15 @@
 from config import config
 import time
 
+from telemetry_decorator import telemetry_tool
+
 def register_manage_scene_tools(mcp: FastMCP):
     """Register all scene management tools with the MCP server."""
 
     @mcp.tool()
+    @telemetry_tool("manage_scene")
     def manage_scene(
-        ctx: Context,
+        ctx: Any,
         action: str,
         name: str,
         path: str,

UnityMcpBridge/UnityMcpServer~/src/tools/manage_script.py

@@ -5,16 +5,8 @@
 import os
 from urllib.parse import urlparse, unquote
 
-try:
-    from telemetry_decorator import telemetry_tool
-    from telemetry import record_milestone, MilestoneType
-    HAS_TELEMETRY = True
-except ImportError:
-    HAS_TELEMETRY = False
-    def telemetry_tool(tool_name: str):
-        def decorator(func):
-            return func
-        return decorator
+from telemetry_decorator import telemetry_tool
+from telemetry import record_milestone, MilestoneType
 
 def register_manage_script_tools(mcp: FastMCP):
     """Register all script management tools with the MCP server."""
@@ -92,7 +84,7 @@ def _split_uri(uri: str) -> tuple[str, str]:
     ))
     @telemetry_tool("apply_text_edits")
     def apply_text_edits(
-        ctx: Context,
+        ctx: Any,
         uri: str,
         edits: List[Dict[str, Any]],
         precondition_sha256: str | None = None,
@@ -359,7 +351,7 @@ def _flip_async():
     ))
     @telemetry_tool("create_script")
     def create_script(
-        ctx: Context,
+        ctx: Any,
         path: str,
         contents: str = "",
         script_type: str | None = None,
@@ -397,7 +389,8 @@ def create_script(
         "Args: uri (unity://path/... or file://... or Assets/...).\n"
         "Rules: Target must resolve under Assets/.\n"
     ))
-    def delete_script(ctx: Context, uri: str) -> Dict[str, Any]:
+    @telemetry_tool("delete_script")
+    def delete_script(ctx: Any, uri: str) -> Dict[str, Any]:
         """Delete a C# script by URI."""
         name, directory = _split_uri(uri)
         if not directory or directory.split("/")[0].lower() != "assets":
@@ -412,8 +405,9 @@ def delete_script(ctx: Context, uri: str) -> Dict[str, Any]:
         "- basic: quick syntax checks.\n"
         "- standard: deeper checks (performance hints, common pitfalls).\n"
     ))
+    @telemetry_tool("validate_script")
     def validate_script(
-        ctx: Context, uri: str, level: str = "basic"
+        ctx: Any, uri: str, level: str = "basic"
     ) -> Dict[str, Any]:
         """Validate a C# script and return diagnostics."""
         name, directory = _split_uri(uri)
@@ -443,7 +437,7 @@ def validate_script(
     ))
     @telemetry_tool("manage_script")
     def manage_script(
-        ctx: Context,
+        ctx: Any,
         action: str,
         name: str,
         path: str,
@@ -573,7 +567,8 @@ def manage_script(
         "Get manage_script capabilities (supported ops, limits, and guards).\n\n"
         "Returns:\n- ops: list of supported structured ops\n- text_ops: list of supported text ops\n- max_edit_payload_bytes: server edit payload cap\n- guards: header/using guard enabled flag\n"
     ))
-    def manage_script_capabilities(ctx: Context) -> Dict[str, Any]:
+    @telemetry_tool("manage_script_capabilities")
+    def manage_script_capabilities(ctx: Any) -> Dict[str, Any]:
         try:
             # Keep in sync with server/Editor ManageScript implementation
             ops = [
@@ -600,7 +595,8 @@ def manage_script_capabilities(ctx: Context) -> Dict[str, Any]:
         "Args: uri (unity://path/Assets/... or file://... or Assets/...).\n"
         "Returns: {sha256, lengthBytes, lastModifiedUtc, uri, path}."
     ))
-    def get_sha(ctx: Context, uri: str) -> Dict[str, Any]:
+    @telemetry_tool("get_sha")
+    def get_sha(ctx: Any, uri: str) -> Dict[str, Any]:
         """Return SHA256 and basic metadata for a script."""
         try:
             name, directory = _split_uri(uri)