opentf-toolkit-nightly 0.61.0.dev1255__py3-none-any.whl → 0.61.0.dev1267__py3-none-any.whl

opentf/commons/__init__.py

@@ -699,7 +699,7 @@ def annotate_response(
 
 
 def validate_pipeline(
-    workflow: Dict[str, Any]
+    workflow: Dict[str, Any],
 ) -> Tuple[bool, Union[str, List[List[str]]]]:
     """Validate workflow jobs, looking for circular dependencies.
 

opentf/commons/auth.py

@@ -101,7 +101,6 @@ def _read_key_files(items: Iterable[str], context: Dict[str, Any]) -> None:
                 'Error while reading trusted key #%d (%s), skipping:', i, keyfile
             )
             logging.error(err)
-
     if not keys:
         raise ConfigError(
             f'Could not find at least one valid trusted key among {files}, aborting.'

opentf/scripts/startup.py

@@ -56,6 +56,7 @@ ENVIRONMENT_VARIABLES = {
     'HTTPS_PROXY': None,
     'KEY_SIZE': 4096,
     'NO_PROXY': None,
+    'OPENTF_TELEMETRY': None,
     'OPENTF_ALLURE_ENABLED': None,
     'OPENTF_AUTHORIZATION_MODE': None,
     'OPENTF_AUTHORIZATION_POLICY_FILE': None,
@@ -284,6 +285,19 @@ def maybe_start_eventbus(conf: Dict[str, Any]) -> List[Any]:
     return []
 
 
+def maybe_start_otelcol():
+    if (v := _get_env('OPENTF_TELEMETRY')) and v.lower() in ('true', 'yes', 'on', '1'):
+        try:
+            cmd = '"/usr/local/bin/otelcol --config=file:/app/otelcol-config.yaml $OTELCOL_EXTRA_OPTIONS"'
+            logging.info('Starting OpenTelemetry Collector...')
+            pid = subprocess.Popen(f'sh -c {cmd}', shell=True)
+            logging.debug('(pid is %d.)', pid.pid)
+            return [pid]
+        except Exception as err:
+            logging.error('Failed to start OpenTelemetry Collector: %s.', str(err))
+    return []
+
+
 def _wait(what: str, ready, endpoint: str, headers: Optional[Dict[str, str]] = None):
     start = time.monotonic()
     while True:
@@ -621,7 +635,7 @@ def main():
     plugins_idx = len(running)
     logging.info('Starting Plugins...')
     running += start_plugins(conf)
-
+    running += maybe_start_otelcol()
     logging.info('OpenTestFactory Orchestrator Ready.')
     if services_idx:
         logging.info('  Started eventbus.')

opentf/toolkit/channels.py

@@ -51,6 +51,8 @@ PUT_FILE_COMMAND = re.compile(r'^::put file=(.*?)\s*::(.*?)\s*$')
 CHANNEL_REQUEST = -1
 CHANNEL_RELEASE = -2
 CHANNEL_NOTIFY = -3
+CHANNEL_TERMINATE = -4  # kill
+CHANNEL_FORCEKILL = -9  # kill -9
 
 DEFAULT_CHANNEL_LEASE = 60  # how long to keep the offer, in seconds
 
@@ -199,7 +201,7 @@ def _make_attachment_url(
     return url, uuid
 
 
-def _get_cmd_params(args: str, logs: List[str]):
+def _get_cmd_params(args: str, logs: List[str]) -> Union[int, Dict[str, str]]:
     details = {}
     if args:
         for parameter in args.strip().split(','):

{opentf_toolkit_nightly-0.61.0.dev1255.dist-info → opentf_toolkit_nightly-0.61.0.dev1267.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: opentf-toolkit-nightly
-Version: 0.61.0.dev1255
+Version: 0.61.0.dev1267
 Summary: OpenTestFactory Orchestrator Toolkit
 Home-page: https://gitlab.com/henixdevelopment/open-source/opentestfactory/python-toolkit
 Author: Martin Lafaix

{opentf_toolkit_nightly-0.61.0.dev1255.dist-info → opentf_toolkit_nightly-0.61.0.dev1267.dist-info}/RECORD

@@ -1,5 +1,5 @@
-opentf/commons/__init__.py,sha256=xbDeHfYHshJtopyxljdTWw5vUXcUKosU6ILDNcEBZrY,22598
-opentf/commons/auth.py,sha256=bM2Z3kxm2Wku1lKXaRAIg37LHvXWAXIZIqjplDfN2P8,15899
+opentf/commons/__init__.py,sha256=thcqhAp--rYDw-JIBIkgpaLu1kEk3pyPJz8brx7f7vU,22599
+opentf/commons/auth.py,sha256=gXRp_0Tf3bfd65F4QiQmh6C6vR9y3ugag_0DSvozJFk,15898
 opentf/commons/config.py,sha256=_8WzSaeB0yjGRa8mTQ69OASyUSbKZbwNOiKpMp2jFwI,7842
 opentf/commons/exceptions.py,sha256=7dhUXO8iyAbqVwlUKxZhgRzGqVcb7LkG39hFlm-VxIA,2407
 opentf/commons/expressions.py,sha256=jM_YKXVOFhvOE2aE2IuacuvxhIsOYTFs2oQkpcbWR6g,19645
@@ -54,12 +54,12 @@ opentf/schemas/opentestfactory.org/v1beta1/ServiceConfig.json,sha256=m5ZgWAKbutu
 opentf/schemas/opentestfactory.org/v1beta1/Workflow.json,sha256=QZ8mM9PhzsI9gTmwmKTWYNoRn--rtcM3L0PzgnPBfMU,15424
 opentf/schemas/opentestfactory.org/v1beta2/ServiceConfig.json,sha256=rEvK2YWL5lG94_qYgR_GnLWNsaQhaQ-2kuZdWJr5NnY,3517
 opentf/scripts/launch_java_service.sh,sha256=S0jAaCuv2sZy0Gf2NGBuPX-eD531rcM-b0fNyhmzSjw,2423
-opentf/scripts/startup.py,sha256=sggwEpMx7PTaSgYzs-2uCF5YZzpsncMyTlfF_G60CrE,21518
+opentf/scripts/startup.py,sha256=oUPymARagVRCwfvtSf8oDD6zndld-XvDnB8RchdY4e4,22155
 opentf/toolkit/__init__.py,sha256=mYeJPZ92ulbTBItqEsZgF4nnuRh6G19QPY3Jxc92ifc,23028
-opentf/toolkit/channels.py,sha256=h5QLrr4vNLKjt8K524ZcJMqmHhE9kV5lxiW-MN6zMvQ,23622
+opentf/toolkit/channels.py,sha256=EDuX5rk-wdaPLZeirllJqosRnmtz8bA4_eRfH857KZ4,23717
 opentf/toolkit/core.py,sha256=fqnGgaYnuVcd4fyeNIwpc0QtyUo7jsKeVgdkBfY3iqo,9443
-opentf_toolkit_nightly-0.61.0.dev1255.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.61.0.dev1255.dist-info/METADATA,sha256=yUpA1slZ9kThvavnxfPv241MczHv-w86HDrCcUTlqvw,2192
-opentf_toolkit_nightly-0.61.0.dev1255.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-opentf_toolkit_nightly-0.61.0.dev1255.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.61.0.dev1255.dist-info/RECORD,,
+opentf_toolkit_nightly-0.61.0.dev1267.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.61.0.dev1267.dist-info/METADATA,sha256=LUt5khG9-7lPVkcKcRjqTwimJYqaKuZyUMmODMFqEjY,2192
+opentf_toolkit_nightly-0.61.0.dev1267.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+opentf_toolkit_nightly-0.61.0.dev1267.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.61.0.dev1267.dist-info/RECORD,,