fluidattacks-core 4.1.0__tar.gz → 4.2.1__tar.gz

{fluidattacks_core-4.1.0 → fluidattacks_core-4.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fluidattacks-core
-Version: 4.1.0
+Version: 4.2.1
 Summary: Fluid Attacks Core Library
 Author-email: Development <development@fluidattacks.com>
 License: MPL-2.0

{fluidattacks_core-4.1.0 → fluidattacks_core-4.2.1}/fluidattacks_core/logging/__init__.py

@@ -9,7 +9,9 @@ from fluidattacks_core.logging.presets import DATE_FORMAT, PRODUCT_LOGGING
 from fluidattacks_core.logging.sources.utils import (
     set_commit_ref_name,
     set_commit_sha,
+    set_product_environment,
     set_product_id,
+    set_product_version,
 )
 from fluidattacks_core.logging.utils import set_telemetry_metadata
 
@@ -50,6 +52,8 @@ __all__ = [
     "init_uncaught_exception_logging",
     "set_commit_ref_name",
     "set_commit_sha",
+    "set_product_environment",
     "set_product_id",
+    "set_product_version",
     "set_telemetry_metadata",
 ]

{fluidattacks_core-4.1.0 → fluidattacks_core-4.2.1}/fluidattacks_core/logging/handlers.py

@@ -1,3 +1,4 @@
+import copy
 import logging
 import sys
 from logging.handlers import HTTPHandler, QueueHandler, QueueListener
@@ -10,6 +11,22 @@ from fluidattacks_core.logging.filters import NoProductionFilter, ProductionOnly
 from fluidattacks_core.logging.formatters import ColorfulFormatter, CustomJsonFormatter
 
 
+class CustomQueueHandler(QueueHandler):
+    """Class to fix QueueHandler missing exc_info field."""
+
+    def prepare(self, record: logging.LogRecord) -> logging.LogRecord:
+        original_exc_info = record.exc_info
+
+        # Avoid duplicate exc_text in the log message
+        no_exc_record = copy.copy(record)
+        no_exc_record.exc_info = None
+        prepared = super().prepare(no_exc_record)
+
+        prepared.exc_info = original_exc_info
+
+        return prepared
+
+
 class DebuggingHandler(logging.StreamHandler[TextIO]):
     """Logging handler for console environments implemented with `QueueHandler`.
 
@@ -38,7 +55,7 @@ class ProductionSyncHandler(logging.StreamHandler[TextIO]):
         self.setFormatter(CustomJsonFormatter())
 
 
-class ProductionAsyncHandler(QueueHandler):
+class ProductionAsyncHandler(CustomQueueHandler):
     """Logging handler for production environments implemented with `QueueHandler`.
 
     Includes:
@@ -96,7 +113,7 @@ class DatadogLogsHandler(HTTPHandler):
             self.handleError(record)
 
 
-class TelemetryAsyncHandler(QueueHandler):
+class TelemetryAsyncHandler(CustomQueueHandler):
     """Logging handler for sending logs to telemetry services asynchronously."""
 
     def __init__(self, service: str, source: str, dd_client_token: str) -> None:

{fluidattacks_core-4.1.0 → fluidattacks_core-4.2.1}/fluidattacks_core/logging/sources/__init__.py

@@ -39,10 +39,13 @@ class BatchSource(SourceStrategy):
 
     @staticmethod
     def log_metadata() -> dict[str, str]:
-        job_name = get_env_var("JOB_DEFINITION_NAME")
+        job_name = get_env_var("JOB_NAME")
+        job_definition_name = get_env_var("JOB_DEFINITION_NAME")
         job_queue = get_env_var("AWS_BATCH_JQ_NAME")
         product_id = get_env_var("PRODUCT_ID")
-        service = job_name or (f"from-{job_queue}" if job_queue else product_id)
+        service = (
+            job_name or job_definition_name or (f"from-{job_queue}" if job_queue else product_id)
+        )
         return {
             "ddsource": "batch",
             "dd.service": service or "unknown",
@@ -126,7 +129,11 @@ class PipelineSource(SourceStrategy):
 class ContainerSource(SourceStrategy):
     @staticmethod
     def detect() -> bool:
-        return get_env_var("CONTAINER_IMAGE") is not None
+        return (
+            get_env_var("CONTAINER_IMAGE") is not None
+            or get_env_var("CONTAINER_NAME") is not None
+            or get_env_var("CONTAINER_IMAGE_PATH") is not None
+        )
 
     @staticmethod
     def log_metadata() -> dict[str, str]:

fluidattacks_core-4.2.1/fluidattacks_core/logging/sources/utils.py

@@ -0,0 +1,37 @@
+import os
+
+
+def get_env_var(key: str) -> str | None:
+    return os.environ.get(key)
+
+
+def get_environment() -> str:
+    product_environment = os.environ.get("PRODUCT_ENVIRONMENT")
+    branch = os.environ.get("CI_COMMIT_REF_NAME", "default")
+    return product_environment or ("production" if branch == "trunk" else "development")
+
+
+def get_version() -> str:
+    product_version = os.environ.get("PRODUCT_VERSION")
+    short_commit_sha = os.environ["CI_COMMIT_SHA"][:8] if os.environ.get("CI_COMMIT_SHA") else None
+    return product_version or short_commit_sha or "00000000"
+
+
+def set_product_id(product_id: str) -> None:
+    os.environ["PRODUCT_ID"] = product_id
+
+
+def set_product_environment(product_environment: str) -> None:
+    os.environ["PRODUCT_ENVIRONMENT"] = product_environment
+
+
+def set_product_version(product_version: str) -> None:
+    os.environ["PRODUCT_VERSION"] = product_version
+
+
+def set_commit_sha(commit_sha: str) -> None:
+    os.environ["CI_COMMIT_SHA"] = commit_sha
+
+
+def set_commit_ref_name(commit_ref_name: str) -> None:
+    os.environ["CI_COMMIT_REF_NAME"] = commit_ref_name

{fluidattacks_core-4.1.0 → fluidattacks_core-4.2.1}/fluidattacks_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fluidattacks-core
-Version: 4.1.0
+Version: 4.2.1
 Summary: Fluid Attacks Core Library
 Author-email: Development <development@fluidattacks.com>
 License: MPL-2.0

{fluidattacks_core-4.1.0 → fluidattacks_core-4.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fluidattacks-core"
-version = "4.1.0"
+version = "4.2.1"
 description = "Fluid Attacks Core Library"
 authors = [{ name = "Development", email = "development@fluidattacks.com" }]
 license = { text = "MPL-2.0" }

fluidattacks_core-4.1.0/fluidattacks_core/logging/sources/utils.py

@@ -1,27 +0,0 @@
-import os
-from typing import Literal
-
-
-def get_env_var(key: str) -> str | None:
-    return os.environ.get(key)
-
-
-def get_environment() -> Literal["development", "production"]:
-    branch = os.environ.get("CI_COMMIT_REF_NAME", "default")
-    return "production" if branch == "trunk" else "development"
-
-
-def get_version() -> str:
-    return os.environ.get("CI_COMMIT_SHA", "00000000")[:8]
-
-
-def set_product_id(product_id: str) -> None:
-    os.environ["PRODUCT_ID"] = product_id
-
-
-def set_commit_sha(commit_sha: str) -> None:
-    os.environ["CI_COMMIT_SHA"] = commit_sha
-
-
-def set_commit_ref_name(commit_ref_name: str) -> None:
-    os.environ["CI_COMMIT_REF_NAME"] = commit_ref_name