dt-extensions-sdk 1.1.14__py3-none-any.whl → 1.1.16__py3-none-any.whl

{dt_extensions_sdk-1.1.14.dist-info → dt_extensions_sdk-1.1.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dt-extensions-sdk
-Version: 1.1.14
+Version: 1.1.16
 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.1.14.dist-info → dt_extensions_sdk-1.1.16.dist-info}/RECORD

@@ -1,4 +1,4 @@
-dynatrace_extension/__about__.py,sha256=g3hhG7B9t83hKfX5DAKY1soVWx-Ut524cAYTdATNX3w,115
+dynatrace_extension/__about__.py,sha256=5SE6zz8YNj3cZnRJ6gzkBsJ3yLzLCTp4BjtDtYA4pTI,115
 dynatrace_extension/__init__.py,sha256=XYHyWducrLWengm6jcCZMYAHzaQwQfoJKzKT4QvhTxE,779
 dynatrace_extension/cli/__init__.py,sha256=eg2YQkeboIfJ_hcUGp1WFEvT-moa2qGGN-L9RjTbxCM,128
 dynatrace_extension/cli/main.py,sha256=3KLvB2HZZe-tZKyB3n236N75ja5hGEMwxV-UaGyXxvE,17393
@@ -8,17 +8,17 @@ dynatrace_extension/cli/create/create.py,sha256=Wkkp4AuRID18k9EUJdVZ3GP2US35OF5h
 dynatrace_extension/cli/create/extension_template/.gitignore.template,sha256=k8e-DOj0fYnXYjlLOCHoN5GBgtkNXHAYEfEWr3_YZV0,3238
 dynatrace_extension/cli/create/extension_template/README.md.template,sha256=VUkh1AGyHJ_7hmxaGGhwiHys82VR16ii92_WvuhKHTY,670
 dynatrace_extension/cli/create/extension_template/activation.json.template,sha256=8sO0WcqhoQouRHfy_V5KhJXdNYbBxc73VOcxLQKylzs,272
-dynatrace_extension/cli/create/extension_template/setup.py.template,sha256=yTWMPaJZzO2FterwJv1YKO0v75VKmCQRiwzpMwa9S1A,405
+dynatrace_extension/cli/create/extension_template/setup.py.template,sha256=i38dH4uIN0XJ8v5Ag7vJOrb6WDeXJpbylEIeVavln_I,874
 dynatrace_extension/cli/create/extension_template/extension/activationSchema.json.template,sha256=ufVIxeAkrrrhEnk-TPvYgdEKpAbiWXNvHS5t9iZoED0,3023
-dynatrace_extension/cli/create/extension_template/extension/extension.yaml.template,sha256=db7N-VGVqMFn1OXW1em-lRqf_-FKYMMfEyQCg9cghUs,313
+dynatrace_extension/cli/create/extension_template/extension/extension.yaml.template,sha256=hdj4kShGE2u7A7bcVKypXTR3GExGm690EHwsNIBRrC4,316
 dynatrace_extension/cli/create/extension_template/extension_name/__init__.py.template,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dynatrace_extension/cli/create/extension_template/extension_name/__main__.py.template,sha256=UTwxpOkHFZTShEztuZwbAz8TjmXmRGAGmr_fwE4u0ro,1301
 dynatrace_extension/sdk/__init__.py,sha256=sh7MNjmyR0vt-ugkqEHXVqwTNLExfexS0CTK-QnULcw,89
 dynatrace_extension/sdk/activation.py,sha256=s1ZToshWNptfmgu5NsZCI_WMsNM3-O8CSzzoauo62Uk,1523
 dynatrace_extension/sdk/callback.py,sha256=61o2ui2gXO__sDuY-zGaNTGmkk1tdn-5fQs6Ik7EodE,5962
-dynatrace_extension/sdk/communication.py,sha256=qHkt-gCS7C2twOqqsYQFbz-7dprzy5bF9gRGgz87iu4,17724
+dynatrace_extension/sdk/communication.py,sha256=zKiUP0oKPniLzcyJIHAoWl6jj_0DjZr4gzZGB9O794U,19239
 dynatrace_extension/sdk/event.py,sha256=oyvcm8uTle-A1jKgXIsFwAvl-Ta2RKbFHVZv3sxTPmo,407
-dynatrace_extension/sdk/extension.py,sha256=JooYJnL_G7CAjW9SLIHdN5QKdMqRzwOmrpuvrIB4V7w,41205
+dynatrace_extension/sdk/extension.py,sha256=6FSayHmh24SRrFZ5TOEe9pVxWDWN3LhU3eSu3INhDoU,41349
 dynatrace_extension/sdk/helper.py,sha256=TyL6aSIN6lhoH2yHZw8NbhtixdvlyV5q6fDh5NPODdc,6753
 dynatrace_extension/sdk/metric.py,sha256=QwrfrmFdj-IddZxAZlZrch62TWKDtzrDU88FwBIv30E,3808
 dynatrace_extension/sdk/runtime.py,sha256=JgP_qVomatVw85ZuAjbR0S-rzrK5U9JwSZXwfQDKNA4,2869
@@ -26,8 +26,8 @@ dynatrace_extension/sdk/vendor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 dynatrace_extension/sdk/vendor/mureq/LICENSE,sha256=_rKBhB1pJYXjxjBCdOSIkv_slxWbhEXVBXXZs1MdpQQ,684
 dynatrace_extension/sdk/vendor/mureq/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dynatrace_extension/sdk/vendor/mureq/mureq.py,sha256=gKzGiPmZ2g74Nb8K_6bu0f2coWZHZiZ2aXGzG2Pimlg,15102
-dt_extensions_sdk-1.1.14.dist-info/METADATA,sha256=FG3KBEQ_gvYG4PsR9bWXGz3LMbf-jfpz594aU8jdwV4,2794
-dt_extensions_sdk-1.1.14.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
-dt_extensions_sdk-1.1.14.dist-info/entry_points.txt,sha256=pweyOCgENGHjOlT6_kXYaBPOrE3p18K0UettqnNlnoE,55
-dt_extensions_sdk-1.1.14.dist-info/licenses/LICENSE.txt,sha256=k7kok_OTpJ5sfb5ANni8wu-Q1lXw8OQjNZXdrTGhFKc,1087
-dt_extensions_sdk-1.1.14.dist-info/RECORD,,
+dt_extensions_sdk-1.1.16.dist-info/METADATA,sha256=O_O8uBSihvwD_GTv5PMWe2exjNtiM7uE-Kt4iOZsdEM,2794
+dt_extensions_sdk-1.1.16.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
+dt_extensions_sdk-1.1.16.dist-info/entry_points.txt,sha256=pweyOCgENGHjOlT6_kXYaBPOrE3p18K0UettqnNlnoE,55
+dt_extensions_sdk-1.1.16.dist-info/licenses/LICENSE.txt,sha256=k7kok_OTpJ5sfb5ANni8wu-Q1lXw8OQjNZXdrTGhFKc,1087
+dt_extensions_sdk-1.1.16.dist-info/RECORD,,

dynatrace_extension/__about__.py

@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: MIT
 
-__version__ = "1.1.14"
+__version__ = "1.1.16"

dynatrace_extension/cli/create/extension_template/extension/extension.yaml.template

@@ -1,6 +1,6 @@
 name: %extension-prefix%%extension-name%
 version: 0.0.1
-minDynatraceVersion: "1.253"
+minDynatraceVersion: "1.285"
 author:
   name: "Dynatrace"
 
@@ -8,10 +8,10 @@ python:
   runtime:
     module: %extension_name%
     version:
-      min: "3.9"
+      min: "3.10"
 
   activation:
     remote:
       path: activationSchema.json
     local:
-      path: activationSchema.json
+      path: activationSchema.json

dynatrace_extension/cli/create/extension_template/setup.py.template

@@ -1,7 +1,23 @@
+from pathlib import Path
 from setuptools import setup, find_packages
 
+
+def find_version() -> str:
+    version = "0.0.1"
+    extension_yaml_path = Path(__file__).parent / "extension" / "extension.yaml"
+    try:
+        with open(extension_yaml_path, encoding="utf-8") as f:
+            for line in f:
+                if line.startswith("version"):
+                    version = line.split(" ")[-1].strip("\"")
+                    break
+    except Exception:
+        pass
+    return version
+
+
 setup(name="%extension_name%",
-      version="0.0.1",
+      version=find_version(),
       description="%Extension_Name% python EF2 extension",
       author="Dynatrace",
       packages=find_packages(),

dynatrace_extension/sdk/communication.py

@@ -10,11 +10,12 @@ import random
 import sys
 import time
 from abc import ABC, abstractmethod
+from collections import deque
 from dataclasses import dataclass
 from enum import Enum
 from itertools import islice
 from pathlib import Path
-from typing import Any, Iterable, List, TypeVar
+from typing import Any, Dict, Iterable, List, TypeVar, Union
 
 from .vendor.mureq.mureq import HTTPException, Response, request
 
@@ -22,6 +23,8 @@ CONTENT_TYPE_JSON = "application/json;charset=utf-8"
 CONTENT_TYPE_PLAIN = "text/plain;charset=utf-8"
 COUNT_METRIC_ITEMS_DICT = TypeVar("COUNT_METRIC_ITEMS_DICT", str, List[str])
 MAX_MINT_LINES_PER_REQUEST = 1000
+MAX_LOG_EVENTS_PER_REQUEST = 50_000
+MAX_LOG_REQUEST_SIZE = 5_000_000
 HTTP_BAD_REQUEST = 400
 
 
@@ -94,7 +97,7 @@ class CommunicationClient(ABC):
         pass
 
     @abstractmethod
-    def send_events(self, event: dict | list[dict], eec_enrichment: bool) -> dict | None:
+    def send_events(self, event: dict | list[dict], eec_enrichment: bool) -> list[Union[dict | None]]:
         pass
 
     @abstractmethod
@@ -283,19 +286,26 @@ class HttpClient(CommunicationClient):
             responses.append(mint_response)
         return responses
 
-    def send_events(self, events: dict | list[dict], eec_enrichment: bool = True) -> dict | None:
+    def send_events(self, events: dict | list[dict], eec_enrichment: bool = True) -> list[dict | None]:
         self.logger.debug(f"Sending log events: {events}")
-        event_data = json.dumps(events).encode("utf-8")
-        try:
-            # EEC returns empty body on success
-            return self._make_request(
-                self._events_url,
-                "POST",
-                event_data,
-                extra_headers={"Content-Type": CONTENT_TYPE_JSON, "eec-enrichment": str(eec_enrichment).lower()},
-            ).json()
-        except json.JSONDecodeError:
-            return None
+
+        responses = []
+        batches = divide_logs_into_batches([events] if isinstance(events, dict) else events)
+
+        for batch in batches:
+            try:
+                encoded_batch = json.dumps(batch).encode("utf-8")
+                eec_response = self._make_request(
+                    self._events_url,
+                    "POST",
+                    encoded_batch,
+                    extra_headers={"Content-Type": CONTENT_TYPE_JSON, "eec-enrichment": str(eec_enrichment).lower()},
+                ).json()
+                responses.append(eec_response)
+            except json.JSONDecodeError:
+                responses.append(None)
+
+        return responses
 
     def send_sfm_metrics(self, mint_lines: list[str]) -> MintResponse:
         mint_data = "\n".join(mint_lines).encode("utf-8")
@@ -448,6 +458,46 @@ def divide_into_chunks(iterable: Iterable, chunk_size: int) -> Iterable:
             return
         yield subset
 
+def divide_logs_into_batches(logs: list[dict]):
+    """
+    Yield successive batches from a list of log events, according to sizing limitations
+    imposed by the EEC: 5 MB payload, 50,000 events
+
+    :param logs: The list of log events
+    """
+    events_left = len(logs)
+    events = deque(logs)
+
+    batch = []
+    batch_size = 0
+    batch_items = 0
+
+    while events_left > 0:
+        if batch_items == MAX_LOG_EVENTS_PER_REQUEST:
+            yield batch
+            batch = []
+            batch_size = 0
+            batch_items = 0
+            continue
+
+        event = events.popleft()
+        events_left -= 1
+
+        if event is not None:
+            event = json.dumps(event).encode("utf-8")
+            event_size = len(event)
+
+            if batch_size + event_size >= MAX_LOG_REQUEST_SIZE:
+                yield batch
+                batch = [event]
+                batch_size = event_size
+                batch_items = 1
+            else:
+                batch.append(event)
+                batch_size += event_size
+                batch_items += 1
+    else:
+        yield batch
 
 @dataclass
 class MintResponse:

dynatrace_extension/sdk/extension.py

@@ -9,6 +9,7 @@ import sys
 import threading
 import time
 from argparse import ArgumentParser
+from collections import deque
 from concurrent.futures import ThreadPoolExecutor
 from datetime import datetime, timedelta, timezone
 from enum import Enum
@@ -79,14 +80,15 @@ class DtEventType(str, Enum):
         https://docs.dynatrace.com/docs/dynatrace-api/environment-api/events-v2/post-event
     """
 
+    AVAILABILITY_EVENT = "AVAILABILITY_EVENT"
     CUSTOM_INFO = "CUSTOM_INFO"
     CUSTOM_ALERT = "CUSTOM_ALERT"
     CUSTOM_ANNOTATION = "CUSTOM_ANNOTATION"
     CUSTOM_CONFIGURATION = "CUSTOM_CONFIGURATION"
     CUSTOM_DEPLOYMENT = "CUSTOM_DEPLOYMENT"
-    MARKED_FOR_TERMINATION = "MARKED_FOR_TERMINATION"
     ERROR_EVENT = "ERROR_EVENT"
-    AVAILABILITY_EVENT = "AVAILABILITY_EVENT"
+    MARKED_FOR_TERMINATION = "MARKED_FOR_TERMINATION"
+    PERFORMANCE_EVENT = "PERFORMANCE_EVENT"
     RESOURCE_CONTENTION_EVENT = "RESOURCE_CONTENTION_EVENT"
 
 
@@ -995,14 +997,16 @@ class Extension:
             self._metrics.extend(lines)
 
     def _send_events_internal(self, events: Union[dict, List[dict]]):
-        response = self._client.send_events(events, self.log_event_enrichment)
-        with self._internal_callbacks_results_lock:
-            self._internal_callbacks_results[self._send_events.__name__] = Status(StatusValue.OK)
-            if not response or "error" not in response or "message" not in response["error"]:
-                return
-            self._internal_callbacks_results[self._send_events.__name__] = Status(
-                StatusValue.GENERIC_ERROR, response["error"]["message"]
-            )
+        responses = self._client.send_events(events, self.log_event_enrichment)
+
+        for response in responses:
+            with self._internal_callbacks_results_lock:
+                self._internal_callbacks_results[self._send_events.__name__] = Status(StatusValue.OK)
+                if not response or "error" not in response or "message" not in response["error"]:
+                    return
+                self._internal_callbacks_results[self._send_events.__name__] = Status(
+                    StatusValue.GENERIC_ERROR, response["error"]["message"]
+                )
 
     def _send_events(self, events: Union[dict, List[dict]]):
         self._internal_executor.submit(self._send_events_internal, events)
@@ -1011,9 +1015,8 @@ class Extension:
         self._client.send_dt_event(event)
 
     def get_version(self) -> str:
-        """Return the version of extensions sdk library."""
-
-        return __version__
+        """Return the extension version."""
+        return self.activation_config.version
 
     @property
     def techrule(self) -> str: