dt-extensions-sdk 1.2.6__py3-none-any.whl → 1.2.9__py3-none-any.whl

{dt_extensions_sdk-1.2.6.dist-info → dt_extensions_sdk-1.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dt-extensions-sdk
-Version: 1.2.6
+Version: 1.2.9
 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
@@ -40,7 +40,7 @@ The documentation can be found on [github pages](https://dynatrace-extensions.gi
 
 ### Requirements:
 
-* Python 3.10+
+* Python 3.10
 
 ### Install the SDK
 
@@ -116,4 +116,4 @@ hatch run docs:build
 ## Publishing to PyPI
 
 It's automatically published to PyPi on each pushed tag, and uses [gh-action-pypi-publish](https://packaging.python.org/en/latest/guides/publishing-package-distribution-releases-using-github-actions-ci-cd-workflows/)
-Version will be determined using __about__.py
+Version will be determined using __about__.py

{dt_extensions_sdk-1.2.6.dist-info → dt_extensions_sdk-1.2.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-dynatrace_extension/__about__.py,sha256=ZJlm4YkWp1VVzqB1nyyEqNzOsfmKJ3Kcg2kkO61-SMc,109
+dynatrace_extension/__about__.py,sha256=cMazOtXSab_DsBj2r42iZHp_YVxg7YRhZ4W6OZ43Ruc,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
@@ -18,7 +18,7 @@ dynatrace_extension/sdk/activation.py,sha256=goTbT1tD2kn8xfyXFdTy_cTZNcFPJpgbvQM
 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=R7Vg0q68-uvXtkn2amuAHPUCXMKzfwNkeWm4LEgspIc,41652
+dynatrace_extension/sdk/extension.py,sha256=WvPGKt7td8np65NHIEnJ53mylGff1lhQtJM8xvgWCXA,42758
 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.6.dist-info/METADATA,sha256=NQuax5dT25Cu8YSStQpFLAb4OlDO9DSZY0quy-m1wKc,2685
-dt_extensions_sdk-1.2.6.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-dt_extensions_sdk-1.2.6.dist-info/entry_points.txt,sha256=pweyOCgENGHjOlT6_kXYaBPOrE3p18K0UettqnNlnoE,55
-dt_extensions_sdk-1.2.6.dist-info/licenses/LICENSE.txt,sha256=3Zihv0lOVYHNfDkJC-tUAU6euP9r2NexsDW4w-zqgVk,1078
-dt_extensions_sdk-1.2.6.dist-info/RECORD,,
+dt_extensions_sdk-1.2.9.dist-info/METADATA,sha256=ZciL7FZ4sxdWUQ-uLhoeODZOxuRfv9zR8-2mXgJsZ-0,2685
+dt_extensions_sdk-1.2.9.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+dt_extensions_sdk-1.2.9.dist-info/entry_points.txt,sha256=pweyOCgENGHjOlT6_kXYaBPOrE3p18K0UettqnNlnoE,55
+dt_extensions_sdk-1.2.9.dist-info/licenses/LICENSE.txt,sha256=3Zihv0lOVYHNfDkJC-tUAU6euP9r2NexsDW4w-zqgVk,1078
+dt_extensions_sdk-1.2.9.dist-info/RECORD,,

dynatrace_extension/__about__.py

@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: MIT
 
-__version__ = "1.2.6"
+__version__ = "1.2.9"

dynatrace_extension/sdk/extension.py

@@ -151,7 +151,7 @@ class Extension:
     _instance: ClassVar = None
     schedule_decorators: ClassVar = []
 
-    def __new__(cls):
+    def __new__(cls, *args, **kwargs):  # noqa: ARG003
         if Extension._instance is None:
             Extension._instance = super(__class__, cls).__new__(cls)
         return Extension._instance
@@ -209,6 +209,14 @@ class Extension:
 
         self._scheduler = sched.scheduler(time.time, time.sleep)
 
+        # Timestamps for scheduling of internal callbacks
+        self._next_internal_callbacks_timestamps: Dict[str, datetime] = {
+            "timediff": datetime.now() + TIME_DIFF_INTERVAL,
+            "heartbeat": datetime.now() + HEARTBEAT_INTERVAL,
+            "metrics": datetime.now() + METRIC_SENDING_INTERVAL,
+            "sfm_metrics": datetime.now() + SFM_METRIC_SENDING_INTERVAL,
+        }
+
         # Executors for the callbacks and internal methods
         self._callbacks_executor = ThreadPoolExecutor(max_workers=CALLBACKS_THREAD_POOL_SIZE)
         self._internal_executor = ThreadPoolExecutor(max_workers=INTERNAL_THREAD_POOL_SIZE)
@@ -813,19 +821,23 @@ class Extension:
 
     def _timediff_iteration(self):
         self._internal_executor.submit(self._update_cluster_time_diff)
-        self._scheduler.enter(TIME_DIFF_INTERVAL.total_seconds(), 1, self._timediff_iteration)
+        next_timestamp = self._get_and_set_next_internal_callback_timestamp("timediff", TIME_DIFF_INTERVAL)
+        self._scheduler.enterabs(next_timestamp, 1, self._timediff_iteration)
 
     def _heartbeat_iteration(self):
         self._internal_executor.submit(self._heartbeat)
-        self._scheduler.enter(HEARTBEAT_INTERVAL.total_seconds(), 1, self._heartbeat_iteration)
+        next_timestamp = self._get_and_set_next_internal_callback_timestamp("heartbeat", HEARTBEAT_INTERVAL)
+        self._scheduler.enterabs(next_timestamp, 2, self._heartbeat_iteration)
 
     def _metrics_iteration(self):
         self._internal_executor.submit(self._send_metrics)
-        self._scheduler.enter(METRIC_SENDING_INTERVAL.total_seconds(), 1, self._metrics_iteration)
+        next_timestamp = self._get_and_set_next_internal_callback_timestamp("metrics", METRIC_SENDING_INTERVAL)
+        self._scheduler.enterabs(next_timestamp, 1, self._metrics_iteration)
 
     def _sfm_metrics_iteration(self):
         self._internal_executor.submit(self._send_sfm_metrics)
-        self._scheduler.enter(SFM_METRIC_SENDING_INTERVAL.total_seconds(), 1, self._sfm_metrics_iteration)
+        next_timestamp = self._get_and_set_next_internal_callback_timestamp("sfm_metrics", SFM_METRIC_SENDING_INTERVAL)
+        self._scheduler.enterabs(next_timestamp, 1, self._sfm_metrics_iteration)
 
     def _send_metrics(self):
         with self._metrics_lock:
@@ -1030,6 +1042,11 @@ class Extension:
     def _send_dt_event(self, event: dict[str, str | int | dict[str, str]]):
         self._client.send_dt_event(event)
 
+    def _get_and_set_next_internal_callback_timestamp(self, callback_name: str, interval: timedelta):
+        next_timestamp = self._next_internal_callbacks_timestamps[callback_name]
+        self._next_internal_callbacks_timestamps[callback_name] += interval
+        return next_timestamp.timestamp()
+
     def get_version(self) -> str:
         """Return the extension version."""
         return self.activation_config.version