addressing all comments

ackdav · ackdav · commit 213ee75e41ef · 2025-02-07T13:09:03.000+01:00
diff --git a/localstack-core/localstack/utils/analytics/metadata.py b/localstack-core/localstack/utils/analytics/metadata.py
@@ -53,8 +53,6 @@ def get_version_string() -> str:
 
 
 def read_client_metadata() -> ClientMetadata:
-    runtime = get_current_runtime()
-
     return ClientMetadata(
         session_id=get_session_id(),
         machine_id=get_machine_id(),
@@ -64,7 +62,7 @@ def read_client_metadata() -> ClientMetadata:
         is_ci=os.getenv("CI") is not None,
         is_docker=config.is_in_docker,
         is_testing=config.is_local_test_mode(),
-        product=os.getenv("LOCALSTACK_TELEMETRY_PRODUCT") or runtime.components.name or "unknown",
+        product=get_localstack_product(),
         edition=os.getenv("LOCALSTACK_TELEMETRY_EDITION") or get_localstack_edition(),
     )
 
@@ -127,6 +125,18 @@ def get_localstack_edition() -> str:
     return version_file.removesuffix("-version").removeprefix(".") if version_file else "unknown"
 
 
+def get_localstack_product() -> str:
+    """
+    Returns the telemetry product name from the env var, runtime, or "unknown".
+    """
+    try:
+        runtime_product = get_current_runtime().components.name
+    except ValueError:
+        runtime_product = None
+
+    return os.getenv("LOCALSTACK_TELEMETRY_PRODUCT") or runtime_product or "unknown"
+
+
 def is_license_activated() -> bool:
     try:
         from localstack.pro.core import config  # noqa
diff --git a/tests/unit/utils/analytics/conftest.py b/tests/unit/utils/analytics/conftest.py
@@ -1,7 +1,7 @@
 import pytest
 
 from localstack import config
-from localstack.runtime.current import set_current_runtime
+from localstack.runtime.current import get_current_runtime, set_current_runtime
 
 
 @pytest.fixture(autouse=True)
@@ -20,7 +20,12 @@ class MockRuntime:
 
 @pytest.fixture(autouse=True)
 def mock_runtime():
-    runtime = MockRuntime()
-    set_current_runtime(runtime)
-    yield
-    set_current_runtime(None)
+    try:
+        # don't do anything if a runtime is set
+        get_current_runtime()
+        yield
+    except ValueError:
+        # set a mock runtime if no runtime is set
+        set_current_runtime(MockRuntime())
+        yield
+        set_current_runtime(None)
