Improve metrics

services/tenant/app/main.py

@@ -9,6 +9,7 @@ from app.core.config import settings
 from app.core.database import database_manager
 from app.api import tenants, tenant_members, tenant_operations, webhooks, plans, subscription, tenant_settings, whatsapp_admin, usage_forecast, enterprise_upgrade, tenant_locations, tenant_hierarchy, internal_demo, network_alerts, onboarding
 from shared.service_base import StandardFastAPIService
+from shared.monitoring.system_metrics import SystemMetricsCollector
 
 
 class TenantService(StandardFastAPIService):
@@ -77,6 +78,10 @@ class TenantService(StandardFastAPIService):
         redis_client = await get_redis_client()
         self.logger.info("Redis initialized successfully")
 
+        # Initialize system metrics collection
+        system_metrics = SystemMetricsCollector("tenant")
+        self.logger.info("System metrics collection started")
+
         # Start usage tracking scheduler
         from app.jobs.usage_tracking_scheduler import start_scheduler
         await start_scheduler(self.database_manager, redis_client, settings)
@@ -108,12 +113,14 @@ class TenantService(StandardFastAPIService):
 
     def setup_custom_endpoints(self):
         """Setup custom endpoints for tenant service"""
-        @self.app.get("/metrics")
-        async def metrics():
-            """Prometheus metrics endpoint"""
-            if self.metrics_collector:
-                return self.metrics_collector.get_metrics()
-            return {"metrics": "not_available"}
+        # Note: Metrics are exported via OpenTelemetry OTLP to SigNoz
+        # The /metrics endpoint is not needed as metrics are pushed automatically
+        # @self.app.get("/metrics")
+        # async def metrics():
+        #     """Prometheus metrics endpoint"""
+        #     if self.metrics_collector:
+        #         return self.metrics_collector.get_metrics()
+        #     return {"metrics": "not_available"}
 
 
 # Create service instance