fluidattacks-core 4.1.0__py3-none-any.whl → 4.2.1__py3-none-any.whl

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/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/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/logging/sources/utils.py

@@ -1,24 +1,34 @@
 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"]:
+def get_environment() -> str:
+    product_environment = os.environ.get("PRODUCT_ENVIRONMENT")
     branch = os.environ.get("CI_COMMIT_REF_NAME", "default")
-    return "production" if branch == "trunk" else "development"
+    return product_environment or ("production" if branch == "trunk" else "development")
 
 
 def get_version() -> str:
-    return os.environ.get("CI_COMMIT_SHA", "00000000")[:8]
+    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
 

{fluidattacks_core-4.1.0.dist-info → fluidattacks_core-4.2.1.dist-info}/METADATA

@@ -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.dist-info → fluidattacks_core-4.2.1.dist-info}/RECORD

@@ -31,22 +31,22 @@ fluidattacks_core/git/warp.py,sha256=yLotfzBFWSWzM_DzI-hbp4t3hWggKNNGqBr-0mYQhLU
 fluidattacks_core/http/__init__.py,sha256=3Zz90L6e3_z-M-8Bvk_53rv-CFhPThkRGXnxCiQrmaU,60
 fluidattacks_core/http/client.py,sha256=jIhtGU2cKi5GZbxHq8WJOPgnk0beScRtxlz9tBSaKuw,2454
 fluidattacks_core/http/validations.py,sha256=h10Hr906KJqda1rJJb8eOqk1Xyyz81lAJ1glXeae4kM,3766
-fluidattacks_core/logging/__init__.py,sha256=FJZC9xf2twcF45NBHEFBJLIC2t3yhuPDOKffYYj7_dM,1434
+fluidattacks_core/logging/__init__.py,sha256=y6D12LrvrsMwaveQn5C4Em3RyeS6mP6E9fRpq7gqS4o,1546
 fluidattacks_core/logging/filters.py,sha256=v03EWIbCGLKc6sdSQnO7ealxMdPzcJhd20rGr1PBZrE,388
 fluidattacks_core/logging/formatters.py,sha256=SCA4k9XvHJknmkTv63uiCBU31VrWOsgA7llEXYYj1uQ,6063
-fluidattacks_core/logging/handlers.py,sha256=MgUk0ekqq4G_NkbaYu4HQaPIrbWYanTllbF8ydqJBtE,4159
+fluidattacks_core/logging/handlers.py,sha256=7fjCG0AqwlF0PRmH6MwkYRO1qdVoRjyYAAwML3A5lXY,4658
 fluidattacks_core/logging/presets.py,sha256=KU6d6PI61kklJ_o7NgAzU1DahEPM0KwwjTYHo2naHv8,939
 fluidattacks_core/logging/utils.py,sha256=jbAcwr0L6iPsId3dYEp-vAbtFex2UUU2l2iIk1F60BE,1115
-fluidattacks_core/logging/sources/__init__.py,sha256=YktwsPXXjT3GrZm7FlTAsWiLTcEQ0VQZaaFOeqLlpeY,4646
+fluidattacks_core/logging/sources/__init__.py,sha256=lRd6zhhoRuinh27MtQv5j8nzZfk53e4hzz882_AGXic,4891
 fluidattacks_core/logging/sources/types.py,sha256=ial-ASN6e0EV7XeetDknjcMx_HjqL6ilFwzNwqw5YyY,338
-fluidattacks_core/logging/sources/utils.py,sha256=3pI-114FpJQVG0AB72DuhQjVwj0x353a-e3XW0TueE8,681
+fluidattacks_core/logging/sources/utils.py,sha256=tMoEVqrkVtqMuYtjgG6ih0HOjHyN3tn9G7nZhNoo6IU,1102
 fluidattacks_core/sarif/__init__.py,sha256=vZkbzafVeqRPEc_dzq6oevZuNp50NNyNGa_eS0oNXnc,101519
 fluidattacks_core/semver/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fluidattacks_core/semver/match_versions.py,sha256=3L3C0TIVH0AtDpISvk5HHBXFSbJh5V7AINgfKEXYnYI,10157
 fluidattacks_core/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fluidattacks_core/serializers/snippet.py,sha256=e520pZHC-fsNuYVNY30A7TcSugvUlFL6xdr74j5aCDM,12780
 fluidattacks_core/serializers/syntax.py,sha256=DkRsdMyMNrL0pRfsOSVAx79K8F0AmjBk676_d_v7PjM,15908
-fluidattacks_core-4.1.0.dist-info/METADATA,sha256=W6a7aqFf2AFjl0hr7QvnVzg0GHZStBI3J0jIxxKgJS8,3199
-fluidattacks_core-4.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fluidattacks_core-4.1.0.dist-info/top_level.txt,sha256=m49ZyZ2zPQmDBxkSpjb20wr-ZbGVXdOMFBZrDiP5Lb8,18
-fluidattacks_core-4.1.0.dist-info/RECORD,,
+fluidattacks_core-4.2.1.dist-info/METADATA,sha256=0O-UKXy3eSmKQDGSpwrNHdrN2Ozet4W8fxoXDP8Wkrc,3199
+fluidattacks_core-4.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fluidattacks_core-4.2.1.dist-info/top_level.txt,sha256=m49ZyZ2zPQmDBxkSpjb20wr-ZbGVXdOMFBZrDiP5Lb8,18
+fluidattacks_core-4.2.1.dist-info/RECORD,,