dt-extensions-sdk 1.7.2__py3-none-any.whl → 1.7.4__py3-none-any.whl

{dt_extensions_sdk-1.7.2.dist-info → dt_extensions_sdk-1.7.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dt-extensions-sdk
-Version: 1.7.2
+Version: 1.7.4
 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.7.2.dist-info → dt_extensions_sdk-1.7.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-dynatrace_extension/__about__.py,sha256=qRNIJuMF_5DRmYm6b4aociCQcAdhCKOCXEIN81aEsPQ,110
+dynatrace_extension/__about__.py,sha256=mYwZ34U1NdFWsIoFPXD2wSIjr7MDYun_CILrVcKXdDU,110
 dynatrace_extension/__init__.py,sha256=MJNJYCFWLEwPmBLoETWFZddyUCMDgZfKkRycmmGM_w4,806
 dynatrace_extension/cli/__init__.py,sha256=HCboY_eJPoqjFmoPDsBL8Jk6aNvank8K7JpkVrgwzUM,123
 dynatrace_extension/cli/main.py,sha256=OTjJ4XHJvvYXj10a7WFFHVNnkyECPg1ClW6Os8piN8k,20168
@@ -17,10 +17,10 @@ dynatrace_extension/cli/create/extension_template/extension_name/__init__.py.tem
 dynatrace_extension/cli/create/extension_template/extension_name/__main__.py.template,sha256=cS79GVxJB-V-gocu4ZOjmZ54HXJNg89eXdLf89zDHJQ,1249
 dynatrace_extension/sdk/__init__.py,sha256=RsqQ1heGyCmSK3fhuEKAcxQIRCg4gEK0-eSkIehL5Nc,86
 dynatrace_extension/sdk/activation.py,sha256=KIoPWMZs3tKiMG8XhCfeNgRlz2vxDKcAASgSACcEfIQ,1456
-dynatrace_extension/sdk/callback.py,sha256=woumpcWID09QHGc_rSrukNslVG8Qo0UQEgv8VTB6m7c,6681
+dynatrace_extension/sdk/callback.py,sha256=S_ELy2D9Y2YhUsL2lBry3UZfmy3BrZgZM2hvKgQIQss,6949
 dynatrace_extension/sdk/communication.py,sha256=uTSURmgSHit2N1hHUc3-yKmEBVMHi6hDBrdb1EaCAsE,18419
 dynatrace_extension/sdk/event.py,sha256=J261imbFKpxfuAQ6Nfu3RRcsIQKKivy6fme1nww2g-8,388
-dynatrace_extension/sdk/extension.py,sha256=8P0ANxF3WVjVeGAA73MXTeSekpL1MarEBB6ZoKGnpZY,49669
+dynatrace_extension/sdk/extension.py,sha256=ZbuoHQ-sbj4jUSz0w1Iz6IePrnC9a0BEwoXIdLKJsU8,49957
 dynatrace_extension/sdk/helper.py,sha256=m4gGHtIKYkfANC2MOGdxKUZlmH5tnZO6WTNqll27lyY,6476
 dynatrace_extension/sdk/metric.py,sha256=-kq7JWpk7UGvcjqafTt-o6k4urwhsGVXmnuQg7Sf9PQ,3622
 dynatrace_extension/sdk/runtime.py,sha256=7bC4gUJsVSHuL_E7r2EWrne95nm1BjZiMGkyNqA7ZCU,2796
@@ -31,8 +31,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.7.2.dist-info/METADATA,sha256=FVuIQEkut5SwCh77eZrb92ngUurYD_LxUhFZab6Diw8,2721
-dt_extensions_sdk-1.7.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dt_extensions_sdk-1.7.2.dist-info/entry_points.txt,sha256=pweyOCgENGHjOlT6_kXYaBPOrE3p18K0UettqnNlnoE,55
-dt_extensions_sdk-1.7.2.dist-info/licenses/LICENSE.txt,sha256=3Zihv0lOVYHNfDkJC-tUAU6euP9r2NexsDW4w-zqgVk,1078
-dt_extensions_sdk-1.7.2.dist-info/RECORD,,
+dt_extensions_sdk-1.7.4.dist-info/METADATA,sha256=L-E8TbTHsP72vnEmdYbBYHPJRTRsrOc81QUWsiunyLk,2721
+dt_extensions_sdk-1.7.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+dt_extensions_sdk-1.7.4.dist-info/entry_points.txt,sha256=pweyOCgENGHjOlT6_kXYaBPOrE3p18K0UettqnNlnoE,55
+dt_extensions_sdk-1.7.4.dist-info/licenses/LICENSE.txt,sha256=3Zihv0lOVYHNfDkJC-tUAU6euP9r2NexsDW4w-zqgVk,1078
+dt_extensions_sdk-1.7.4.dist-info/RECORD,,

{dt_extensions_sdk-1.7.2.dist-info → dt_extensions_sdk-1.7.4.dist-info}/WHEEL

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

dynatrace_extension/__about__.py

@@ -3,4 +3,4 @@
 # SPDX-License-Identifier: MIT
 
 
-__version__ = "1.7.2"
+__version__ = "1.7.4"

dynatrace_extension/sdk/callback.py

@@ -4,6 +4,7 @@
 
 import logging
 import random
+import time
 from collections.abc import Callable
 from datetime import datetime, timedelta
 from timeit import default_timer as timer
@@ -22,6 +23,7 @@ class WrappedCallback:
         kwargs: dict | None = None,
         running_in_sim=False,
         activation_type: ActivationType | None = None,
+        offset_seconds: float | None = None,
     ):
         self.callback: Callable = callback
         if args is None:
@@ -39,6 +41,7 @@ class WrappedCallback:
         self.duration = 0  # global counter
         self.duration_interval_total = 0  # counter per interval = 1 min by default
         self.cluster_time_diff = 0
+        self.start_timestamp_monotonic = time.monotonic()
         self.start_timestamp = self.get_current_time_with_cluster_diff()
         self.running_in_sim = running_in_sim
         self.activation_type = activation_type
@@ -46,6 +49,7 @@ class WrappedCallback:
         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
+        self.offset_seconds = offset_seconds or self.calculate_initial_wait_time()
 
     def get_current_time_with_cluster_diff(self):
         return datetime.now() + timedelta(milliseconds=self.cluster_time_diff)
@@ -95,24 +99,28 @@ class WrappedCallback:
     def name(self):
         return self.callback.__name__
 
+    def calculate_initial_wait_time(self) -> float:
+        """
+        Here we chose a random second between 5 and 55 to start the callback
+        This is to distribute load for extension running on this host
+        """
+
+        now = self.get_current_time_with_cluster_diff()
+        random_second = random.randint(5, 55)  # noqa: S311
+        next_execution = datetime.now().replace(second=random_second, microsecond=0)
+        if next_execution <= now:
+            # The random chosen second already passed this minute
+            next_execution += timedelta(minutes=1)
+        wait_time = (next_execution - now).total_seconds()
+        self.logger.debug(f"Randomly choosing next execution time for callback {self} to be {next_execution}")
+        return wait_time
+
     def initial_wait_time(self) -> float:
-        if not self.running_in_sim:
-            """
-            Here we chose a random second between 5 and 55 to start the callback
-            This is to distribute load for extension running on this host
-            When running from the simulator, this is not done
-            """
-
-            now = self.get_current_time_with_cluster_diff()
-            random_second = random.randint(5, 55)  # noqa: S311
-            next_execution = datetime.now().replace(second=random_second, microsecond=0)
-            if next_execution <= now:
-                # The random chosen second already passed this minute
-                next_execution += timedelta(minutes=1)
-            wait_time = (next_execution - now).total_seconds()
-            self.logger.debug(f"Randomly choosing next execution time for callback {self} to be {next_execution}")
-            return wait_time
-        return 0
+        # When running from the simulator, we don't want any offset
+        if self.running_in_sim:
+            return 0
+
+        return self.offset_seconds
 
     def get_adjusted_metric_timestamp(self) -> datetime:
         """
@@ -147,8 +155,10 @@ class WrappedCallback:
         """
         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: float
         """
         return (
-            self.start_timestamp + timedelta(seconds=self.interval.total_seconds() * (self.iterations or 1))
-        ).timestamp()
+            self.initial_wait_time()
+            + self.start_timestamp_monotonic
+            + self.interval.total_seconds() * (self.iterations or 1)
+        )

dynatrace_extension/sdk/extension.py

@@ -28,10 +28,11 @@ from .snapshot import Snapshot
 from .status import EndpointStatuses, EndpointStatusesMap, IgnoreStatus, Status, StatusValue
 from .throttled_logger import StrictThrottledHandler, ThrottledHandler
 
-HEARTBEAT_INTERVAL = timedelta(seconds=50)
-METRIC_SENDING_INTERVAL = timedelta(seconds=30)
-SFM_METRIC_SENDING_INTERVAL = timedelta(seconds=60)
-TIME_DIFF_INTERVAL = timedelta(seconds=60)
+# Intervals defined in seconds for internal callbacks
+HEARTBEAT_INTERVAL = 50
+METRIC_SENDING_INTERVAL = 30
+SFM_METRIC_SENDING_INTERVAL = 60
+TIME_DIFF_INTERVAL = 60
 
 CALLBACKS_THREAD_POOL_SIZE = 100
 INTERNAL_THREAD_POOL_SIZE = 20
@@ -180,7 +181,7 @@ class Extension:
     """
 
     _instance: ClassVar = None
-    schedule_decorators: ClassVar = []
+    schedule_decorators: ClassVar[list[tuple[Callable, timedelta | int, tuple | None, ActivationType | None]]] = []
 
     def __new__(cls, *args, **kwargs):  # noqa: ARG004
         if Extension._instance is None:
@@ -240,15 +241,15 @@ class Extension:
         self._running_callbacks: dict[int, WrappedCallback] = {}
         self._running_callbacks_lock: Lock = Lock()
 
-        self._scheduler = sched.scheduler(time.time, time.sleep)
+        self._scheduler = sched.scheduler(time.monotonic, 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,
-            "events": datetime.now() + METRIC_SENDING_INTERVAL,
-            "sfm_metrics": datetime.now() + SFM_METRIC_SENDING_INTERVAL,
+        self._next_internal_callbacks_timestamps: dict[str, float] = {
+            "timediff": time.monotonic() + TIME_DIFF_INTERVAL,
+            "heartbeat": time.monotonic() + HEARTBEAT_INTERVAL,
+            "metrics": time.monotonic() + METRIC_SENDING_INTERVAL,
+            "events": time.monotonic() + METRIC_SENDING_INTERVAL,
+            "sfm_metrics": time.monotonic() + SFM_METRIC_SENDING_INTERVAL,
         }
 
         # Executors for the callbacks and internal methods
@@ -384,6 +385,7 @@ class Extension:
         interval: timedelta | int,
         args: tuple | None = None,
         activation_type: ActivationType | None = None,
+        offset_seconds: float | None = None,
     ) -> None:
         """Schedule a method to be executed periodically.
 
@@ -397,6 +399,7 @@ class Extension:
             args: Arguments to the callback, if any
             activation_type: Optional activation type when this callback should run,
                 can be 'ActivationType.LOCAL' or 'ActivationType.REMOTE'
+            offset_seconds: Optional offset of first execution represented in seconds. Offset is random if `offset_seconds` is `None`.
         """
 
         if isinstance(interval, int):
@@ -406,7 +409,10 @@ class Extension:
             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)
+        callback = WrappedCallback(
+            interval, callback, api_logger, args, activation_type=activation_type, offset_seconds=offset_seconds
+        )
+
         if self._is_fastcheck:
             self._scheduled_callbacks_before_run.append(callback)
         else:
@@ -777,7 +783,7 @@ class Extension:
         parser.add_argument("--secrets", required=False, default="secrets.json")
         parser.add_argument("--no-print-metrics", required=False, action="store_true")
 
-        args, unknown = parser.parse_known_args()
+        args, _ = parser.parse_known_args()
         self._is_fastcheck = args.fastcheck
         if args.dsid is None:
             # DEV mode
@@ -1169,10 +1175,10 @@ 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):
+    def _get_and_set_next_internal_callback_timestamp(self, callback_name: str, interval: float) -> float:
         next_timestamp = self._next_internal_callbacks_timestamps[callback_name]
         self._next_internal_callbacks_timestamps[callback_name] += interval
-        return next_timestamp.timestamp()
+        return next_timestamp
 
     def get_version(self) -> str:
         """Return the extension version."""