dt-extensions-sdk 1.2.12__py3-none-any.whl → 1.2.14__py3-none-any.whl

{dt_extensions_sdk-1.2.12.dist-info → dt_extensions_sdk-1.2.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dt-extensions-sdk
-Version: 1.2.12
+Version: 1.2.14
 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.2.12.dist-info → dt_extensions_sdk-1.2.14.dist-info}/RECORD

@@ -1,7 +1,7 @@
-dynatrace_extension/__about__.py,sha256=XXsAgemtZwbUO0AhD1CmlC4_yXuhchOMlNxq3vKfdYE,110
+dynatrace_extension/__about__.py,sha256=OAg8p7JkpTB4TTezDDuRFRD-dX4xumJyns-GLgyZaOw,111
 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
+dynatrace_extension/cli/main.py,sha256=qv6BRgoyvhThhRh64OzL6OYHSLoxiJgWlZIxUDxKX4E,17995
 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,19 +16,19 @@ 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=PNRvOVzNpKvpsa0wCf7HRDkfo3wMsF2otVWI9a1AAkU,6307
-dynatrace_extension/sdk/communication.py,sha256=gD4GOHOzWdRL_KrUWtC2s8-Jp8Csn5gjZl4mHO5Lk_4,17739
+dynatrace_extension/sdk/communication.py,sha256=lPUKxAq3mO8cO1ye79p9nuxYL-_cG6G4cJRzBZxD64w,17792
 dynatrace_extension/sdk/event.py,sha256=J261imbFKpxfuAQ6Nfu3RRcsIQKKivy6fme1nww2g-8,388
-dynatrace_extension/sdk/extension.py,sha256=rmYF9vzA75JKvLPCr_r48EPhNz_AzWMuvlX2gmlxsIY,42808
+dynatrace_extension/sdk/extension.py,sha256=2H86BhYwuLGs35c522TgMHBiBJcc_qXcQO-AxGHp2x4,42816
 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
-dynatrace_extension/sdk/snapshot.py,sha256=UZgSHEIo4t5AJGU2xSTenJkAfKAxue0MORhQL8pC5pc,6815
+dynatrace_extension/sdk/snapshot.py,sha256=0Zx4lmhanoLvfvMTnkxWfcIsx2VUDm99FAqV0XZHoLA,7100
 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.2.12.dist-info/METADATA,sha256=7GTgqEmmkq264DO4SA20uIjxc5J1EKqe6W-6J4ZDB0k,2686
-dt_extensions_sdk-1.2.12.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-dt_extensions_sdk-1.2.12.dist-info/entry_points.txt,sha256=pweyOCgENGHjOlT6_kXYaBPOrE3p18K0UettqnNlnoE,55
-dt_extensions_sdk-1.2.12.dist-info/licenses/LICENSE.txt,sha256=3Zihv0lOVYHNfDkJC-tUAU6euP9r2NexsDW4w-zqgVk,1078
-dt_extensions_sdk-1.2.12.dist-info/RECORD,,
+dt_extensions_sdk-1.2.14.dist-info/METADATA,sha256=RCVLQM2azU7CLaL0G507ojhkDVPlqpFJwShuCAKv1BY,2686
+dt_extensions_sdk-1.2.14.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+dt_extensions_sdk-1.2.14.dist-info/entry_points.txt,sha256=pweyOCgENGHjOlT6_kXYaBPOrE3p18K0UettqnNlnoE,55
+dt_extensions_sdk-1.2.14.dist-info/licenses/LICENSE.txt,sha256=3Zihv0lOVYHNfDkJC-tUAU6euP9r2NexsDW4w-zqgVk,1078
+dt_extensions_sdk-1.2.14.dist-info/RECORD,,

dynatrace_extension/__about__.py

@@ -2,4 +2,5 @@
 #
 # SPDX-License-Identifier: MIT
 
-__version__ = "1.2.12"
+
+__version__ = "1.2.14"

dynatrace_extension/cli/main.py

@@ -91,6 +91,12 @@ def build(
     find_links: Optional[str] = typer.Option(
         None, "--find-links", "-f", help="Extra index url to use when downloading dependencies"
     ),
+    only_extra_platforms: Optional[bool] = typer.Option(
+        False,
+        "--only-extra-platforms",
+        "-o",
+        help="Only build for the extra platforms, useful when building from arm64 (mac)",
+    ),
 ):
     """
     Builds and signs an extension using the developer fused key-certificate
@@ -103,6 +109,7 @@ def build(
     :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
+    :param only_extra_platforms: If true, only build for the extra platforms, useful when building from arm64
     """
     console.print(f"Building and signing extension from {extension_dir} to {target_directory}", style="cyan")
     if target_directory is None:
@@ -111,7 +118,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, find_links)
+    wheel(extension_dir, extra_platforms, extra_index_url, find_links, only_extra_platforms)
 
     console.print("Stage 2 - Create the extension zip file", style="bold blue")
     built_zip = assemble(extension_dir, target_directory)
@@ -179,6 +186,12 @@ def wheel(
     find_links: Optional[str] = typer.Option(
         None, "--find-links", "-f", help="Extra index url to use when downloading dependencies"
     ),
+    only_extra_platforms: Optional[bool] = typer.Option(
+        False,
+        "--only-extra-platforms",
+        "-o",
+        help="Only build for the extra platforms, useful when building from arm64 (mac)",
+    ),
 ):
     """
     Builds the extension and it's dependencies into wheel files
@@ -188,6 +201,7 @@ def wheel(
     :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
+    :param only_extra_platforms: If true, only build for the extra platforms, useful when building from arm64
     """
     relative_lib_folder_dir = "extension/lib"
     lib_folder: Path = extension_dir / relative_lib_folder_dir
@@ -201,6 +215,8 @@ def wheel(
         command.extend(["--extra-index-url", extra_index_url])
     if find_links is not None:
         command.extend(["--find-links", find_links])
+    if only_extra_platforms:
+        command.append("--no-deps")
     command.append(".")
     run_process(command, cwd=extension_dir)
 

dynatrace_extension/sdk/communication.py

@@ -397,17 +397,18 @@ class DebugClient(CommunicationClient):
 
         batches = divide_into_batches(mint_lines, MAX_METRIC_REQUEST_SIZE)
         for batch in batches:
+            lines = json.loads(batch)
             if self.local_ingest:
                 response = request(
                     "POST",
                     f"http://localhost:{self.local_ingest_port}/metrics/ingest",
-                    body=batch,
+                    body="\n".join(lines).encode(),
                     headers={"Content-Type": CONTENT_TYPE_PLAIN},
                 ).json()
                 mint_response = MintResponse.from_json(response)
                 responses.append(mint_response)
             elif self.print_metrics:
-                for line in mint_lines:
+                for line in lines:
                     self.logger.info(f"send_metric: {line}")
 
         return responses

dynatrace_extension/sdk/extension.py

@@ -748,6 +748,7 @@ class Extension:
 
         if not self._is_fastcheck:
             try:
+                self._heartbeat_iteration()
                 self.initialize()
                 if not self.is_helper:
                     self.schedule(self.query, timedelta(minutes=1))
@@ -813,7 +814,6 @@ class Extension:
         # These were scheduled before the extension started, schedule them now
         for callback in self._scheduled_callbacks_before_run:
             self._schedule_callback(callback)
-        self._heartbeat_iteration()
         self._metrics_iteration()
         self._sfm_metrics_iteration()
         self._timediff_iteration()

dynatrace_extension/sdk/snapshot.py

@@ -193,6 +193,12 @@ def find_log_dir() -> Path:
         for line in f:
             if line.startswith("LogDir"):
                 log_dir = line.split("=")[1].strip()
+                if not log_dir:
+                    return (
+                        Path(os.path.expandvars("%PROGRAMDATA%") + "/dynatrace/oneagent/log")
+                        if os.name == "nt"
+                        else Path("/var/log/dynatrace/oneagent")
+                    )
                 return Path(log_dir)
     msg = f"Could not find LogDir in {installation_conf}"
     raise Exception(msg)