diff --git a/CHANGELOG.md b/CHANGELOG.md index 4759cc7e..6749669d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## Pending + +### Fixed +- Core Agent fails to download on newer Mac OS/Apple Silicon (Issue #779) + ## [3.0.0rc1] 2023-09-08 Version 3.0.0 drops support for Python 2.7 and < 3.8, as well as Django < 3.2. diff --git a/src/scout_apm/core/agent/manager.py b/src/scout_apm/core/agent/manager.py index 36faf474..8b0b2a3e 100644 --- a/src/scout_apm/core/agent/manager.py +++ b/src/scout_apm/core/agent/manager.py @@ -167,6 +167,8 @@ def download(self): downloaded = self.download_package() if downloaded: self.untar() + else: + logger.debug("Core Agent download failed: bad http response.") except (OSError, HTTPError): logger.exception("Exception raised while downloading Core Agent") finally: diff --git a/src/scout_apm/core/platform_detection.py b/src/scout_apm/core/platform_detection.py index a5f14003..ac48ca35 100644 --- a/src/scout_apm/core/platform_detection.py +++ b/src/scout_apm/core/platform_detection.py @@ -42,6 +42,10 @@ def get_arch(): return "x86_64" elif arch == "aarch64": return "aarch64" + elif arch == "arm64": + # We treat these as synonymous and name them "aarch64" for consistency + # Mac OS, for example, uses "arm64" + return "aarch64" else: return "unknown" diff --git a/src/scout_apm/core/tracked_request.py b/src/scout_apm/core/tracked_request.py index bd406e5c..a3683a87 100644 --- a/src/scout_apm/core/tracked_request.py +++ b/src/scout_apm/core/tracked_request.py @@ -266,6 +266,7 @@ def annotate(self): def add_allocation_tags(self): if not objtrace.is_extension: + logger.debug("Not adding allocation tags: extension not loaded") return start_allocs = (