omnata-plugin-runtime 0.8.0a189__py3-none-any.whl → 0.8.0a191__py3-none-any.whl

omnata_plugin_runtime/plugin_entrypoints.py

@@ -84,6 +84,7 @@ class PluginEntrypoint:
         
 
     def sync(self, sync_request: Dict):
+        request = TypeAdapter(SyncRequestPayload).validate_python(sync_request)
         logger.add_extra('omnata.operation', 'sync')
         logger.add_extra('omnata.sync.id', request.sync_id)
         logger.add_extra('omnata.sync.direction', request.sync_direction)
@@ -95,7 +96,6 @@ class PluginEntrypoint:
         with tracer.start_as_current_span("initialization") as span:
             span.add_event("Fetching secrets")
 
-            request = TypeAdapter(SyncRequestPayload).validate_python(sync_request)
             connection_secrets = get_secrets(
                 request.oauth_secret_name, request.other_secrets_name
             )

omnata_plugin_runtime/rate_limiting.py

@@ -19,6 +19,9 @@ from .logging import logger
 import pytz
 from requests.adapters import HTTPAdapter
 from urllib3.util.retry import Retry
+from opentelemetry import trace
+
+tracer = trace.get_tracer(__name__)
 
 TimeUnitType = Literal["second", "minute", "hour", "day"]
 
@@ -383,11 +386,12 @@ class RetryWithLogging(Retry):
         retry_after = self.get_retry_after(response)
         if retry_after:
             logger.info(f"Retrying after {retry_after} seconds due to Retry-After header")
-            if self.thread_cancellation_token is None:
-                time.sleep(retry_after)
-            else:
-                if self.thread_cancellation_token.wait(retry_after):
-                    raise InterruptedWhileWaitingException(message="The sync was interrupted while waiting for rate limiting to expire")
+            with tracer.start_as_current_span("http_retry_wait"):
+                if self.thread_cancellation_token is None:
+                    time.sleep(retry_after)
+                else:
+                    if self.thread_cancellation_token.wait(retry_after):
+                        raise InterruptedWhileWaitingException(message="The sync was interrupted while waiting for rate limiting to expire")
             return True
         return False
 
@@ -504,8 +508,9 @@ class RateLimitedSession(requests.Session):
                         raise InterruptedWhileWaitingException(message=f"The rate limiting wait time ({wait_time} seconds) would exceed the run deadline")
                     logger.info(f"Waiting for {wait_time} seconds before retrying {method} request to {url}")
                     # if wait() returns true, it means that the thread was cancelled
-                    if self.thread_cancellation_token.wait(wait_time):
-                        raise InterruptedWhileWaitingException(message="The sync was interrupted while waiting for rate limiting to expire")
+                    with tracer.start_as_current_span("http_retry_wait"):
+                        if self.thread_cancellation_token.wait(wait_time):
+                            raise InterruptedWhileWaitingException(message="The sync was interrupted while waiting for rate limiting to expire")
                 else:
                     current_url_retries = self.increment_retries(url)
                     if current_url_retries >= self.max_retries:
@@ -514,8 +519,9 @@ class RateLimitedSession(requests.Session):
                     if datetime.datetime.now(pytz.UTC) + datetime.timedelta(seconds=backoff_time) > self.run_deadline:
                         raise InterruptedWhileWaitingException(message=f"The rate limiting backoff time ({backoff_time} seconds) would exceed the run deadline")
                     logger.info(f"Waiting for {backoff_time} seconds before retrying {method} request to {url}")
-                    if self.thread_cancellation_token.wait(backoff_time):
-                        raise InterruptedWhileWaitingException(message="The sync was interrupted while waiting for rate limiting backoff")
+                    with tracer.start_as_current_span("http_retry_wait"):
+                        if self.thread_cancellation_token.wait(backoff_time):
+                            raise InterruptedWhileWaitingException(message="The sync was interrupted while waiting for rate limiting backoff")
             else:
                 self.set_retries(url,0)  # Reset retries if the request is successful
                 return response

{omnata_plugin_runtime-0.8.0a189.dist-info → omnata_plugin_runtime-0.8.0a191.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omnata-plugin-runtime
-Version: 0.8.0a189
+Version: 0.8.0a191
 Summary: Classes and common runtime components for building and running Omnata Plugins
 Author: James Weakley
 Author-email: james.weakley@omnata.com

{omnata_plugin_runtime-0.8.0a189.dist-info → omnata_plugin_runtime-0.8.0a191.dist-info}/RECORD

@@ -4,9 +4,9 @@ omnata_plugin_runtime/configuration.py,sha256=uMGMqKYy4XmntX1ROungUwTJXeY2ciczAb
 omnata_plugin_runtime/forms.py,sha256=ueodN2GIMS5N9fqebpY4uNGJnjEb9HcuaVQVfWH-cGg,19838
 omnata_plugin_runtime/logging.py,sha256=u_Bo2v4jS3C_2E_Y8a7yfZZcIP-h5Mak_FPnFHUwFbU,4378
 omnata_plugin_runtime/omnata_plugin.py,sha256=aggjb_CTTjhgqjS8CHPOm4ENU0jNcYoT6LC8yI1IeF4,130048
-omnata_plugin_runtime/plugin_entrypoints.py,sha256=dK2mdH9-HRa4vjCso3SIblC72wRU2txDJJBBwMbruo0,32760
-omnata_plugin_runtime/rate_limiting.py,sha256=JKtyz8mA9D0FSZgQplPusmk2rVclcjkwtE59fQQrQ_I,25610
-omnata_plugin_runtime-0.8.0a189.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
-omnata_plugin_runtime-0.8.0a189.dist-info/METADATA,sha256=F0OeMjD6lEQkouWm1NJWuuqIbe7eJfpTEEZFjNATmys,2148
-omnata_plugin_runtime-0.8.0a189.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-omnata_plugin_runtime-0.8.0a189.dist-info/RECORD,,
+omnata_plugin_runtime/plugin_entrypoints.py,sha256=LZHwOsacZmS6JtzNM3OsLvpYyVo_UP0DaCWDWDxrJ0w,32756
+omnata_plugin_runtime/rate_limiting.py,sha256=6fn_h2vxcHbqqiW-OZ6FKfNYv_XlNvorsrCknVce2PA,25929
+omnata_plugin_runtime-0.8.0a191.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
+omnata_plugin_runtime-0.8.0a191.dist-info/METADATA,sha256=2TmcYIQw_-i9nQAuKm8EQUHamk6Tuzyg_yxwaxlT2H4,2148
+omnata_plugin_runtime-0.8.0a191.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+omnata_plugin_runtime-0.8.0a191.dist-info/RECORD,,