udata-hydra 2.0.0.dev2045__tar.gz → 2.0.0.dev2099__tar.gz

{udata_hydra-2.0.0.dev2045 → udata_hydra-2.0.0.dev2099}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata-hydra
-Version: 2.0.0.dev2045
+Version: 2.0.0.dev2099
 Summary: Async crawler and parsing service for data.gouv.fr
 License: MIT
 Author: Opendata Team
@@ -27,7 +27,7 @@ Requires-Dist: python-dateutil (>=2.8.2,<3.0.0)
 Requires-Dist: python-magic (>=0.4.25,<0.5.0)
 Requires-Dist: redis (>=4.1.4,<5.0.0)
 Requires-Dist: rq (>=1.11.1,<2.0.0)
-Requires-Dist: sentry-sdk (>=1.11.1,<2.0.0)
+Requires-Dist: sentry-sdk (>=2.10.0,<3.0.0)
 Requires-Dist: sqlalchemy (>=1.4.46,<2.0.0)
 Requires-Dist: str2bool (>=1.1,<2.0)
 Requires-Dist: str2float (>=0.0.9,<0.0.10)

{udata_hydra-2.0.0.dev2045 → udata_hydra-2.0.0.dev2099}/pyproject.toml

@@ -9,7 +9,7 @@ readme = "README.md"
 
 [tool.poetry]
 name = "udata-hydra"
-version = "2.0.0.dev2045"
+version = "2.0.0.dev2099"
 description = "Async crawler and parsing service for data.gouv.fr"
 authors = ["Opendata Team <opendatateam@data.gouv.fr>"]
 license = "MIT"
@@ -26,7 +26,7 @@ minicli = "^0.5.0"
 progressist = "^0.1.0"
 python-magic = "^0.4.25"
 redis = "^4.1.4"
-sentry-sdk = "^1.11.1"
+sentry-sdk = "^2.10.0"
 aiocontextvars = "^0.2.2"
 coloredlogs = "^15.0.1"
 rq = "^1.11.1"

{udata_hydra-2.0.0.dev2045 → udata_hydra-2.0.0.dev2099}/udata_hydra/analysis/helpers.py

@@ -11,7 +11,7 @@ def to_json(value: str) -> str:
     return value
 
 
-def _parse_dt(value: str) -> datetime:
+def _parse_dt(value: str) -> Union[datetime, None]:
     """For performance reasons, we try first with dateutil and fallback on dateparser"""
     try:
         return dateutil_parser(value)
@@ -24,5 +24,5 @@ def to_date(value: str) -> Union[date, None]:
     return parsed.date() if parsed else None
 
 
-def to_datetime(value: str) -> datetime:
+def to_datetime(value: str) -> Union[datetime, None]:
     return _parse_dt(value)

{udata_hydra-2.0.0.dev2045 → udata_hydra-2.0.0.dev2099}/udata_hydra/config_default.toml

@@ -6,6 +6,7 @@ DATABASE_URL_CSV = "postgres://postgres:postgres@localhost:5434/postgres"
 DATABASE_SCHEMA = "public"
 REDIS_URL = "redis://localhost:6379/0"
 SENTRY_DSN = ""
+SENTRY_SAMPLE_RATE = 1.0
 TESTING = false
 # max postgres pool size
 MAX_POOL_SIZE = 50

{udata_hydra-2.0.0.dev2045 → udata_hydra-2.0.0.dev2099}/udata_hydra/logger.py

@@ -1,4 +1,6 @@
 import logging
+import os
+from typing import Union
 
 import coloredlogs
 import sentry_sdk
@@ -6,6 +8,7 @@ from sentry_sdk.integrations.aiohttp import AioHttpIntegration
 from sentry_sdk.integrations.rq import RqIntegration
 
 from udata_hydra import config
+from udata_hydra.utils.app_version import get_app_version
 
 log = logging.getLogger("udata-hydra")
 context = {"inited": False}
@@ -14,6 +17,10 @@ context = {"inited": False}
 def setup_logging() -> logging.Logger:
     if context.get("inited"):
         return log
+    release = "hydra@unknown"
+    app_version: Union[str, None] = get_app_version()
+    if app_version:
+        release = f"hydra@{app_version}"
     if config.SENTRY_DSN:
         sentry_sdk.init(
             dsn=config.SENTRY_DSN,
@@ -21,7 +28,15 @@ def setup_logging() -> logging.Logger:
                 AioHttpIntegration(),
                 RqIntegration(),
             ],
+            release=release,
+            environment=os.getenv("HYDRA_ENV", "unknown"),
+            # Set traces_sample_rate to 1.0 to capture 100%
+            # of transactions for performance monitoring.
+            # Sentry recommends adjusting this value in production.
+            traces_sample_rate=config.SENTRY_SAMPLE_RATE,
+            profiles_sample_rate=config.SENTRY_SAMPLE_RATE,
         )
+
     coloredlogs.install(level=config.LOG_LEVEL)
     # silence urllib3 a bit
     logging.getLogger("urllib3").setLevel("INFO")

udata_hydra-2.0.0.dev2099/udata_hydra/utils/app_version.py

@@ -0,0 +1,17 @@
+import logging
+from typing import Union
+
+import toml
+
+log = logging.getLogger("udata-hydra")
+
+
+def get_app_version() -> Union[str, None]:
+    """Get the app version from pyproject.toml"""
+    try:
+        pyproject: dict = toml.load("pyproject.toml")
+        app_version: str = pyproject["tool"]["poetry"]["version"]
+        return app_version
+    except Exception as e:
+        log.error(f"Error while getting app version: {e}")
+        return None