port-ocean 0.23.4__tar.gz → 0.23.5__tar.gz

{port_ocean-0.23.4 → port_ocean-0.23.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.23.4
+Version: 0.23.5
 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.23.4 → port_ocean-0.23.5}/integrations/_infra/Dockerfile.Deb

@@ -5,15 +5,11 @@ FROM ${BASE_BUILDER_PYTHON_IMAGE} AS base
 
 ARG BUILD_CONTEXT
 ARG BUILDPLATFORM
-ARG PROMETHEUS_MULTIPROC_DIR=/tmp/ocean/prometheus/metrics
 
 ENV LIBRDKAFKA_VERSION=2.8.2 \
     PYTHONUNBUFFERED=1 \
     POETRY_VIRTUALENVS_IN_PROJECT=1 \
-    PIP_ROOT_USER_ACTION=ignore \
-    PROMETHEUS_MULTIPROC_DIR=${PROMETHEUS_MULTIPROC_DIR}
-
-RUN mkdir -p ${PROMETHEUS_MULTIPROC_DIR}
+    PIP_ROOT_USER_ACTION=ignore
 
 WORKDIR /app
 
@@ -25,8 +21,12 @@ FROM ${BASE_RUNNER_PYTHON_IMAGE} AS prod
 
 ARG INTEGRATION_VERSION
 ARG BUILD_CONTEXT
+ARG PROMETHEUS_MULTIPROC_DIR=/tmp/ocean/prometheus/metrics
 
-ENV LIBRDKAFKA_VERSION=2.8.2
+ENV LIBRDKAFKA_VERSION=2.8.2 \
+    PROMETHEUS_MULTIPROC_DIR=${PROMETHEUS_MULTIPROC_DIR}
+
+RUN mkdir -p ${PROMETHEUS_MULTIPROC_DIR}
 
 RUN apt-get update \
     && apt-get install -y \

{port_ocean-0.23.4 → port_ocean-0.23.5}/port_ocean/config/dynamic.py

@@ -51,7 +51,7 @@ def default_config_factory(configurations: Any) -> Type[BaseModel]:
             case _:
                 raise ValueError(f"Unknown type: {config.type}")
 
-        default = ... if config.required else None
+        default: Any = ... if config.required else None
         if config.default is not None:
             default = parse_obj_as(field_type, config.default)
         fields[decamelize(config.name)] = (

{port_ocean-0.23.4 → port_ocean-0.23.5}/port_ocean/core/integrations/mixins/sync_raw.py

@@ -33,7 +33,7 @@ from port_ocean.core.ocean_types import (
     CalculationResult,
 )
 from port_ocean.core.utils.utils import resolve_entities_diff, zip_and_sum, gather_and_split_errors_from_results
-from port_ocean.exceptions.core import OceanAbortException
+from port_ocean.exceptions.core import IntegrationSubProcessFailedException, OceanAbortException
 from port_ocean.helpers.metric.metric import MetricResourceKind, SyncState, MetricType, MetricPhase
 from port_ocean.helpers.metric.utils import TimeMetric, TimeMetricWithResourceKind
 from port_ocean.utils.ipc import FileIPC
@@ -626,14 +626,13 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
                 id = uuid.uuid4()
                 logger.info(f"Starting subprocess with id {id}")
                 file_ipc_map = {
-                    "process_resource": FileIPC(id, "process_resource",([],[])),
+                    "process_resource": FileIPC(id, "process_resource",([],[IntegrationSubProcessFailedException(f"Subprocess failed for {resource.kind} with index {index}")])),
                     "topological_entities": FileIPC(id, "topological_entities",[]),
                 }
                 process = ProcessWrapper(target=self.process_resource_in_subprocess, args=(file_ipc_map,resource,index,user_agent_type))
                 process.start()
                 await process.join_async()
 
-
                 event.entity_topological_sorter.entities.extend(file_ipc_map["topological_entities"].load())
                 return file_ipc_map["process_resource"].load()
 

{port_ocean-0.23.4 → port_ocean-0.23.5}/port_ocean/exceptions/core.py

@@ -37,3 +37,7 @@ class IntegrationNotStartedException(BaseOceanException):
 
 class IntegrationRuntimeException(BaseOceanException):
     pass
+
+
+class IntegrationSubProcessFailedException(BaseOceanException):
+    pass

{port_ocean-0.23.4 → port_ocean-0.23.5}/port_ocean/helpers/metric/metric.py

@@ -123,6 +123,7 @@ class Metrics:
         self.registry = prometheus_client.CollectorRegistry()
         if multiprocessing_enabled:
             multiprocess.MultiProcessCollector(self.registry)
+        self.multiprocessing_enabled = multiprocessing_enabled
         self.metrics: dict[str, Gauge] = {}
         self.load_metrics()
         self._integration_version: Optional[str] = None
@@ -213,7 +214,8 @@ class Metrics:
             logger.error(f"Failed to cleanup prometheus metrics: {e}")
 
     def initialize_metrics(self, kind_blockes: list[str]) -> None:
-        self.cleanup_prometheus_metrics()
+        if self.multiprocessing_enabled:
+            self.cleanup_prometheus_metrics()
         for kind in kind_blockes:
             self.set_metric(MetricType.SUCCESS_NAME, [kind, MetricPhase.RESYNC], 0)
             self.set_metric(MetricType.DURATION_NAME, [kind, MetricPhase.RESYNC], 0)

{port_ocean-0.23.4 → port_ocean-0.23.5}/port_ocean/tests/log/test_handlers.py

@@ -21,7 +21,8 @@ def test_serialize_record_log_shape() -> None:
     )
     serialized_record = _serialize_record(record)
     assert all(key in serialized_record for key in expected_keys)
-    assert log_message in serialized_record.get("message", None)
+    message = serialized_record.get("message", None)
+    assert message is not None and log_message in message
 
 
 def test_serialize_record_exc_info_single_exception() -> None:

{port_ocean-0.23.4 → port_ocean-0.23.5}/pyproject.toml

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