dt-extensions-sdk 1.1.11__py3-none-any.whl → 1.1.12__py3-none-any.whl

{dt_extensions_sdk-1.1.11.dist-info → dt_extensions_sdk-1.1.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dt-extensions-sdk
-Version: 1.1.11
+Version: 1.1.12
 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
@@ -18,7 +18,7 @@ Requires-Python: >=3.10
 Provides-Extra: cli
 Requires-Dist: dt-cli>=1.6.13; extra == 'cli'
 Requires-Dist: pyyaml; extra == 'cli'
-Requires-Dist: typer[all]; extra == 'cli'
+Requires-Dist: typer; extra == 'cli'
 Description-Content-Type: text/markdown
 
 # Dynatrace Extensions Python SDK

{dt_extensions_sdk-1.1.11.dist-info → dt_extensions_sdk-1.1.12.dist-info}/RECORD

@@ -1,7 +1,7 @@
-dynatrace_extension/__about__.py,sha256=CG0yZc6B3sWvqcZg92zLklMVRsTrmWxs6iHrC4jKdko,109
+dynatrace_extension/__about__.py,sha256=XQBn893nbChfqgenpRBcrSsmllyosJ-0hLOaYr6NUkM,110
 dynatrace_extension/__init__.py,sha256=BvQuknmA7ti3WJi3zEXZfY7aAxJrie37VNitWICsUvI,752
 dynatrace_extension/cli/__init__.py,sha256=HCboY_eJPoqjFmoPDsBL8Jk6aNvank8K7JpkVrgwzUM,123
-dynatrace_extension/cli/main.py,sha256=FyH3SLed5X4vKGXUdzAJNWp1H8pZ1E6xnOTyQ9BypzQ,16166
+dynatrace_extension/cli/main.py,sha256=wi3xxji3WbVXViebzLCB5UGNSADUcdYUzGI02EYbsaM,16965
 dynatrace_extension/cli/schema.py,sha256=d8wKUodRiaU3hfSZDWVNpD15lBfhmif2oQ-k07IxcaA,3230
 dynatrace_extension/cli/create/__init__.py,sha256=NfyOJCVlxs8dYtfDAMHS1Q5SJTuZcFzOg5rtaI-ZPRE,72
 dynatrace_extension/cli/create/create.py,sha256=apXden2M93MDDDm7aa-Os-AEtUtyKbk_PsS56j32NK4,2708
@@ -16,9 +16,9 @@ dynatrace_extension/cli/create/extension_template/extension_name/__main__.py.tem
 dynatrace_extension/sdk/__init__.py,sha256=RsqQ1heGyCmSK3fhuEKAcxQIRCg4gEK0-eSkIehL5Nc,86
 dynatrace_extension/sdk/activation.py,sha256=goTbT1tD2kn8xfyXFdTy_cTZNcFPJpgbvQM8HOzKECA,1480
 dynatrace_extension/sdk/callback.py,sha256=x1ImFqAhomfqWtoOkQLksWqNlIi_3E3v3TaWhNndauU,6165
-dynatrace_extension/sdk/communication.py,sha256=c92sQ08NWEtC3VhXcw0MZcDpaM9nPcNTtCmBaLCE_zw,16649
+dynatrace_extension/sdk/communication.py,sha256=7N516-6g2IKzmWi_4PFPU_mkz49SG8KTPi7MrRxgTF8,17255
 dynatrace_extension/sdk/event.py,sha256=J261imbFKpxfuAQ6Nfu3RRcsIQKKivy6fme1nww2g-8,388
-dynatrace_extension/sdk/extension.py,sha256=MOmqZ7Rb0rcD9v-zhk4-JO-vCw5h4FMVvuRnSYMckck,40121
+dynatrace_extension/sdk/extension.py,sha256=B79fvNB4KoQ8x5MnEvb9EO4a5xeNBzk3EF1I_8RZ2Nc,40213
 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
@@ -26,8 +26,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=TQ3xcpfwLEYIU1TU65A9OqWqwIKqyO8SSUFeuCvE60Y,14655
-dt_extensions_sdk-1.1.11.dist-info/METADATA,sha256=RJTp4_IuLeAypFDrlhUPm-I1x1Y4vVhBp0lHz-uNfaE,2794
-dt_extensions_sdk-1.1.11.dist-info/WHEEL,sha256=K0BPUNF1N3kQ9olb8aVEtkObePEjdr2JOLT1N83EVws,87
-dt_extensions_sdk-1.1.11.dist-info/entry_points.txt,sha256=pweyOCgENGHjOlT6_kXYaBPOrE3p18K0UettqnNlnoE,55
-dt_extensions_sdk-1.1.11.dist-info/licenses/LICENSE.txt,sha256=3Zihv0lOVYHNfDkJC-tUAU6euP9r2NexsDW4w-zqgVk,1078
-dt_extensions_sdk-1.1.11.dist-info/RECORD,,
+dt_extensions_sdk-1.1.12.dist-info/METADATA,sha256=DK_2-CG9dk8x2V-x2lUUQkOjh2OOg-eH1EW16bNTY8w,2789
+dt_extensions_sdk-1.1.12.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+dt_extensions_sdk-1.1.12.dist-info/entry_points.txt,sha256=pweyOCgENGHjOlT6_kXYaBPOrE3p18K0UettqnNlnoE,55
+dt_extensions_sdk-1.1.12.dist-info/licenses/LICENSE.txt,sha256=3Zihv0lOVYHNfDkJC-tUAU6euP9r2NexsDW4w-zqgVk,1078
+dt_extensions_sdk-1.1.12.dist-info/RECORD,,

{dt_extensions_sdk-1.1.11.dist-info → dt_extensions_sdk-1.1.12.dist-info}/WHEEL

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

dynatrace_extension/__about__.py

@@ -1,4 +1,5 @@
 # SPDX-FileCopyrightText: 2023-present Dynatrace LLC
 #
 # SPDX-License-Identifier: MIT
-__version__ = "1.1.11"
+
+__version__ = "1.1.12"

dynatrace_extension/cli/main.py

@@ -38,6 +38,7 @@ def run(
     fast_check: bool = typer.Option(False, "--fastcheck"),
     local_ingest: bool = typer.Option(False, "--local-ingest"),
     local_ingest_port: int = typer.Option(14499, "--local-ingest-port"),
+    print_metrics: bool = typer.Option(True),
 ):
     """
     Runs an extension, this is used during development to locally run and test an extension
@@ -47,6 +48,7 @@ def run(
     :param fast_check: If true, run a fastcheck and exits
     :param local_ingest: If true, send metrics to localhost:14499 on top of printing them
     :param local_ingest_port: The port to send metrics to, by default this is 14499
+    :param print_metrics: If true, print metrics to the console
     """
 
     # This parses the yaml, which validates it before running
@@ -58,6 +60,8 @@ def run(
         if local_ingest:
             command.append("--local-ingest")
             command.append(f"--local-ingest-port={local_ingest_port}")
+        if not print_metrics:
+            command.append("--no-print-metrics")
         run_process(command, cwd=extension_dir)
     except KeyboardInterrupt:
         console.print("\nRun interrupted with a KeyboardInterrupt, stopping", style="bold yellow")
@@ -79,6 +83,7 @@ def build(
     extra_index_url: Optional[str] = typer.Option(
         None, "--extra-index-url", "-i", help="Extra index url to use when downloading dependencies"
     ),
+    find_links: Optional[str] = typer.Option( None, "--find-links", "-f", help="Extra index url to use when downloading dependencies" ),
 ):
     """
     Builds and signs an extension using the developer fused key-certificate
@@ -90,6 +95,7 @@ def build(
     folder
     :param extra_platforms: Attempt to also download wheels for an extra platform (e.g. manylinux1_x86_64 or win_amd64)
     :param extra_index_url: Extra index url to use when downloading dependencies
+    :param find_links: Extra index url to use when downloading dependencies
     """
     console.print(f"Building and signing extension from {extension_dir} to {target_directory}", style="cyan")
     if target_directory is None:
@@ -98,7 +104,7 @@ def build(
         target_directory.mkdir()
 
     console.print("Stage 1 - Download and build dependencies", style="bold blue")
-    wheel(extension_dir, extra_platforms, extra_index_url)
+    wheel(extension_dir, extra_platforms, extra_index_url, find_links)
 
     console.print("Stage 2 - Create the extension zip file", style="bold blue")
     built_zip = assemble(extension_dir, target_directory)
@@ -163,6 +169,7 @@ def wheel(
     extra_index_url: Optional[str] = typer.Option(
         None, "--extra-index-url", "-i", help="Extra index url to use when downloading dependencies"
     ),
+    find_links: Optional[str] = typer.Option( None, "--find-links", "-f", help="Extra index url to use when downloading dependencies" ),
 ):
     """
     Builds the extension and it's dependencies into wheel files
@@ -171,6 +178,7 @@ def wheel(
     :param extension_dir: The directory of the extension, by default this is the current directory
     :param extra_platforms: Attempt to also download wheels for an extra platform (e.g. manylinux1_x86_64 or win_amd64)
     :param extra_index_url: Extra index url to use when downloading dependencies
+    :param find_links: Extra index url to use when downloading dependencies
     """
     relative_lib_folder_dir = "extension/lib"
     lib_folder: Path = extension_dir / relative_lib_folder_dir
@@ -182,6 +190,8 @@ def wheel(
     command = [sys.executable, "-m", "pip", "wheel", "-w", relative_lib_folder_dir]
     if extra_index_url is not None:
         command.extend(["--extra-index-url", extra_index_url])
+    if find_links is not None:
+        command.extend(["--find-links", find_links])
     command.append(".")
     run_process(command, cwd=extension_dir)
 
@@ -201,6 +211,8 @@ def wheel(
             ]
             if extra_index_url:
                 command.extend(["--extra-index-url", extra_index_url])
+            if find_links:
+                command.extend(["--find-links", find_links])
             command.append(".")
 
             run_process(command, cwd=extension_dir)

dynatrace_extension/sdk/communication.py

@@ -6,7 +6,9 @@ from __future__ import annotations
 
 import json
 import logging
+import random
 import sys
+import time
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 from enum import Enum
@@ -114,8 +116,6 @@ class HttpClient(CommunicationClient):
     """
 
     def __init__(self, base_url: str, datasource_id: str, id_token_file_path: str, logger: logging.Logger):
-        # TODO - Do we need to replace 127.0.0.1 with localhost?
-
         self._activation_config_url = f"{base_url}/userconfig/{datasource_id}"
         self._extension_config_url = f"{base_url}/extconfig/{datasource_id}"
         self._metric_url = f"{base_url}/mint/{datasource_id}"
@@ -324,6 +324,7 @@ class DebugClient(CommunicationClient):
         logger: logging.Logger,
         local_ingest: bool = False,
         local_ingest_port: int = 14499,
+        print_metrics: bool = True
     ):
         self.activation_config = {}
         if activation_config_path and Path(activation_config_path).exists():
@@ -339,6 +340,7 @@ class DebugClient(CommunicationClient):
         self.logger = logger
         self.local_ingest = local_ingest
         self.local_ingest_port = local_ingest_port
+        self.print_metrics = print_metrics
 
     def get_activation_config(self) -> dict:
         return self.activation_config
@@ -386,23 +388,36 @@ class DebugClient(CommunicationClient):
         return self.send_status(Status())
 
     def send_metrics(self, mint_lines: list[str]) -> list[MintResponse]:
+        total_lines = len(mint_lines)
+        lines_sent = 0
+
+        self.logger.info(f"Start sending {total_lines} metrics to the EEC")
+
         responses = []
-        for line in mint_lines:
-            self.logger.info(f"send_metric: {line}")
 
-        if self.local_ingest:
-            mint_data = "\n".join(mint_lines).encode("utf-8")
-            response = request(
-                "POST",
-                f"http://localhost:{self.local_ingest_port}/metrics/ingest",
-                body=mint_data,
-                headers={"Content-Type": CONTENT_TYPE_PLAIN},
-            ).json()
-            mint_response = MintResponse.from_json(response)
-            responses.append(mint_response)
+        chunks = divide_into_chunks(mint_lines, MAX_MINT_LINES_PER_REQUEST)
+        for chunk in chunks:
+            lines_in_chunk = len(chunk)
+            lines_sent += lines_in_chunk
+            self.logger.debug(f"Sending chunk with {lines_in_chunk} metric lines. ({lines_sent}/{total_lines})")
+
+            if self.local_ingest:
+                mint_data = "\n".join(chunk).encode("utf-8")
+                response = request(
+                    "POST",
+                    f"http://localhost:{self.local_ingest_port}/metrics/ingest",
+                    body=mint_data,
+                    headers={"Content-Type": CONTENT_TYPE_PLAIN},
+                ).json()
+                mint_response = MintResponse.from_json(response)
+                responses.append(mint_response)
+            else:
+                if self.print_metrics:
+                    for line in mint_lines:
+                        self.logger.info(f"send_metric: {line}")
 
-        if not responses:
-            responses = [MintResponse(lines_invalid=0, lines_ok=len(mint_lines), error=None, warnings=None)]
+                response = MintResponse(lines_invalid=0, lines_ok=len(chunk), error=None, warnings=None)
+                responses.append(response)
         return responses
 
     def send_events(self, events: dict | list[dict], eec_enrichment: bool = True) -> dict | None:

dynatrace_extension/sdk/extension.py

@@ -159,8 +159,6 @@ class Extension:
         if hasattr(self, "logger"):
             return
 
-        # TODO - Move the logging implementation to its own file
-        # TODO - Add sfm logging
         self.logger = extension_logger
 
         self.extension_config: str = ""
@@ -313,7 +311,6 @@ class Extension:
         api_logger.debug(f"Scheduling callback {callback}")
 
         # These properties are updated after the extension starts
-        # TODO - These should be part of an ext singleton object instead
         callback.cluster_time_diff = self._cluster_time_diff
         callback.running_in_sim = self._running_in_sim
         self._scheduled_callbacks.append(callback)
@@ -698,14 +695,21 @@ class Extension:
         # Debug parameters, these are used when running the extension locally
         parser.add_argument("--extensionconfig", required=False, default=None)
         parser.add_argument("--activationconfig", required=False, default="activation.json")
+        parser.add_argument("--no-print-metrics", required=False, action="store_true")
 
         args, unknown = parser.parse_known_args()
         self._is_fastcheck = args.fastcheck
         if args.dsid is None:
             # DEV mode
             self._running_in_sim = True
+            print_metrics = not args.no_print_metrics
             self._client = DebugClient(
-                args.activationconfig, args.extensionconfig, api_logger, args.local_ingest, args.local_ingest_port
+                activation_config_path=args.activationconfig,
+                extension_config_path=args.extensionconfig,
+                logger=api_logger,
+                local_ingest=args.local_ingest,
+                local_ingest_port=args.local_ingest_port,
+                print_metrics=print_metrics
             )
             RuntimeProperties.set_default_log_level(args.loglevel)
         else:
@@ -810,23 +814,22 @@ class Extension:
         self._scheduler.enter(SFM_METRIC_SENDING_INTERVAL.total_seconds(), 1, self._sfm_metrics_iteration)
 
     def _send_metrics(self):
-        # TODO - we might need to check size and number of lines before sending
-        # Maybe break it down into multiple packets
-        with self._metrics_lock and self._internal_callbacks_results_lock:
-            if self._metrics:
-                number_of_metrics = len(self._metrics)
-                responses = self._client.send_metrics(self._metrics)
-
-                self._internal_callbacks_results[self._send_metrics.__name__] = Status(StatusValue.OK)
-                lines_invalid = sum(response.lines_invalid for response in responses)
-                if lines_invalid > 0:
-                    message = f"{lines_invalid} invalid metric lines found"
-                    self._internal_callbacks_results[self._send_metrics.__name__] = Status(
-                        StatusValue.GENERIC_ERROR, message
-                    )
-
-                api_logger.info(f"Sent {number_of_metrics} metric lines to EEC: {responses}")
-                self._metrics = []
+        with self._metrics_lock:
+            with self._internal_callbacks_results_lock:
+                if self._metrics:
+                    number_of_metrics = len(self._metrics)
+                    responses = self._client.send_metrics(self._metrics)
+
+                    self._internal_callbacks_results[self._send_metrics.__name__] = Status(StatusValue.OK)
+                    lines_invalid = sum(response.lines_invalid for response in responses)
+                    if lines_invalid > 0:
+                        message = f"{lines_invalid} invalid metric lines found"
+                        self._internal_callbacks_results[self._send_metrics.__name__] = Status(
+                            StatusValue.GENERIC_ERROR, message
+                        )
+
+                    api_logger.info(f"Sent {number_of_metrics} metric lines to EEC: {responses}")
+                    self._metrics = []
 
     def _prepare_sfm_metrics(self) -> List[str]:
         """Prepare self monitoring metrics.