dt-extensions-sdk 1.2.1__py3-none-any.whl → 1.2.3__py3-none-any.whl

{dt_extensions_sdk-1.2.1.dist-info → dt_extensions_sdk-1.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dt-extensions-sdk
-Version: 1.2.1
+Version: 1.2.3
 Project-URL: Documentation, https://github.com/dynatrace-extensions/dt-extensions-python-sdk#readme
 Project-URL: Issues, https://github.com/dynatrace-extensions/dt-extensions-python-sdk/issues
 Project-URL: Source, https://github.com/dynatrace-extensions/dt-extensions-python-sdk

{dt_extensions_sdk-1.2.1.dist-info → dt_extensions_sdk-1.2.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-dynatrace_extension/__about__.py,sha256=gqt1Ofuerao0R0GWH5D9uKmEnGEPRonvK_bBjAJxpXA,109
+dynatrace_extension/__about__.py,sha256=TLyHW1TFN8BFLjdtrH0-fQP5cpool1Nmic9L4C1gsy0,109
 dynatrace_extension/__init__.py,sha256=BvQuknmA7ti3WJi3zEXZfY7aAxJrie37VNitWICsUvI,752
 dynatrace_extension/cli/__init__.py,sha256=HCboY_eJPoqjFmoPDsBL8Jk6aNvank8K7JpkVrgwzUM,123
 dynatrace_extension/cli/main.py,sha256=ZOqxZsaMJRZsqR3Og2a9h2PDlkyJE8tAny-p7Mb7dmA,17254
@@ -15,10 +15,10 @@ dynatrace_extension/cli/create/extension_template/extension_name/__init__.py.tem
 dynatrace_extension/cli/create/extension_template/extension_name/__main__.py.template,sha256=Mr7kfekNfEBUapJh_xbySZD8jPyYDspZx3KAfnhdCUk,1258
 dynatrace_extension/sdk/__init__.py,sha256=RsqQ1heGyCmSK3fhuEKAcxQIRCg4gEK0-eSkIehL5Nc,86
 dynatrace_extension/sdk/activation.py,sha256=goTbT1tD2kn8xfyXFdTy_cTZNcFPJpgbvQM8HOzKECA,1480
-dynatrace_extension/sdk/callback.py,sha256=1P9uQ388j6q6a-8VgmV5FxcOMH-Mr3zvWXk2ftVD8j4,5828
+dynatrace_extension/sdk/callback.py,sha256=FJSkaBF895NZquUtpSj1I2vel2Rx-y-2da8mKX_pk4I,6307
 dynatrace_extension/sdk/communication.py,sha256=gD4GOHOzWdRL_KrUWtC2s8-Jp8Csn5gjZl4mHO5Lk_4,17739
 dynatrace_extension/sdk/event.py,sha256=J261imbFKpxfuAQ6Nfu3RRcsIQKKivy6fme1nww2g-8,388
-dynatrace_extension/sdk/extension.py,sha256=fe6JD7ksLmDF6NmWoo6ZG22r44-J-Ouz6U0c2KWhoCg,41369
+dynatrace_extension/sdk/extension.py,sha256=48MK9E4JhAxTFOabWDJ58uZqSmGNwTC62vL1RP_q_gM,41623
 dynatrace_extension/sdk/helper.py,sha256=ZNrO9ao2hE3KQ934vAYD74k0fCr6QTG-_bAvbk9-hi8,6562
 dynatrace_extension/sdk/metric.py,sha256=7VClzJCFJNDCxA-d69uTu1pdPtDZBTwq7fbafs_L6nQ,3690
 dynatrace_extension/sdk/runtime.py,sha256=jyYsM1x-gMnW68eWq8IoZZZBarHgIcr_nVeGDDgpRDk,2802
@@ -27,8 +27,8 @@ dynatrace_extension/sdk/vendor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 dynatrace_extension/sdk/vendor/mureq/LICENSE,sha256=8AVcgZgiT_mvK1fOofXtRRr2f1dRXS_K21NuxQgP4VM,671
 dynatrace_extension/sdk/vendor/mureq/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dynatrace_extension/sdk/vendor/mureq/mureq.py,sha256=znF4mvzk5L03CLNozRz8UpK-fMijmSkObDFwlbhwLUg,14656
-dt_extensions_sdk-1.2.1.dist-info/METADATA,sha256=-BewrBv21TdM9amg8705hgDl-MkebxhWqUR9Smps-sc,2793
-dt_extensions_sdk-1.2.1.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-dt_extensions_sdk-1.2.1.dist-info/entry_points.txt,sha256=pweyOCgENGHjOlT6_kXYaBPOrE3p18K0UettqnNlnoE,55
-dt_extensions_sdk-1.2.1.dist-info/licenses/LICENSE.txt,sha256=3Zihv0lOVYHNfDkJC-tUAU6euP9r2NexsDW4w-zqgVk,1078
-dt_extensions_sdk-1.2.1.dist-info/RECORD,,
+dt_extensions_sdk-1.2.3.dist-info/METADATA,sha256=Bb83R0u5D4P42VsTWCgkBw8NP1LXhVj0oCaQdQS_9RA,2793
+dt_extensions_sdk-1.2.3.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+dt_extensions_sdk-1.2.3.dist-info/entry_points.txt,sha256=pweyOCgENGHjOlT6_kXYaBPOrE3p18K0UettqnNlnoE,55
+dt_extensions_sdk-1.2.3.dist-info/licenses/LICENSE.txt,sha256=3Zihv0lOVYHNfDkJC-tUAU6euP9r2NexsDW4w-zqgVk,1078
+dt_extensions_sdk-1.2.3.dist-info/RECORD,,

{dt_extensions_sdk-1.2.1.dist-info → dt_extensions_sdk-1.2.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.24.2
+Generator: hatchling 1.25.0
 Root-Is-Purelib: true
 Tag: py3-none-any

dynatrace_extension/__about__.py

@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: MIT
 
-__version__ = "1.2.1"
+__version__ = "1.2.3"

dynatrace_extension/sdk/callback.py

@@ -45,17 +45,18 @@ class WrappedCallback:
         self.ok_count = 0  # counter per interval = 1 min by default
         self.timeouts_count = 0  # counter per interval = 1 min by default
         self.exception_count = 0  # counter per interval = 1 min by default
+        self.iterations = 0  # how many times we ran the callback iterator for this callback
 
     def get_current_time_with_cluster_diff(self):
         return datetime.now() + timedelta(milliseconds=self.cluster_time_diff)
 
     def __call__(self):
         self.logger.debug(f"Running scheduled callback {self}")
-        self.start_timestamp = self.get_current_time_with_cluster_diff()
+        if self.executions_total == 0:
+            self.start_timestamp = self.get_current_time_with_cluster_diff()
         self.running = True
         self.executions_total += 1
         self.executions_per_interval += 1
-        self.next_run = datetime.now() + self.interval
         start_time = timer()
         failed = False
         try:
@@ -132,3 +133,13 @@ class WrappedCallback:
         self.duration_interval_total = 0
         self.exception_count = 0
         self.executions_per_interval = 0
+
+    def get_next_execution_timestamp(self) -> float:
+        """
+        Get the timestamp for the next execution of the callback
+        This is done using execution total, the interval and the start timestamp
+        :return: datetime
+        """
+        return (
+            self.start_timestamp + timedelta(seconds=self.interval.total_seconds() * (self.iterations or 1))
+        ).timestamp()

dynatrace_extension/sdk/extension.py

@@ -342,6 +342,10 @@ class Extension:
         if isinstance(interval, int):
             interval = timedelta(seconds=interval)
 
+        if interval.total_seconds() < 1:
+            msg = f"Interval must be at least 1 second, got {interval.total_seconds()} seconds"
+            raise ValueError(msg)
+
         callback = WrappedCallback(interval, callback, api_logger, args, activation_type=activation_type)
         if self._is_fastcheck:
             self._scheduled_callbacks_before_run.append(callback)
@@ -785,7 +789,9 @@ class Extension:
 
     def _callback_iteration(self, callback: WrappedCallback):
         self._callbacks_executor.submit(self._run_callback, callback)
-        self._scheduler.enter(callback.interval.total_seconds(), 1, self._callback_iteration, (callback,))
+        callback.iterations += 1
+        next_timestamp = callback.get_next_execution_timestamp()
+        self._scheduler.enterabs(next_timestamp, 1, self._callback_iteration, (callback,))
 
     def _start_extension_loop(self):
         api_logger.debug(f"Starting main loop for monitoring configuration: '{self.monitoring_config_name}'")