port-ocean 0.22.2__py3-none-any.whl → 0.22.3__py3-none-any.whl

port_ocean/log/logger_setup.py

@@ -1,4 +1,5 @@
 import sys
+import os
 from logging import LogRecord
 from logging.handlers import QueueHandler, QueueListener
 from queue import Queue
@@ -12,8 +13,9 @@ from port_ocean.log.sensetive import sensitive_log_filter
 from port_ocean.utils.signal import signal_handler
 
 
-def setup_logger(level: LogLevelType, enable_http_handler: bool) -> None:
+def setup_logger(level: LogLevelType, enable_http_handler: bool, instance: str) -> None:
     logger.remove()
+    logger.configure(extra={"hostname": try_get_hostname(), "instance": instance})
     _stdout_loguru_handler(level)
     if enable_http_handler:
         _http_loguru_handler(level)
@@ -23,6 +25,8 @@ def _stdout_loguru_handler(level: LogLevelType) -> None:
     logger_format = (
         "<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | "
         "<level>{level: <8}</level> | "
+        "<cyan>{extra[integration_id]}</cyan> | "
+        "<magenta>{extra[hostname]}</magenta> | "
         "<level>{message}</level>"
     )
     if level == "DEBUG":
@@ -72,3 +76,10 @@ def exception_deserializer(record: "loguru.Record") -> None:
     if exception is not None:
         fixed = Exception(str(exception.value))
         record["exception"] = exception._replace(value=fixed)
+
+
+def try_get_hostname() -> str:
+    try:
+        return os.uname().nodename
+    except Exception:
+        return "unknown"

port_ocean/run.py

@@ -1,6 +1,7 @@
 import asyncio
 from inspect import getmembers
 from typing import Dict, Any, Type
+import uuid
 
 import uvicorn
 from pydantic import BaseModel
@@ -33,11 +34,13 @@ def run(
     config_override: Dict[str, Any] | None = None,
 ) -> None:
     application_settings = ApplicationSettings(log_level=log_level, port=port)
+    instance = str(uuid.uuid4())
 
     init_signal_handler()
     setup_logger(
         application_settings.log_level,
         enable_http_handler=application_settings.enable_http_logging,
+        instance=instance,
     )
 
     config_factory = _get_default_config_factory()

{port_ocean-0.22.2.dist-info → port_ocean-0.22.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.22.2
+Version: 0.22.3
 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.22.2.dist-info → port_ocean-0.22.3.dist-info}/RECORD

@@ -136,12 +136,12 @@ port_ocean/helpers/metric/utils.py,sha256=1DlLR9FmUOpSlWSfY_tUEGcxRQY6ckAfbD3dnM
 port_ocean/helpers/retry.py,sha256=gmS4YxM6N4fboFp7GSgtOzyBJemxs46bnrz4L4rDS6Y,16136
 port_ocean/log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/log/handlers.py,sha256=ncVjgqrZRh6BhyRrA6DQG86Wsbxph1yWYuEC0cWfe-Q,3631
-port_ocean/log/logger_setup.py,sha256=CoEDowe5OwNOL_5clU6Z4faktfh0VWaOTS0VLmyhHjw,2404
+port_ocean/log/logger_setup.py,sha256=hXaaM3D-rOeH0PpIqgm4UtRMkYvrg5DNfu5TT0_JAIs,2736
 port_ocean/log/sensetive.py,sha256=lVKiZH6b7TkrZAMmhEJRhcl67HNM94e56x12DwFgCQk,2920
 port_ocean/middlewares.py,sha256=9wYCdyzRZGK1vjEJ28FY_DkfwDNENmXp504UKPf5NaQ,2727
 port_ocean/ocean.py,sha256=XmPmnjo-2oMZGvCLwIxPxwVNzXXzACzVR4JmlkXEOKY,7418
 port_ocean/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-port_ocean/run.py,sha256=COoRSmLG4hbsjIW5DzhV0NYVegI9xHd1POv6sg4U1No,2217
+port_ocean/run.py,sha256=EsyOjkRmoUpGWFBx9duJ9SuWbYfpcDAfidqLdjK8bU8,2289
 port_ocean/sonar-project.properties,sha256=X_wLzDOkEVmpGLRMb2fg9Rb0DxWwUFSvESId8qpvrPI,73
 port_ocean/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/tests/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -188,8 +188,8 @@ port_ocean/utils/repeat.py,sha256=U2OeCkHPWXmRTVoPV-VcJRlQhcYqPWI5NfmPlb1JIbc,32
 port_ocean/utils/signal.py,sha256=mMVq-1Ab5YpNiqN4PkiyTGlV_G0wkUDMMjTZp5z3pb0,1514
 port_ocean/utils/time.py,sha256=pufAOH5ZQI7gXvOvJoQXZXZJV-Dqktoj9Qp9eiRwmJ4,1939
 port_ocean/version.py,sha256=UsuJdvdQlazzKGD3Hd5-U7N69STh8Dq9ggJzQFnu9fU,177
-port_ocean-0.22.2.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.22.2.dist-info/METADATA,sha256=Gnljw5UH_wpBycjJttdo1rAf8C8s7EeOP_KS5Ur6jWI,6764
-port_ocean-0.22.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-port_ocean-0.22.2.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.22.2.dist-info/RECORD,,
+port_ocean-0.22.3.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.22.3.dist-info/METADATA,sha256=K8Cam4nhmqFRa6rdvgu7p9vZ2BJvCRpHitqi3vwsZzs,6764
+port_ocean-0.22.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+port_ocean-0.22.3.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.22.3.dist-info/RECORD,,