Merge branch 'refs/heads/master-priv-log-sunnylink-error' into master-dev-c3

# Conflicts:
#	selfdrive/athena/sunnylinkd.py

selfdrive/athena/athenad.py

@@ -179,7 +179,7 @@ def jsonrpc_handler(end_event: threading.Event) -> None:
       elif "id" in data and ("result" in data or "error" in data):
         log_recv_queue.put_nowait(data)
       else:
-        cloudlog.error("athena.jsonrpc_handler.invalid_request", data=data)
+        cloudlog.event("athena.jsonrpc_handler.invalid_request", error=True, data=data)
         raise Exception("not a valid request or response")
     except queue.Empty:
       pass

selfdrive/athena/sunnylinkd.py

@@ -30,6 +30,7 @@ SUNNYLINK_LOG_ATTR_NAME = "user.sunny.upload"
 params = Params()
 sunnylink_api = SunnylinkApi(params.get("SunnylinkDongleId", encoding='utf-8'))
 def handle_long_poll(ws: WebSocket, exit_event: threading.Event | None) -> None:
+  cloudlog.info("sunnylinkd.handle_long_poll started")
   sm = messaging.SubMaster(['deviceState'])
   end_event = threading.Event()
   comma_prime_cellular_end_event = threading.Event()