omnata-plugin-runtime 0.8.0a189__tar.gz → 0.8.0a190__tar.gz

{omnata_plugin_runtime-0.8.0a189 → omnata_plugin_runtime-0.8.0a190}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omnata-plugin-runtime
-Version: 0.8.0a189
+Version: 0.8.0a190
 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 → omnata_plugin_runtime-0.8.0a190}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-runtime"
-version = "0.8.0-a189"
+version = "0.8.0-a190"
 description = "Classes and common runtime components for building and running Omnata Plugins"
 authors = ["James Weakley <james.weakley@omnata.com>"]
 readme = "README.md"

{omnata_plugin_runtime-0.8.0a189 → omnata_plugin_runtime-0.8.0a190}/src/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