port-ocean 0.27.7__tar.gz → 0.27.9__tar.gz

{port_ocean-0.27.7 → port_ocean-0.27.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.27.7
+Version: 0.27.9
 Summary: Port Ocean is a CLI tool for managing your Port projects.
 Home-page: https://app.getport.io
 Keywords: ocean,port-ocean,port

{port_ocean-0.27.7 → port_ocean-0.27.9}/port_ocean/core/handlers/resync_state_updater/updater.py

@@ -91,6 +91,8 @@ class ResyncStateUpdater:
             value=int(status == IntegrationStateStatus.Completed),
         )
 
+        ocean.metrics.sync_state = status.value
+
         await ocean.metrics.send_metrics_to_webhook(
             kind=ocean.metrics.current_resource_kind()
         )

{port_ocean-0.27.7 → port_ocean-0.27.9}/port_ocean/core/integrations/mixins/sync_raw.py

@@ -976,6 +976,11 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
             ocean.metrics.initialize_metrics(kinds)
             await ocean.metrics.report_sync_metrics(kinds=kinds, blueprints=blueprints)
 
+            async with metric_resource_context(MetricResourceKind.RUNTIME):
+                ocean.metrics.sync_state = SyncState.SYNCING
+                await ocean.metrics.send_metrics_to_webhook(kind=MetricResourceKind.RUNTIME)
+                await ocean.metrics.report_sync_metrics(kinds=[MetricResourceKind.RUNTIME])
+
             # Clear cache
             await ocean.app.cache_provider.clear()
 
@@ -1010,8 +1015,18 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
                 logger.warning(
                     "Resync aborted successfully, skipping delete phase. This leads to an incomplete state"
                 )
+
+                async with metric_resource_context(MetricResourceKind.RUNTIME):
+                    ocean.metrics.sync_state = SyncState.FAILED
+                    await ocean.metrics.send_metrics_to_webhook(kind=MetricResourceKind.RUNTIME)
+                    await ocean.metrics.report_sync_metrics(kinds=[MetricResourceKind.RUNTIME])
                 raise
             else:
+                async with metric_resource_context(MetricResourceKind.RECONCILIATION):
+                    ocean.metrics.sync_state = SyncState.SYNCING
+                    await ocean.metrics.send_metrics_to_webhook(kind=MetricResourceKind.RECONCILIATION)
+                    await ocean.metrics.report_sync_metrics(kinds=[MetricResourceKind.RECONCILIATION])
+
                 success = await self.resync_reconciliation(
                     creation_results,
                     did_fetched_current_state,
@@ -1019,9 +1034,12 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
                     app_config,
                     silent,
                 )
-                await ocean.metrics.report_sync_metrics(
-                    kinds=[MetricResourceKind.RECONCILIATION]
-                )
+
+                async with metric_resource_context(MetricResourceKind.RECONCILIATION):
+                    ocean.metrics.sync_state = SyncState.COMPLETED if success else SyncState.FAILED
+                    await ocean.metrics.send_metrics_to_webhook(kind=MetricResourceKind.RECONCILIATION)
+                    await ocean.metrics.report_sync_metrics(kinds=[MetricResourceKind.RECONCILIATION])
+
                 return success
             finally:
                 await ocean.app.cache_provider.clear()

{port_ocean-0.27.7 → port_ocean-0.27.9}/port_ocean/core/integrations/mixins/utils.py

@@ -120,7 +120,6 @@ class ProcessWrapper(multiprocessing.Process):
             logger.error(f"Process {self.pid} failed with exit code {self.exitcode}")
         else:
             logger.info(f"Process {self.pid} finished with exit code {self.exitcode}")
-        ocean.metrics.cleanup_prometheus_metrics(self.pid)
         return super().join()
 
 def clear_http_client_context() -> None:

{port_ocean-0.27.7 → port_ocean-0.27.9}/port_ocean/helpers/metric/metric.py

@@ -1,21 +1,22 @@
 import os
-from typing import Any, TYPE_CHECKING, Optional, Dict, List, Tuple
-from fastapi import APIRouter
-from port_ocean.exceptions.context import ResourceContextNotFoundError
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple
+
 import prometheus_client
-from httpx import AsyncClient
-from fastapi.responses import PlainTextResponse
-from loguru import logger
-from port_ocean.context import metric_resource, resource
-from prometheus_client import Gauge
 import prometheus_client.openmetrics
 import prometheus_client.openmetrics.exposition
 import prometheus_client.parser
-from prometheus_client import multiprocess
+from fastapi import APIRouter
+from fastapi.responses import PlainTextResponse
+from httpx import AsyncClient
+from loguru import logger
+from prometheus_client import Gauge, multiprocess
+
+from port_ocean.context import metric_resource, resource
+from port_ocean.exceptions.context import ResourceContextNotFoundError
 
 if TYPE_CHECKING:
-    from port_ocean.config.settings import MetricsSettings, IntegrationSettings
     from port_ocean.clients.port.client import PortClient
+    from port_ocean.config.settings import IntegrationSettings, MetricsSettings
 
 
 class MetricPhase:
@@ -61,6 +62,7 @@ class SyncState:
 class MetricResourceKind:
     RECONCILIATION = "__reconciliation__"
     RESYNC = "__resync__"
+    RUNTIME = "__runtime__"
 
 
 # Registry for core and custom metrics
@@ -278,7 +280,7 @@ class Metrics:
         try:
             return metric_resource.metric_resource.metric_resource_kind
         except ResourceContextNotFoundError:
-            return "__runtime__"
+            return MetricResourceKind.RUNTIME
 
     def generate_latest(self) -> str:
         return prometheus_client.openmetrics.exposition.generate_latest(

{port_ocean-0.27.7 → port_ocean-0.27.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "port-ocean"
-version = "0.27.7"
+version = "0.27.9"
 description = "Port Ocean is a CLI tool for managing your Port projects."
 readme = "README.md"
 homepage = "https://app.getport.io"