add sm.requestIdentity.DeviceID to debug log for reliable ack

teslamotors · Feb 18, 2025 · 25194bb · 25194bb
1 parent 8fb69f7
commit 25194bb
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/server/streaming/socket.go b/server/streaming/socket.go
@@ -293,10 +293,9 @@ func (sm *SocketManager) processRecord(record *telemetry.Record) {
 func (sm *SocketManager) respondToVehicle(record *telemetry.Record, err error) {
 	var response []byte
 
-	logInfo := logrus.LogInfo{"txid": record.Txid, "record_type": record.TxType}
+	logInfo := logrus.LogInfo{"txid": record.Txid, "record_type": record.TxType, "client_id": sm.requestIdentity.DeviceID}
 
 	if err != nil {
-		logInfo["client_id"] = sm.requestIdentity.DeviceID
 		sm.logger.ErrorLog("unexpected_record", err, logInfo)
 		metricsRegistry.unexpectedRecordErrorCount.Inc(map[string]string{})
 		response = record.Error(errors.New("incorrect message format"))
@@ -326,7 +325,7 @@ func (sm *SocketManager) writer() {
 			err := sm.writeMessage(msg.MsgType, msg.Msg)
 			if err != nil {
 				metricsRegistry.socketErrorCount.Inc(map[string]string{})
-				sm.logger.ErrorLog("socket_err", err, nil)
+				sm.logger.ErrorLog("socket_err", err, logrus.LogInfo{"client_id": sm.requestIdentity.DeviceID})
 				return
 			}
 		}