From ff4550c2ea21e1627753ef40d313f87bbcc62c3f Mon Sep 17 00:00:00 2001
From: Tim Cowlishaw <tim@timcowlishaw.co.uk>
Date: Thu, 26 Oct 2023 13:16:58 +0200
Subject: [PATCH] add device id when logging breadcrumbs for errors in mqtt

---
 app/lib/mqtt_messages_handler.rb | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/lib/mqtt_messages_handler.rb b/app/lib/mqtt_messages_handler.rb
index 0ce7f0fb..cda67471 100644
--- a/app/lib/mqtt_messages_handler.rb
+++ b/app/lib/mqtt_messages_handler.rb
@@ -23,7 +23,7 @@ def self.handle_topic(topic, message)
     return if device.nil?
 
     if topic.to_s.include?('raw')
-      handle_readings(device, parse_raw_readings(message))
+      handle_readings(device, parse_raw_readings(message, device.id))
     elsif topic.to_s.include?('readings')
       handle_readings(device, message)
     elsif topic.to_s.include?('info')
@@ -31,7 +31,12 @@ def self.handle_topic(topic, message)
       crumb = Sentry::Breadcrumb.new(
         category: "MqttMessagesHandler.handle_topic",
         message: "Parsing info message",
-        data: { topic: topic, message: message, json: json_message }
+        data: {
+          topic: topic,
+          message: message,
+          json: json_message,
+          device_id: device.id
+        }
       )
       Sentry.add_breadcrumb(crumb)
       device.update hardware_info: json_message
@@ -53,11 +58,11 @@ def self.handle_readings(device, message)
   end
 
   # takes a raw packet and converts into JSON
-  def self.parse_raw_readings(message)
+  def self.parse_raw_readings(message, device_id=nil)
     crumb = Sentry::Breadcrumb.new(
       category: "MqttMessagesHandler.parse_raw_readings",
       message: "Parsing raw readings",
-      data: { message: message }
+      data: { message: message, device_id: device_id }
     )
     Sentry.add_breadcrumb(crumb)
     clean_tm = message[1..-2].split(",")[0].gsub("t:", "").strip
@@ -74,7 +79,7 @@ def self.parse_raw_readings(message)
     crumb = Sentry::Breadcrumb.new(
       category: "MqttMessagesHandler.parse_raw_readings",
       message: "Readings data constructed",
-      data: { message: message, reading: reading }
+      data: { message: message, reading: reading, device_id: device_id }
     )
     Sentry.add_breadcrumb(crumb)