test that passes locally but will fail in CI

Author: pauldambra

posthog/client.py

@@ -10,6 +10,7 @@
 
 from dateutil.tz import tzutc
 from six import string_types
+import distro  # For Linux OS detection
 
 from posthog.consumer import Consumer
 from posthog.exception_capture import ExceptionCapture
@@ -38,55 +39,31 @@ def get_os_info():
     os_name = ""
     os_version = ""
 
-    # Windows
     if sys.platform.startswith("win"):
         os_name = "Windows"
         if hasattr(platform, "win32_ver"):
             win_version = platform.win32_ver()[0]
             if win_version:
                 os_version = win_version
 
-    # macOS/Mac OS X
     elif sys.platform == "darwin":
         os_name = "Mac OS X"
         if hasattr(platform, "mac_ver"):
             mac_version = platform.mac_ver()[0]
             if mac_version:
                 os_version = mac_version
 
-    # iOS (unlikely in standard Python but included for completeness)
-    elif sys.platform == "ios":
-        os_name = "iOS"
-        # iOS version would need a specific approach
-
-    # Linux
     elif sys.platform.startswith("linux"):
         os_name = "Linux"
-        if hasattr(platform, "linux_distribution"):
-            # Deprecated in Python 3.8+
-            try:
-                linux_info = platform.linux_distribution()
-                if linux_info[0] and linux_info[1]:
-                    os_version = linux_info[1]
-            except:
-                pass
-        # For newer Python versions
-        try:
-            import distro
+        linux_info = distro.info()
+        if linux_info["version"]:
+            os_version = linux_info["version"]
 
-            linux_info = distro.info()
-            if linux_info["version"]:
-                os_version = linux_info["version"]
-        except ImportError:
-            pass
-
-    # FreeBSD
     elif sys.platform.startswith("freebsd"):
         os_name = "FreeBSD"
         if hasattr(platform, "release"):
             os_version = platform.release()
 
-    # Other platforms
     else:
         os_name = sys.platform
         if hasattr(platform, "release"):
@@ -308,11 +285,13 @@ def capture(
                 stacklevel=2,
             )
 
-        properties = properties or {}
+        properties = {**(properties or {}), **system_context()}
+
         require("distinct_id", distinct_id, ID_TYPES)
         require("properties", properties, dict)
         require("event", event, string_types)
 
+
         msg = {
             "properties": properties,
             "timestamp": timestamp,
@@ -347,7 +326,7 @@ def capture(
             extra_properties["$active_feature_flags"] = active_feature_flags
 
         if extra_properties:
-            msg["properties"] = {**extra_properties, **msg["properties"], **system_context()}
+            msg["properties"] = {**extra_properties, **msg["properties"]}
 
         return self._enqueue(msg, disable_geoip)
 

posthog/test/test_client.py

@@ -55,9 +55,9 @@ def test_basic_capture(self):
         self.assertEqual(msg["properties"]["$lib"], "posthog-python")
         self.assertEqual(msg["properties"]["$lib_version"], VERSION)
         assert msg["properties"]["$python_runtime"] == "CPython"
-        assert msg["properties"]["$python_version"] == "3.12.4"
-        assert msg["properties"]["$os"] == "macOS"
-        assert msg["properties"]["$os_version"] == "14.5.0"
+        assert msg["properties"]["$python_version"] == "3.11.11"
+        assert msg["properties"]["$os"] == "Mac OS X"
+        assert msg["properties"]["$os_version"] == "15.3.1"
 
     def test_basic_capture_with_uuid(self):
         client = self.client

setup.py

@@ -20,6 +20,7 @@
     "monotonic>=1.5",
     "backoff>=1.10.0",
     "python-dateutil>2.1",
+    "distro>=1.5.0",  # Required for Linux OS detection in Python 3.9+
 ]
 
 extras_require = {