openmodule 14.0.3__tar.gz → 14.0.4__tar.gz

{openmodule-14.0.3 → openmodule-14.0.4}/ChangeLog

@@ -1,6 +1,11 @@
 CHANGES
 =======
 
+v14.0.4
+-------
+
+* OM-945 Fix Trace parent in ZMQMessage
+
 v14.0.3
 -------
 
@@ -169,8 +174,6 @@ v12.0.0.rc0
 * fixed testcases and removed backend (deprecated in v11)
 * newer settings-models
 * settings models update
-* made gate\_control/day\_mode have no scope
-* schedule exports utility
 
 v11.1.1
 -------
@@ -198,10 +201,8 @@ v11.0.2
 * Update database.md [skip ci]
 * Update database.md [skip ci]
 * Update database.md [skip ci]
-* Update database.md [skip ci]
 * Major Refactoring and many new functionality (v2 parking system refactor and redesign)
 
 v10.0.5
 -------
 
-* fixed problem in presence listener

{openmodule-14.0.3/openmodule.egg-info → openmodule-14.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openmodule
-Version: 14.0.3
+Version: 14.0.4
 Summary: Libraries for developing the arivo openmodule
 Home-page: https://gitlab.com/arivo-public/device-python/openmodule.git
 Author: ARIVO

{openmodule-14.0.3 → openmodule-14.0.4}/docs/known_issues.md

@@ -5,7 +5,20 @@ version. The changelog may contain many other notes aswell.
 
 The version numbers below always note the _version through which the issue was fixed_.
 
+## 14.0.4
+
+* fixed ZMQMessage using `sentry-trace` and `baggage` from wrong sentry span
+
+## 14.0.3
+
+* fixed not traced topics (io) using sentry scope from different thread leading to possible race condition
+
+## 14.0.2
+
+* fixed sentry trace for multithreaded `MessageDispatcher` and `RPCServer`
+
 ## 13.6.0
+
 * fixed message dispatcher trying to handle messages after shutdown was called
 
 ## 13.1.2

{openmodule-14.0.3 → openmodule-14.0.4}/openmodule/models/base.py

@@ -139,14 +139,16 @@ class ZMQMessage(OpenModuleModel):
     timestamp: datetime = Field(default_factory=lambda: datetime.utcnow())
     name: str = Field(default_factory=lambda: settings.NAME)
     type: str
-    baggage: Optional[str] = Field(default_factory=sentry.get_baggage)
-    sentry_trace: Optional[str] = Field(default_factory=sentry.get_traceparent, alias="sentry-trace")
+    baggage: Optional[str] = None
+    sentry_trace: Optional[str] = Field(default=None, alias="sentry-trace")
 
     _tz_timestamp = timezone_validator("timestamp")
 
     def publish_on_topic(self, pub_socket: zmq.Socket, topic: str):
         assert isinstance(topic, str), "topic must be a string"
 
+        self.baggage = sentry.get_baggage()
+        self.sentry_trace = sentry.get_traceparent()
         pub_socket.send_multipart((topic.encode("utf8"), self.json_bytes()))
 
     def dict(self, **kwargs):

{openmodule-14.0.3 → openmodule-14.0.4/openmodule.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openmodule
-Version: 14.0.3
+Version: 14.0.4
 Summary: Libraries for developing the arivo openmodule
 Home-page: https://gitlab.com/arivo-public/device-python/openmodule.git
 Author: ARIVO

openmodule-14.0.4/openmodule.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "3d9ddfd", "is_release": true}

{openmodule-14.0.3 → openmodule-14.0.4}/tests/test_model.py

@@ -137,8 +137,7 @@ class ZMQMessageTestCase(TestCase):
         self.assertEqual(res3, res4)
 
         res1.pop("timestamp")
-        sentry_trace = sentry.get_traceparent()
-        self.assertDictEqual(res1, {"name": "tä\nst", "type": "tö\tst", "sentry-trace": sentry_trace})
+        self.assertDictEqual(res1, {"name": "tä\nst", "type": "tö\tst"})
 
 
 class CostEntryDataTextCase(TestCase):

{openmodule-14.0.3 → openmodule-14.0.4}/tests/test_sentry.py

@@ -533,15 +533,27 @@ class SentryUtilsTestCase(SentryTestMixin):
         sentry.init_sentry("http://test@test/1")
 
     def test_zmq_message_fields(self):
+        zmq_socket = mock.MagicMock()
+        message = ZMQMessage(type="test")
+        self.assertIsNone(message.sentry_trace)
+        self.assertIsNone(message.baggage)
         with sentry.trace("test", sampled=True):
-            msg = ZMQMessage(type="test")
-        json_data = msg.json_bytes()
-        self.assertIn(b'"sentry-trace":', json_data)
-        self.assertIn(b'"baggage":', json_data)
+            message.publish_on_topic(zmq_socket, "test")
+            traceparent = sentry.get_traceparent()
+            baggage = sentry.get_baggage()
+            self.assertEqual(message.sentry_trace, traceparent)
+            self.assertEqual(message.baggage, baggage)
+            self.assertIsNotNone(message.sentry_trace)
+            self.assertIsNotNone(message.baggage)
+        sent_message = json.loads(zmq_socket.send_multipart.call_args[0][0][1])
+        self.assertEqual(sent_message["sentry-trace"], traceparent)
+        self.assertEqual(sent_message["baggage"], baggage)
 
     def test_continue_from_zmq_message(self):
+        zmq_socket = mock.MagicMock()
         with sentry.trace("test", sampled=True):
             msg = ZMQMessage(type="test_type")
+            msg.publish_on_topic(zmq_socket, "topic_test")
             trace_id = sentry_sdk.get_current_span().trace_id
         msg_data = json.loads(msg.json_bytes())
         with sentry.continue_trace_zmq_message_process("topic_test", msg_data):

openmodule-14.0.3/openmodule.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "03b80ec", "is_release": true}