Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/sentry/debug/utils/packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def get_package_version(module_name, app):

def get_all_package_versions():
packages = {}
for module_name, app in sys.modules.items():
for module_name, app in sys.modules.copy().items():
# ignore items that look like submodules
if "." in module_name:
continue
Expand Down
20 changes: 20 additions & 0 deletions tests/sentry/tasks/test_beacon.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import platform
from datetime import timedelta
from importlib.metadata import PackageNotFoundError
from types import SimpleNamespace
from unittest.mock import patch
from uuid import uuid4
Expand All @@ -10,6 +11,7 @@
import sentry
from sentry import options
from sentry.constants import DataCategory
from sentry.debug.utils.packages import get_all_package_versions
from sentry.models.broadcast import Broadcast
from sentry.tasks.beacon import BEACON_URL, send_beacon, send_beacon_metric
from sentry.testutils.cases import OutcomesSnubaTest
Expand All @@ -18,6 +20,24 @@
from sentry.utils.outcomes import Outcome


def test_get_all_package_versions_with_imports() -> None:
modules = {}

def get_version() -> str:
modules["bar"] = SimpleNamespace(__version__="2.0")
return "1.0"

modules["foo"] = SimpleNamespace(get_version=get_version)
with (
patch("sentry.debug.utils.packages.sys", modules=modules, version_info=(3, 13, 0)),
patch(
"sentry.debug.utils.packages.importlib.metadata.version",
side_effect=PackageNotFoundError,
),
):
assert get_all_package_versions() == {"foo": "1.0", "sys": "3.13.0"}


@no_silo_test
@patch("psutil.cpu_count", return_value=8)
@patch("psutil.cpu_percent", return_value=50)
Expand Down
Loading