port-ocean 0.30.3__tar.gz → 0.30.4__tar.gz

{port_ocean-0.30.3 → port_ocean-0.30.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.30.3
+Version: 0.30.4
 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.30.3 → port_ocean-0.30.4}/port_ocean/clients/port/mixins/entities.py

@@ -262,34 +262,36 @@ class EntityClientMixin:
         }
         error_entities = {error["index"]: error for error in result.get("errors", [])}
 
+        ocean.metrics.inc_metric(
+            name=MetricType.OBJECT_COUNT_NAME,
+            labels=[
+                ocean.metrics.current_resource_kind(),
+                MetricPhase.LOAD,
+                MetricPhase.LoadResult.LOADED,
+            ],
+            value=len(successful_entities),
+        )
+
+        ocean.metrics.inc_metric(
+            name=MetricType.OBJECT_COUNT_NAME,
+            labels=[
+                ocean.metrics.current_resource_kind(),
+                MetricPhase.LOAD,
+                MetricPhase.LoadResult.FAILED,
+            ],
+            value=len(error_entities),
+        )
+
         batch_results: list[tuple[bool | None, Entity]] = []
         for entity_index, original_entity in index_to_entity.items():
             reduced_entity = self._reduce_entity(original_entity)
             if entity_index in successful_entities:
-                ocean.metrics.inc_metric(
-                    name=MetricType.OBJECT_COUNT_NAME,
-                    labels=[
-                        ocean.metrics.current_resource_kind(),
-                        MetricPhase.LOAD,
-                        MetricPhase.LoadResult.LOADED,
-                    ],
-                    value=1,
-                )
                 success_entity = successful_entities[entity_index]
                 # Create a copy of the original entity with the new identifier
                 updated_entity = reduced_entity.copy()
                 updated_entity.identifier = success_entity["identifier"]
                 batch_results.append((True, updated_entity))
             elif entity_index in error_entities:
-                ocean.metrics.inc_metric(
-                    name=MetricType.OBJECT_COUNT_NAME,
-                    labels=[
-                        ocean.metrics.current_resource_kind(),
-                        MetricPhase.LOAD,
-                        MetricPhase.LoadResult.FAILED,
-                    ],
-                    value=1,
-                )
                 error = error_entities[entity_index]
                 if (
                     error.get("identifier") == "unknown"
@@ -357,16 +359,23 @@ class EntityClientMixin:
         blueprint = entities[0].blueprint
 
         identifier_counts = Counter((e.blueprint, e.identifier) for e in entities)
-        duplicate_count = sum(
-            count - 1 for count in identifier_counts.values() if count > 1
-        )
+        duplicates: dict[tuple[str, str], int] = {
+            key: cnt for key, cnt in identifier_counts.items() if cnt > 1
+        }
+
+        if duplicates:
+            # Total number of *extra* occurrences beyond the first appearance of each entity
+            duplicate_count = sum(cnt - 1 for cnt in duplicates.values())
+
+            # Show up to 5 example (blueprint, identifier) pairs to avoid noisy logs
+            duplicate_examples = list(duplicates)[:5]
 
-        if duplicate_count:
-            duplicate_examples = [
-                key for key, cnt in identifier_counts.items() if cnt > 1
-            ][:5]
             logger.warning(
-                f"Detected {duplicate_count} duplicate entities (by blueprint and identifier) that may not be ingested because an identical identifier existed. Examples: {duplicate_examples}"
+                "Detected duplicate entities (by blueprint and identifier) that may not be ingested because an identical identifier existed",
+                extra={
+                    "duplicate_examples": duplicate_examples,
+                    "duplicate_count": duplicate_count,
+                },
             )
 
         bulk_size = self.calculate_entities_batch_size(entities)

{port_ocean-0.30.3 → port_ocean-0.30.4}/pyproject.toml

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