UncountablePythonSDK 0.0.81__py3-none-any.whl → 0.0.83__py3-none-any.whl

{UncountablePythonSDK-0.0.81.dist-info → UncountablePythonSDK-0.0.83.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.81
+Version: 0.0.83
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git

{UncountablePythonSDK-0.0.81.dist-info → UncountablePythonSDK-0.0.83.dist-info}/RECORD

@@ -92,7 +92,7 @@ uncountable/integration/cron.py,sha256=6eH-kIs3sdYPCyb62_L2M7U_uQTdMTdwY5hreEJb0
 uncountable/integration/entrypoint.py,sha256=BHOYPQgKvZE6HG8Rv15MkdYl8lRkvfDgv1OdLo0oQ9Q,433
 uncountable/integration/job.py,sha256=af197JUceIKzpIN5C2z8zeZOPhIQ16ipyC6qVt1WXv0,2386
 uncountable/integration/scan_profiles.py,sha256=760zbv7O7wXxHUHqUkFBpd1Afe8hqxMPU3ugwZGdhEo,2925
-uncountable/integration/scheduler.py,sha256=UdcRXIxoq6CFON3uokyK5yzsKsvGxo7LmIRJ3XJIvBk,4499
+uncountable/integration/scheduler.py,sha256=Q8N3QqsiS2Y48uj13Dmb027SmsMG4htrGWjiUKVFmh4,4784
 uncountable/integration/server.py,sha256=Hwi3fpdhcSK2HynI6Zwi7A3mWTTCaK_ic53M5-4IEp4,4716
 uncountable/integration/telemetry.py,sha256=bX68_a2PyG23n1QtIFxcH30JynUoovMz6HgA_jgUb1A,7132
 uncountable/integration/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -106,7 +106,7 @@ uncountable/integration/queue_runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 uncountable/integration/queue_runner/job_scheduler.py,sha256=lhvcl11jyk_wg9BSc1Xyh5u8iEtsdqQFW83FPLupjQI,6189
 uncountable/integration/queue_runner/queue_runner.py,sha256=0BmYu5zHdothTevGsB-nXg6MBd1UD-WkP3h1WCKMdQg,710
 uncountable/integration/queue_runner/types.py,sha256=8qTq29BTSa5rmW6CBlBntP0pNIiDcwu1wHa78pjroS0,219
-uncountable/integration/queue_runner/worker.py,sha256=EMDtdObowaq0aHndH1bBmlSIOih0jF3Gcn7Yl6NNeOM,4265
+uncountable/integration/queue_runner/worker.py,sha256=WRh_EeGyCPr72v4QL17m6Iu-ipB3T0mhc7nulILf59E,4535
 uncountable/integration/queue_runner/command_server/__init__.py,sha256=gQPVILGpWzCr2i5GJyoqna7AOSFvtn4tav69gB78mTQ,571
 uncountable/integration/queue_runner/command_server/command_client.py,sha256=DJb0TUVFkiiLBEQzHSN94sTRnuEbutNEgdN39XmnOXI,2046
 uncountable/integration/queue_runner/command_server/command_server.py,sha256=yyXryhiEC2eGS0yFElLGsVzSKwOuYvj-zp22jQorkv0,2138
@@ -286,7 +286,7 @@ uncountable/types/api/triggers/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr
 uncountable/types/api/triggers/run_trigger.py,sha256=-oZgPyn43xEKSCs81DVNzwaYMCdRJxbM9GY6fsqKwf4,1090
 uncountable/types/api/uploader/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
 uncountable/types/api/uploader/invoke_uploader.py,sha256=6mwVG136oLp9JcbB2I-kZnrcm3aeZzYZB-SFjEImY2o,1314
-UncountablePythonSDK-0.0.81.dist-info/METADATA,sha256=hfFny-tLIUG0nrKcCY0eAxGDFgo-Q7wUXyqSczrBKpU,2051
-UncountablePythonSDK-0.0.81.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-UncountablePythonSDK-0.0.81.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
-UncountablePythonSDK-0.0.81.dist-info/RECORD,,
+UncountablePythonSDK-0.0.83.dist-info/METADATA,sha256=ZyKbekQPHy3xFv8qqoVkAB5XWGyi8pX8XD15NY1GjIc,2051
+UncountablePythonSDK-0.0.83.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+UncountablePythonSDK-0.0.83.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
+UncountablePythonSDK-0.0.83.dist-info/RECORD,,

uncountable/integration/queue_runner/worker.py

@@ -2,6 +2,8 @@ import asyncio
 from concurrent.futures import ProcessPoolExecutor
 from dataclasses import dataclass
 
+from opentelemetry.trace import get_current_span
+
 from uncountable.core.async_batch import AsyncBatchProcessor
 from uncountable.integration.construct_client import construct_uncountable_client
 from uncountable.integration.executors.executors import execute_job
@@ -9,7 +11,7 @@ from uncountable.integration.job import JobArguments
 from uncountable.integration.queue_runner.datastore.interface import Datastore
 from uncountable.integration.queue_runner.types import ListenQueue, ResultQueue
 from uncountable.integration.scan_profiles import load_profiles
-from uncountable.integration.telemetry import JobLogger, get_otel_tracer
+from uncountable.integration.telemetry import JobLogger, Logger, get_otel_tracer
 from uncountable.types import base_t, job_definition_t, queued_job_t
 
 
@@ -28,19 +30,24 @@ class Worker:
         self.datastore = datastore
 
     async def run_worker_loop(self) -> None:
+        logger = Logger(get_current_span())
         while True:
-            queued_job = await self.listen_queue.get()
-            self.datastore.increment_num_attempts(queued_job.queued_job_uuid)
-            loop = asyncio.get_event_loop()
-            result = await loop.run_in_executor(
-                self.process_pool, run_queued_job, queued_job
-            )
-            assert isinstance(result, job_definition_t.JobResult)
-            await self.result_queue.put(
-                queued_job_t.QueuedJobResult(
-                    job_result=result, queued_job_uuid=queued_job.queued_job_uuid
+            try:
+                queued_job = await self.listen_queue.get()
+                self.datastore.increment_num_attempts(queued_job.queued_job_uuid)
+                loop = asyncio.get_event_loop()
+                result = await loop.run_in_executor(
+                    self.process_pool, run_queued_job, queued_job
                 )
-            )
+                assert isinstance(result, job_definition_t.JobResult)
+                await self.result_queue.put(
+                    queued_job_t.QueuedJobResult(
+                        job_result=result, queued_job_uuid=queued_job.queued_job_uuid
+                    )
+                )
+            except BaseException as e:
+                logger.log_exception(e)
+                raise e
 
 
 @dataclass(kw_only=True)

uncountable/integration/scheduler.py

@@ -36,6 +36,14 @@ class ProcessInfo:
     def pid(self) -> int | None:
         return self.process.pid
 
+    @property
+    def exitcode(self) -> int | None:
+        match self.process:
+            case multiprocessing.Process():
+                return self.process.exitcode
+            case subprocess.Popen():
+                return self.process.poll()
+
 
 def handle_shutdown(logger: Logger, processes: list[ProcessInfo]) -> None:
     logger.log_info("received shutdown command, shutting down sub-processes")
@@ -77,7 +85,7 @@ def check_process_alive(logger: Logger, processes: list[ProcessInfo]) -> None:
     for proc_info in processes:
         if not proc_info.is_alive:
             logger.log_error(
-                f"process {proc_info.name} shut down unexpectedly! shutting down scheduler"
+                f"process {proc_info.name} shut down unexpectedly! shutting down scheduler; exit code is {proc_info.exitcode}"
             )
             handle_shutdown(logger, processes)
             sys.exit(1)