dt-extensions-sdk 1.7.1__py3-none-any.whl → 1.7.3__py3-none-any.whl

{dt_extensions_sdk-1.7.1.dist-info → dt_extensions_sdk-1.7.3.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-dynatrace_extension/__about__.py,sha256=EKqfngohTaiZ-afjIydbqpFds5q6Y6m0tK_D6Wyw2Dc,110
+dynatrace_extension/__about__.py,sha256=-BvmT9sstUN3n3QmUgym0fwfILxaCrccJsuxxXpn5H0,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,22 +17,22 @@ 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/communication.py,sha256=-ccvNz0NYLSDXbqcpnWEqrGKZ4AgTy9XMyu8xnd_qEU,18418
+dynatrace_extension/sdk/callback.py,sha256=NW63fQBh-BeN-zfAeDY94wpSBoBHRsR3VLJCvxJPiaw,6703
+dynatrace_extension/sdk/communication.py,sha256=uTSURmgSHit2N1hHUc3-yKmEBVMHi6hDBrdb1EaCAsE,18419
 dynatrace_extension/sdk/event.py,sha256=J261imbFKpxfuAQ6Nfu3RRcsIQKKivy6fme1nww2g-8,388
-dynatrace_extension/sdk/extension.py,sha256=BAdvQbXl03RGSPw_hYm1y5_9aZZia8fFzIZ0dpoZedo,49681
+dynatrace_extension/sdk/extension.py,sha256=KZYVn5VDW19pfnqe6UnpzRVPYUasW8n8AYSvUYvvOUw,49723
 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
 dynatrace_extension/sdk/snapshot.py,sha256=LnWVCtCK4NIEV3_kX-ly_LGHpNBSeErtsxCI1PH3L28,7521
-dynatrace_extension/sdk/status.py,sha256=TG00-Aenp6D5aFbNxJeQYEyasthAW_vi9-OsutpNC58,8425
+dynatrace_extension/sdk/status.py,sha256=fE0qCGaanV7Ss1144p-dLX9uJMKIb0Rs6A0pLZLPlrI,8599
 dynatrace_extension/sdk/throttled_logger.py,sha256=JXDiHh8syl8R0gJ-wfxmmBqvGCBMQX4pxPkxscaCsXo,3292
 dynatrace_extension/sdk/vendor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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.1.dist-info/METADATA,sha256=5Fq2vrh0GcZ4VTUgAnNnRxgU7-xuhaKb4gY4evc48bs,2721
-dt_extensions_sdk-1.7.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dt_extensions_sdk-1.7.1.dist-info/entry_points.txt,sha256=pweyOCgENGHjOlT6_kXYaBPOrE3p18K0UettqnNlnoE,55
-dt_extensions_sdk-1.7.1.dist-info/licenses/LICENSE.txt,sha256=3Zihv0lOVYHNfDkJC-tUAU6euP9r2NexsDW4w-zqgVk,1078
-dt_extensions_sdk-1.7.1.dist-info/RECORD,,
+dt_extensions_sdk-1.7.3.dist-info/METADATA,sha256=irv3Te4njH0dWl4Yl-KyNN--ErS4PP7-xrghjwbtoqo,2721
+dt_extensions_sdk-1.7.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dt_extensions_sdk-1.7.3.dist-info/entry_points.txt,sha256=pweyOCgENGHjOlT6_kXYaBPOrE3p18K0UettqnNlnoE,55
+dt_extensions_sdk-1.7.3.dist-info/licenses/LICENSE.txt,sha256=3Zihv0lOVYHNfDkJC-tUAU6euP9r2NexsDW4w-zqgVk,1078
+dt_extensions_sdk-1.7.3.dist-info/RECORD,,

dynatrace_extension/__about__.py

@@ -3,4 +3,4 @@
 # SPDX-License-Identifier: MIT
 
 
-__version__ = "1.7.1"
+__version__ = "1.7.3"

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
@@ -39,6 +40,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
@@ -147,8 +149,6 @@ 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()
+        return self.start_timestamp_monotonic + self.interval.total_seconds() * (self.iterations or 1)

dynatrace_extension/sdk/communication.py

@@ -343,7 +343,7 @@ class DebugClient(CommunicationClient):
     def get_feature_sets(self) -> dict[str, list[str]]:
         # This is only called from dt-sdk run, where PyYaml is installed because of dt-cli
         # Do NOT move this to the top of the file
-        import yaml  # type: ignore
+        import yaml  # noqa: PLC0415
 
         # Grab the feature sets from the extension.yaml file
         extension_yaml = yaml.safe_load(self.extension_config)

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,11 +181,11 @@ 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:
-            Extension._instance = super(__class__, cls).__new__(cls)
+            Extension._instance = super().__new__(cls)
         return Extension._instance
 
     def __init__(self, name: str = "") -> 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
@@ -412,7 +413,7 @@ class Extension:
         else:
             self._schedule_callback(callback)
 
-    def query(self):
+    def query(self) -> Any:
         """Callback to be executed every minute by default.
 
         Optional method that can be implemented by subclasses.
@@ -683,7 +684,7 @@ class Extension:
                 msg = f"Event type must be a DtEventType enum value, got: {value}"
                 raise ValueError(msg)
             if key == "properties":
-                for prop_key, prop_val in event[key].items():
+                for prop_key, prop_val in value.items():
                     if not isinstance(prop_key, str) or not isinstance(prop_val, str):
                         msg = f'invalid "properties" member: {prop_key}: {prop_val}, required: "str": str'
                         raise ValueError(msg)
@@ -777,7 +778,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 +1170,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."""

dynatrace_extension/sdk/status.py

@@ -114,6 +114,9 @@ class EndpointStatus:
     def __eq__(self, other):
         return isinstance(other, EndpointStatus) and self.__dict__ == other.__dict__
 
+    def __hash__(self):
+        return hash(tuple(sorted(self.__dict__.items())))
+
 
 class EndpointStatuses:
     def __init__(self, total_endpoints_number=None) -> None:
@@ -227,33 +230,34 @@ class EndpointStatusesMap:
         with self._lock:
             # Summarize all statuses
             ok_count = 0
-            nok_count = 0
-            error_messages = []
-            has_warning_status = False
+            warning_count = 0
+            error_count = 0
+            messages_to_report = []
 
             for ep_record in self._ep_records.values():
                 ep_status = ep_record.ep_status
-                if ep_status.status.is_warning():
-                    has_warning_status = True
 
-                if ep_status.status.is_error():
-                    nok_count += 1
-                    error_messages.append(f"{ep_status.endpoint} - {ep_status.status.value} {ep_status.message}")
+                if ep_status.status.is_warning():
+                    warning_count += 1
+                    messages_to_report.append(f"{ep_status.endpoint} - {ep_status.status.value} {ep_status.message}")
+                elif ep_status.status.is_error():
+                    error_count += 1
+                    messages_to_report.append(f"{ep_status.endpoint} - {ep_status.status.value} {ep_status.message}")
                 else:
                     ok_count += 1
 
+            status_msg = f"Endpoints OK: {ok_count} WARNING: {warning_count} ERROR: {error_count}"
+
             # Early return if all OK
-            if nok_count == 0:
-                return Status(StatusValue.OK, f"Endpoints OK: {ok_count} NOK: 0")
+            if error_count == 0 and warning_count == 0:
+                return Status(StatusValue.OK, status_msg)
 
             # Build final status if some errors present
-            common_msg = ", ".join(error_messages)
-            all_endpoints_faulty = ok_count == 0
+            status_msg += f" Unhealthy endpoints: {', '.join(messages_to_report)}"
 
-            if all_endpoints_faulty and not has_warning_status:
+            if ok_count == 0 and warning_count == 0:
                 status_value = StatusValue.GENERIC_ERROR
             else:
                 status_value = StatusValue.WARNING
 
-            message = f"Endpoints OK: {ok_count} NOK: {nok_count} NOK_reported_errors: {common_msg}"
-            return Status(status=status_value, message=message)
+            return Status(status=status_value, message=status_msg)