conductor-python 1.3.11__py3-none-any.whl → 1.5.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- conductor/client/__init__.py +2 -1
- conductor/client/automator/async_task_runner.py +21 -2
- conductor/client/automator/task_handler.py +71 -13
- conductor/client/automator/task_runner.py +21 -2
- conductor/client/configuration/settings/metrics_settings.py +94 -2
- conductor/client/http/api/workflow_resource_api.py +6 -2
- conductor/client/http/api_client.py +67 -24
- conductor/client/http/async_api_client.py +41 -16
- conductor/client/http/async_rest.py +4 -1
- conductor/client/http/rest.py +36 -25
- conductor/client/orkes/orkes_base_client.py +9 -2
- conductor/client/orkes/orkes_workflow_client.py +48 -5
- conductor/client/orkes_clients.py +14 -3
- conductor/client/telemetry/canonical_metrics_collector.py +242 -0
- conductor/client/telemetry/legacy_metrics_collector.py +324 -0
- conductor/client/telemetry/metrics_collector.py +29 -918
- conductor/client/telemetry/metrics_collector_base.py +504 -0
- conductor/client/telemetry/metrics_factory.py +62 -0
- conductor/client/telemetry/model/metric_documentation.py +12 -1
- conductor/client/telemetry/model/metric_label.py +1 -0
- conductor/client/telemetry/model/metric_name.py +9 -0
- conductor/client/worker/worker.py +120 -1
- conductor/client/workflow/executor/workflow_executor.py +22 -6
- {conductor_python-1.3.11.dist-info → conductor_python-1.5.0.dist-info}/METADATA +42 -9
- {conductor_python-1.3.11.dist-info → conductor_python-1.5.0.dist-info}/RECORD +26 -22
- {conductor_python-1.3.11.dist-info → conductor_python-1.5.0.dist-info}/WHEEL +1 -1
conductor/client/__init__.py
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
from conductor.client.configuration.configuration import Configuration
|
|
4
4
|
from conductor.client.automator.task_handler import TaskHandler
|
|
5
5
|
from conductor.client.automator.task_runner import TaskRunner
|
|
6
|
-
from conductor.client.orkes_clients import OrkesClients
|
|
6
|
+
from conductor.client.orkes_clients import OrkesClients, ConductorClients
|
|
7
7
|
from conductor.client.workflow.conductor_workflow import ConductorWorkflow
|
|
8
8
|
from conductor.client.workflow.executor.workflow_executor import WorkflowExecutor
|
|
9
9
|
from conductor.client.worker.worker_task import worker_task
|
|
@@ -18,6 +18,7 @@ __all__ = [
|
|
|
18
18
|
"TaskHandler",
|
|
19
19
|
"TaskRunner",
|
|
20
20
|
"OrkesClients",
|
|
21
|
+
"ConductorClients",
|
|
21
22
|
"ConductorWorkflow",
|
|
22
23
|
"WorkflowExecutor",
|
|
23
24
|
"worker_task",
|
|
@@ -27,7 +27,7 @@ from conductor.client.http.models.schema_def import SchemaDef, SchemaType
|
|
|
27
27
|
from conductor.client.http.rest import AuthorizationException, ApiException
|
|
28
28
|
from conductor.client.orkes.orkes_metadata_client import OrkesMetadataClient
|
|
29
29
|
from conductor.client.orkes.orkes_schema_client import OrkesSchemaClient
|
|
30
|
-
from conductor.client.telemetry.
|
|
30
|
+
from conductor.client.telemetry.metrics_factory import create_metrics_collector
|
|
31
31
|
from conductor.client.worker.worker_interface import WorkerInterface
|
|
32
32
|
from conductor.client.worker.worker_config import resolve_worker_config, get_worker_config_oneline
|
|
33
33
|
from conductor.client.worker.exception import NonRetryableException
|
|
@@ -88,7 +88,7 @@ class AsyncTaskRunner:
|
|
|
88
88
|
|
|
89
89
|
self.metrics_collector = None
|
|
90
90
|
if metrics_settings is not None:
|
|
91
|
-
self.metrics_collector =
|
|
91
|
+
self.metrics_collector = create_metrics_collector(
|
|
92
92
|
metrics_settings
|
|
93
93
|
)
|
|
94
94
|
# Register metrics collector as event listener
|
|
@@ -863,6 +863,7 @@ class AsyncTaskRunner:
|
|
|
863
863
|
if attempt > 0:
|
|
864
864
|
# Exponential backoff: [10s, 20s, 30s] before retry
|
|
865
865
|
await asyncio.sleep(attempt * 10)
|
|
866
|
+
update_start = time.time()
|
|
866
867
|
try:
|
|
867
868
|
if self._use_update_v2:
|
|
868
869
|
next_task = await self.async_task_client.update_task_v2(body=task_result)
|
|
@@ -873,6 +874,10 @@ class AsyncTaskRunner:
|
|
|
873
874
|
task_definition_name,
|
|
874
875
|
next_task.task_id if next_task else None
|
|
875
876
|
)
|
|
877
|
+
if self.metrics_collector is not None:
|
|
878
|
+
self.metrics_collector.record_task_update_time(
|
|
879
|
+
task_definition_name, time.time() - update_start, status="SUCCESS"
|
|
880
|
+
)
|
|
876
881
|
return next_task
|
|
877
882
|
else:
|
|
878
883
|
await self.async_task_client.update_task(body=task_result)
|
|
@@ -882,6 +887,10 @@ class AsyncTaskRunner:
|
|
|
882
887
|
task_result.workflow_instance_id,
|
|
883
888
|
task_definition_name,
|
|
884
889
|
)
|
|
890
|
+
if self.metrics_collector is not None:
|
|
891
|
+
self.metrics_collector.record_task_update_time(
|
|
892
|
+
task_definition_name, time.time() - update_start, status="SUCCESS"
|
|
893
|
+
)
|
|
885
894
|
return None
|
|
886
895
|
except ApiException as e:
|
|
887
896
|
if e.status in (404, 405) and self._use_update_v2:
|
|
@@ -895,12 +904,19 @@ class AsyncTaskRunner:
|
|
|
895
904
|
# Retry immediately with v1
|
|
896
905
|
try:
|
|
897
906
|
await self.async_task_client.update_task(body=task_result)
|
|
907
|
+
if self.metrics_collector is not None:
|
|
908
|
+
self.metrics_collector.record_task_update_time(
|
|
909
|
+
task_definition_name, time.time() - update_start, status="SUCCESS"
|
|
910
|
+
)
|
|
898
911
|
return None
|
|
899
912
|
except Exception as fallback_e:
|
|
900
913
|
last_exception = fallback_e
|
|
901
914
|
continue
|
|
902
915
|
last_exception = e
|
|
903
916
|
if self.metrics_collector is not None:
|
|
917
|
+
self.metrics_collector.record_task_update_time(
|
|
918
|
+
task_definition_name, time.time() - update_start, status="FAILURE"
|
|
919
|
+
)
|
|
904
920
|
self.metrics_collector.increment_task_update_error(
|
|
905
921
|
task_definition_name, type(e)
|
|
906
922
|
)
|
|
@@ -917,6 +933,9 @@ class AsyncTaskRunner:
|
|
|
917
933
|
except Exception as e:
|
|
918
934
|
last_exception = e
|
|
919
935
|
if self.metrics_collector is not None:
|
|
936
|
+
self.metrics_collector.record_task_update_time(
|
|
937
|
+
task_definition_name, time.time() - update_start, status="FAILURE"
|
|
938
|
+
)
|
|
920
939
|
self.metrics_collector.increment_task_update_error(
|
|
921
940
|
task_definition_name, type(e)
|
|
922
941
|
)
|
|
@@ -4,10 +4,11 @@ import importlib
|
|
|
4
4
|
import inspect
|
|
5
5
|
import logging
|
|
6
6
|
import os
|
|
7
|
+
import pickle
|
|
7
8
|
import signal
|
|
8
9
|
import threading
|
|
9
10
|
import time
|
|
10
|
-
from multiprocessing import Process, freeze_support, Queue, set_start_method
|
|
11
|
+
from multiprocessing import Process, freeze_support, Queue, set_start_method, get_start_method
|
|
11
12
|
from sys import platform
|
|
12
13
|
from typing import List, Optional, Any, Dict
|
|
13
14
|
|
|
@@ -18,7 +19,7 @@ from conductor.client.configuration.settings.metrics_settings import MetricsSett
|
|
|
18
19
|
from conductor.client.event.task_runner_events import TaskRunnerEvent
|
|
19
20
|
from conductor.client.event.sync_event_dispatcher import SyncEventDispatcher
|
|
20
21
|
from conductor.client.event.sync_listener_register import register_task_runner_listener
|
|
21
|
-
from conductor.client.telemetry.
|
|
22
|
+
from conductor.client.telemetry.metrics_collector_base import MetricsCollectorBase
|
|
22
23
|
from conductor.client.telemetry.model.metric_documentation import MetricDocumentation
|
|
23
24
|
from conductor.client.telemetry.model.metric_label import MetricLabel
|
|
24
25
|
from conductor.client.telemetry.model.metric_name import MetricName
|
|
@@ -33,13 +34,37 @@ logger = logging.getLogger(
|
|
|
33
34
|
)
|
|
34
35
|
|
|
35
36
|
_decorated_functions = {}
|
|
37
|
+
_VALID_MP_START_METHODS = {"spawn", "fork", "forkserver"}
|
|
36
38
|
_mp_fork_set = False
|
|
37
39
|
if not _mp_fork_set:
|
|
38
40
|
try:
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
# Default start method: "spawn" on every platform.
|
|
42
|
+
#
|
|
43
|
+
# fork() is fundamentally unsafe in a process that holds native
|
|
44
|
+
# framework state or non-main threads:
|
|
45
|
+
# - macOS: Apple frameworks (CFNetwork, Security, libdispatch) may
|
|
46
|
+
# SIGSEGV in forked children, producing silently-restarting worker
|
|
47
|
+
# processes with exitcode=-11. CPython switched its own macOS
|
|
48
|
+
# default to spawn in 3.8 for the same reason (bpo-33725).
|
|
49
|
+
# - all POSIX: forking while another thread holds a lock (e.g. the
|
|
50
|
+
# prometheus_client module-level lock, or the TaskHandler monitor
|
|
51
|
+
# thread restarting a worker) leaves that lock permanently held in
|
|
52
|
+
# the child -> silent deadlock.
|
|
53
|
+
# Workers (including the @worker_task decorator path) are pickle-safe,
|
|
54
|
+
# so spawn works everywhere. Deployments that rely on fork's
|
|
55
|
+
# copy-on-write inheritance can opt back in with
|
|
56
|
+
# CONDUCTOR_MP_START_METHOD=fork (re-exposing the hazards above).
|
|
57
|
+
# NOTE: spawn requires the standard `if __name__ == "__main__":` guard
|
|
58
|
+
# in the entrypoint script.
|
|
59
|
+
_default_method = "spawn"
|
|
60
|
+
_method = os.environ.get("CONDUCTOR_MP_START_METHOD", "").strip().lower() or _default_method
|
|
61
|
+
if _method not in _VALID_MP_START_METHODS:
|
|
62
|
+
logger.warning(
|
|
63
|
+
"Ignoring invalid CONDUCTOR_MP_START_METHOD=%r; falling back to %r",
|
|
64
|
+
_method, _default_method,
|
|
65
|
+
)
|
|
66
|
+
_method = _default_method
|
|
67
|
+
set_start_method(_method)
|
|
43
68
|
_mp_fork_set = True
|
|
44
69
|
except Exception as e:
|
|
45
70
|
logger.info("error when setting multiprocessing.set_start_method - maybe the context is set %s", e.args)
|
|
@@ -221,11 +246,11 @@ class TaskHandler:
|
|
|
221
246
|
self._configuration = configuration
|
|
222
247
|
self._metrics_settings = metrics_settings
|
|
223
248
|
|
|
224
|
-
# Set
|
|
225
|
-
#
|
|
249
|
+
# Set PROMETHEUS_MULTIPROC_DIR BEFORE any worker processes start.
|
|
250
|
+
# MetricsSettings resolves the subdirectory eagerly at construction.
|
|
226
251
|
if metrics_settings is not None:
|
|
227
|
-
os.environ["PROMETHEUS_MULTIPROC_DIR"] = metrics_settings.
|
|
228
|
-
logger.info(f"Set PROMETHEUS_MULTIPROC_DIR={metrics_settings.
|
|
252
|
+
os.environ["PROMETHEUS_MULTIPROC_DIR"] = metrics_settings.metrics_directory
|
|
253
|
+
logger.info(f"Set PROMETHEUS_MULTIPROC_DIR={metrics_settings.metrics_directory}")
|
|
229
254
|
|
|
230
255
|
# Store event listeners to pass to each worker process
|
|
231
256
|
self.event_listeners = event_listeners or []
|
|
@@ -330,8 +355,26 @@ class TaskHandler:
|
|
|
330
355
|
logger.info("Starting worker processes...")
|
|
331
356
|
freeze_support()
|
|
332
357
|
self._monitor_stop_event.clear()
|
|
333
|
-
|
|
334
|
-
|
|
358
|
+
try:
|
|
359
|
+
self.__start_task_runner_processes()
|
|
360
|
+
self.__start_metrics_provider_process()
|
|
361
|
+
except (TypeError, pickle.PicklingError, AttributeError) as e:
|
|
362
|
+
# Under the 'spawn'/'forkserver' start methods, Process arguments
|
|
363
|
+
# are pickled at start(); unpicklable state fails here. Clean up
|
|
364
|
+
# everything already started - otherwise the non-daemon logger
|
|
365
|
+
# subprocess keeps the interpreter alive forever after the
|
|
366
|
+
# exception (observed as a hang after "cannot pickle
|
|
367
|
+
# '_thread.lock' object").
|
|
368
|
+
logger.error(
|
|
369
|
+
"Failed to start worker processes with start method %r: %s. "
|
|
370
|
+
"Workers must be defined at module level (not nested inside "
|
|
371
|
+
"functions), and configuration, metrics_settings and "
|
|
372
|
+
"event_listeners must be picklable. "
|
|
373
|
+
"See https://github.com/conductor-oss/conductor-python/issues/264",
|
|
374
|
+
get_start_method(allow_none=True), e,
|
|
375
|
+
)
|
|
376
|
+
self.stop_processes()
|
|
377
|
+
raise
|
|
335
378
|
self.__start_monitor_thread()
|
|
336
379
|
logger.info("Started all processes")
|
|
337
380
|
|
|
@@ -345,7 +388,7 @@ class TaskHandler:
|
|
|
345
388
|
self.metrics_provider_process = None
|
|
346
389
|
return
|
|
347
390
|
self.metrics_provider_process = Process(
|
|
348
|
-
target=
|
|
391
|
+
target=MetricsCollectorBase.provide_metrics,
|
|
349
392
|
args=(metrics_settings,)
|
|
350
393
|
)
|
|
351
394
|
logger.info("Created MetricsProvider process")
|
|
@@ -434,6 +477,21 @@ class TaskHandler:
|
|
|
434
477
|
worker = self.workers[i] if i < len(self.workers) else None
|
|
435
478
|
worker_name = worker.get_task_definition_name() if worker is not None else f"worker[{i}]"
|
|
436
479
|
logger.warning("Worker process exited (worker=%s, pid=%s, exitcode=%s)", worker_name, process.pid, exitcode)
|
|
480
|
+
if exitcode < 0:
|
|
481
|
+
# Negative exitcode == killed by signal (e.g. -11 is
|
|
482
|
+
# SIGSEGV). Under the 'fork' start method this is the
|
|
483
|
+
# classic symptom of fork-unsafe native libraries in the
|
|
484
|
+
# parent (Apple frameworks on macOS, numpy/Accelerate,
|
|
485
|
+
# grpc, ...).
|
|
486
|
+
logger.warning(
|
|
487
|
+
"Worker process %s was killed by signal %s. If this "
|
|
488
|
+
"repeats on every restart, the process is likely "
|
|
489
|
+
"crashing at startup: use the 'spawn' start method "
|
|
490
|
+
"(CONDUCTOR_MP_START_METHOD=spawn, the default) and "
|
|
491
|
+
"set PYTHONFAULTHANDLER=1 to capture the crashing "
|
|
492
|
+
"stack trace.",
|
|
493
|
+
worker_name, -exitcode,
|
|
494
|
+
)
|
|
437
495
|
if not self.restart_on_failure:
|
|
438
496
|
continue
|
|
439
497
|
self.__restart_worker_process(i)
|
|
@@ -30,7 +30,7 @@ from conductor.client.http.models.schema_def import SchemaDef, SchemaType
|
|
|
30
30
|
from conductor.client.http.rest import AuthorizationException, ApiException
|
|
31
31
|
from conductor.client.orkes.orkes_metadata_client import OrkesMetadataClient
|
|
32
32
|
from conductor.client.orkes.orkes_schema_client import OrkesSchemaClient
|
|
33
|
-
from conductor.client.telemetry.
|
|
33
|
+
from conductor.client.telemetry.metrics_factory import create_metrics_collector
|
|
34
34
|
from conductor.client.worker.worker import ASYNC_TASK_RUNNING
|
|
35
35
|
from conductor.client.worker.worker_interface import WorkerInterface
|
|
36
36
|
from conductor.client.worker.worker_config import resolve_worker_config, get_worker_config_oneline
|
|
@@ -69,7 +69,7 @@ class TaskRunner:
|
|
|
69
69
|
|
|
70
70
|
self.metrics_collector = None
|
|
71
71
|
if metrics_settings is not None:
|
|
72
|
-
self.metrics_collector =
|
|
72
|
+
self.metrics_collector = create_metrics_collector(
|
|
73
73
|
metrics_settings
|
|
74
74
|
)
|
|
75
75
|
# Register metrics collector as event listener
|
|
@@ -972,6 +972,7 @@ class TaskRunner:
|
|
|
972
972
|
if attempt > 0:
|
|
973
973
|
# Exponential backoff: [10s, 20s, 30s] before retry
|
|
974
974
|
time.sleep(attempt * 10)
|
|
975
|
+
update_start = time.time()
|
|
975
976
|
try:
|
|
976
977
|
if self._use_update_v2:
|
|
977
978
|
next_task = self.task_client.update_task_v2(body=task_result)
|
|
@@ -982,6 +983,10 @@ class TaskRunner:
|
|
|
982
983
|
task_definition_name,
|
|
983
984
|
next_task.task_id if next_task else None
|
|
984
985
|
)
|
|
986
|
+
if self.metrics_collector is not None:
|
|
987
|
+
self.metrics_collector.record_task_update_time(
|
|
988
|
+
task_definition_name, time.time() - update_start, status="SUCCESS"
|
|
989
|
+
)
|
|
985
990
|
return next_task
|
|
986
991
|
else:
|
|
987
992
|
self.task_client.update_task(body=task_result)
|
|
@@ -991,6 +996,10 @@ class TaskRunner:
|
|
|
991
996
|
task_result.workflow_instance_id,
|
|
992
997
|
task_definition_name,
|
|
993
998
|
)
|
|
999
|
+
if self.metrics_collector is not None:
|
|
1000
|
+
self.metrics_collector.record_task_update_time(
|
|
1001
|
+
task_definition_name, time.time() - update_start, status="SUCCESS"
|
|
1002
|
+
)
|
|
994
1003
|
return None
|
|
995
1004
|
except ApiException as e:
|
|
996
1005
|
if e.status in (404, 405) and self._use_update_v2:
|
|
@@ -1004,12 +1013,19 @@ class TaskRunner:
|
|
|
1004
1013
|
# Retry immediately with v1
|
|
1005
1014
|
try:
|
|
1006
1015
|
self.task_client.update_task(body=task_result)
|
|
1016
|
+
if self.metrics_collector is not None:
|
|
1017
|
+
self.metrics_collector.record_task_update_time(
|
|
1018
|
+
task_definition_name, time.time() - update_start, status="SUCCESS"
|
|
1019
|
+
)
|
|
1007
1020
|
return None
|
|
1008
1021
|
except Exception as fallback_e:
|
|
1009
1022
|
last_exception = fallback_e
|
|
1010
1023
|
continue
|
|
1011
1024
|
last_exception = e
|
|
1012
1025
|
if self.metrics_collector is not None:
|
|
1026
|
+
self.metrics_collector.record_task_update_time(
|
|
1027
|
+
task_definition_name, time.time() - update_start, status="FAILURE"
|
|
1028
|
+
)
|
|
1013
1029
|
self.metrics_collector.increment_task_update_error(
|
|
1014
1030
|
task_definition_name, type(e)
|
|
1015
1031
|
)
|
|
@@ -1044,6 +1060,9 @@ class TaskRunner:
|
|
|
1044
1060
|
except Exception as e:
|
|
1045
1061
|
last_exception = e
|
|
1046
1062
|
if self.metrics_collector is not None:
|
|
1063
|
+
self.metrics_collector.record_task_update_time(
|
|
1064
|
+
task_definition_name, time.time() - update_start, status="FAILURE"
|
|
1065
|
+
)
|
|
1047
1066
|
self.metrics_collector.increment_task_update_error(
|
|
1048
1067
|
task_definition_name, type(e)
|
|
1049
1068
|
)
|
|
@@ -14,6 +14,16 @@ logger = logging.getLogger(
|
|
|
14
14
|
)
|
|
15
15
|
|
|
16
16
|
|
|
17
|
+
CANONICAL_SUBDIR = "canonical"
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
def _env_bool(name: str, default: bool) -> bool:
|
|
21
|
+
value = os.environ.get(name, "")
|
|
22
|
+
if not value:
|
|
23
|
+
return default
|
|
24
|
+
return value.strip().lower() in ("true", "1", "yes")
|
|
25
|
+
|
|
26
|
+
|
|
17
27
|
def get_default_temporary_folder() -> str:
|
|
18
28
|
return f"{Path.home()!s}/tmp/"
|
|
19
29
|
|
|
@@ -24,12 +34,23 @@ class MetricsSettings:
|
|
|
24
34
|
directory: Optional[str] = None,
|
|
25
35
|
file_name: str = "metrics.log",
|
|
26
36
|
update_interval: float = 0.1,
|
|
27
|
-
http_port: Optional[int] = None
|
|
37
|
+
http_port: Optional[int] = None,
|
|
38
|
+
clean_directory: bool = False,
|
|
39
|
+
clean_dead_pids: bool = False):
|
|
28
40
|
"""
|
|
29
41
|
Configure metrics collection settings.
|
|
30
42
|
|
|
43
|
+
The ``WORKER_CANONICAL_METRICS`` env var is read at construction time
|
|
44
|
+
to decide whether ``.db`` files go in *directory* (legacy) or in a
|
|
45
|
+
``canonical/`` subdirectory (canonical mode). Set the env var before
|
|
46
|
+
creating this object.
|
|
47
|
+
|
|
31
48
|
Args:
|
|
32
|
-
directory:
|
|
49
|
+
directory: Base directory for storing multiprocess metrics .db files.
|
|
50
|
+
Legacy metrics use this directory directly (unchanged from
|
|
51
|
+
prior releases). Canonical metrics use a ``canonical/``
|
|
52
|
+
subdirectory so that switching implementations never
|
|
53
|
+
produces stale metric names.
|
|
33
54
|
file_name: Name of the metrics output file (only used when http_port is None)
|
|
34
55
|
update_interval: How often to update metrics (in seconds)
|
|
35
56
|
http_port: Optional HTTP port to expose metrics endpoint for Prometheus scraping.
|
|
@@ -40,6 +61,13 @@ class MetricsSettings:
|
|
|
40
61
|
If None:
|
|
41
62
|
- Metrics will be written to file at {directory}/{file_name}
|
|
42
63
|
- No HTTP server will be started
|
|
64
|
+
clean_directory: If True, remove all prometheus_client .db files from
|
|
65
|
+
the metrics directory when the collector is created. Only
|
|
66
|
+
safe when no other live process shares the same directory.
|
|
67
|
+
Defaults to False.
|
|
68
|
+
clean_dead_pids: If True, remove .db files whose owning PID no
|
|
69
|
+
longer exists. Safer than ``clean_directory`` in shared
|
|
70
|
+
environments. Defaults to False.
|
|
43
71
|
"""
|
|
44
72
|
if directory is None:
|
|
45
73
|
directory = get_default_temporary_folder()
|
|
@@ -47,6 +75,30 @@ class MetricsSettings:
|
|
|
47
75
|
self.file_name = file_name
|
|
48
76
|
self.update_interval = update_interval
|
|
49
77
|
self.http_port = http_port
|
|
78
|
+
self.clean_directory = clean_directory
|
|
79
|
+
self.clean_dead_pids = clean_dead_pids
|
|
80
|
+
self._subdir: str = (
|
|
81
|
+
CANONICAL_SUBDIR
|
|
82
|
+
if _env_bool("WORKER_CANONICAL_METRICS", False)
|
|
83
|
+
else ""
|
|
84
|
+
)
|
|
85
|
+
|
|
86
|
+
@property
|
|
87
|
+
def is_canonical(self) -> bool:
|
|
88
|
+
return self._subdir == CANONICAL_SUBDIR
|
|
89
|
+
|
|
90
|
+
@property
|
|
91
|
+
def metrics_directory(self) -> str:
|
|
92
|
+
"""Full path where .db files live (base directory + optional subdir).
|
|
93
|
+
|
|
94
|
+
Legacy leaves the subdirectory empty (base directory unchanged from
|
|
95
|
+
prior releases); canonical sets it to ``"canonical"`` to avoid stale
|
|
96
|
+
metric-name collisions. Resolved eagerly at construction time from
|
|
97
|
+
the ``WORKER_CANONICAL_METRICS`` env var.
|
|
98
|
+
"""
|
|
99
|
+
if self._subdir:
|
|
100
|
+
return os.path.join(self.directory, self._subdir)
|
|
101
|
+
return self.directory
|
|
50
102
|
|
|
51
103
|
def __set_dir(self, dir: str) -> None:
|
|
52
104
|
if not os.path.isdir(dir):
|
|
@@ -57,3 +109,43 @@ class MetricsSettings:
|
|
|
57
109
|
"Failed to create metrics temporary folder, reason: %s", e)
|
|
58
110
|
|
|
59
111
|
self.directory = dir
|
|
112
|
+
|
|
113
|
+
def _clean_stale_db_files(self) -> None:
|
|
114
|
+
"""Remove all prometheus_client multiprocess .db files."""
|
|
115
|
+
import glob
|
|
116
|
+
pattern = os.path.join(self.metrics_directory, "*.db")
|
|
117
|
+
for path in glob.glob(pattern):
|
|
118
|
+
try:
|
|
119
|
+
os.remove(path)
|
|
120
|
+
except Exception as e:
|
|
121
|
+
logger.debug("Could not remove stale metrics db file %s: %s", path, e)
|
|
122
|
+
|
|
123
|
+
def _clean_dead_pid_files(self) -> None:
|
|
124
|
+
"""Remove .db files whose owning PID no longer exists."""
|
|
125
|
+
import glob
|
|
126
|
+
import re
|
|
127
|
+
pattern = os.path.join(self.metrics_directory, "*.db")
|
|
128
|
+
for path in glob.glob(pattern):
|
|
129
|
+
match = re.search(r'_(\d+)\.db$', os.path.basename(path))
|
|
130
|
+
if not match:
|
|
131
|
+
continue
|
|
132
|
+
pid = int(match.group(1))
|
|
133
|
+
try:
|
|
134
|
+
os.kill(pid, 0)
|
|
135
|
+
except ProcessLookupError:
|
|
136
|
+
# ESRCH: no process owns this PID -> safe to remove its db file.
|
|
137
|
+
try:
|
|
138
|
+
os.remove(path)
|
|
139
|
+
logger.debug("Removed dead-pid metrics file %s (pid %d)", path, pid)
|
|
140
|
+
except OSError as e:
|
|
141
|
+
logger.debug("Could not remove dead-pid metrics db file %s: %s", path, e)
|
|
142
|
+
except OSError as e:
|
|
143
|
+
# Any non-ESRCH probe failure (commonly EPERM: the process is
|
|
144
|
+
# alive but owned by another user) -> keep the file; deleting it
|
|
145
|
+
# could corrupt a live worker's metrics in a shared directory.
|
|
146
|
+
logger.debug(
|
|
147
|
+
"Keeping metrics db file %s; pid %d probe returned a "
|
|
148
|
+
"non-ProcessLookupError OSError (process likely alive): %s",
|
|
149
|
+
path, pid, e,
|
|
150
|
+
)
|
|
151
|
+
continue
|
|
@@ -2329,6 +2329,7 @@ class WorkflowResourceApi(object):
|
|
|
2329
2329
|
all_params.append('_return_http_data_only')
|
|
2330
2330
|
all_params.append('_preload_content')
|
|
2331
2331
|
all_params.append('_request_timeout')
|
|
2332
|
+
all_params.append('metric_context')
|
|
2332
2333
|
|
|
2333
2334
|
params = locals()
|
|
2334
2335
|
for key, val in six.iteritems(params['kwargs']):
|
|
@@ -2383,7 +2384,8 @@ class WorkflowResourceApi(object):
|
|
|
2383
2384
|
_return_http_data_only=params.get('_return_http_data_only'),
|
|
2384
2385
|
_preload_content=params.get('_preload_content', True),
|
|
2385
2386
|
_request_timeout=params.get('_request_timeout'),
|
|
2386
|
-
collection_formats=collection_formats
|
|
2387
|
+
collection_formats=collection_formats,
|
|
2388
|
+
metric_context=params.get('metric_context'))
|
|
2387
2389
|
|
|
2388
2390
|
def start_workflow1(self, body, name, **kwargs): # noqa: E501
|
|
2389
2391
|
"""Start a new workflow. Returns the ID of the workflow instance that can be later used for tracking # noqa: E501
|
|
@@ -2434,6 +2436,7 @@ class WorkflowResourceApi(object):
|
|
|
2434
2436
|
all_params.append('_return_http_data_only')
|
|
2435
2437
|
all_params.append('_preload_content')
|
|
2436
2438
|
all_params.append('_request_timeout')
|
|
2439
|
+
all_params.append('metric_context')
|
|
2437
2440
|
|
|
2438
2441
|
params = locals()
|
|
2439
2442
|
for key, val in six.iteritems(params['kwargs']):
|
|
@@ -2500,7 +2503,8 @@ class WorkflowResourceApi(object):
|
|
|
2500
2503
|
_return_http_data_only=params.get('_return_http_data_only'),
|
|
2501
2504
|
_preload_content=params.get('_preload_content', True),
|
|
2502
2505
|
_request_timeout=params.get('_request_timeout'),
|
|
2503
|
-
collection_formats=collection_formats
|
|
2506
|
+
collection_formats=collection_formats,
|
|
2507
|
+
metric_context=params.get('metric_context'))
|
|
2504
2508
|
|
|
2505
2509
|
def terminate1(self, workflow_id, **kwargs): # noqa: E501
|
|
2506
2510
|
"""
|