From 66e82374036ee585a5c3f125617901813a5df703 Mon Sep 17 00:00:00 2001
From: Daniel McKnight <daniel@neon.ai>
Date: Fri, 20 Sep 2024 15:17:51 -0700
Subject: [PATCH] Update neon-utils to resolve deprecation warnings Configure
 signal methods to skip patching now-deprecated FS signal handling Update
 `send_diagnostics` to avoid calling deprecated function

---
 docker_overlay/etc/neon/neon.yaml        |  5 ++++-
 neon_core/configuration/mark_2/neon.yaml |  1 +
 neon_core/configuration/neon.yaml        |  2 +-
 neon_core/util/diagnostic_utils.py       | 11 +++++++----
 requirements/requirements.txt            |  2 +-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/docker_overlay/etc/neon/neon.yaml b/docker_overlay/etc/neon/neon.yaml
index 146181190..0a4e62b78 100644
--- a/docker_overlay/etc/neon/neon.yaml
+++ b/docker_overlay/etc/neon/neon.yaml
@@ -41,4 +41,7 @@ play_wav_cmdline: "play %1"
 play_mp3_cmdline: "play %1"
 play_ogg_cmdline: "play %1"
 ready_settings:
-  - skills
\ No newline at end of file
+  - skills
+signal:
+  use_signal_files: false
+  patch_imports: false
\ No newline at end of file
diff --git a/neon_core/configuration/mark_2/neon.yaml b/neon_core/configuration/mark_2/neon.yaml
index 500482db9..bf816abdf 100644
--- a/neon_core/configuration/mark_2/neon.yaml
+++ b/neon_core/configuration/mark_2/neon.yaml
@@ -81,6 +81,7 @@ gui:
     homescreen_supported: true
 signal:
   use_signal_files: false
+  patch_imports: false
 skills:
   common_query:
     extension_time: 5
diff --git a/neon_core/configuration/neon.yaml b/neon_core/configuration/neon.yaml
index ca9e00d61..5c1b3e7c9 100644
--- a/neon_core/configuration/neon.yaml
+++ b/neon_core/configuration/neon.yaml
@@ -231,7 +231,7 @@ MQ:
 hana:
   url: "https://hana.neonaiservices.com"
 signal:
-  use_signal_files: true
+  use_signal_files: false
   max_wait_seconds: 300
 
 # Logging Config
diff --git a/neon_core/util/diagnostic_utils.py b/neon_core/util/diagnostic_utils.py
index 0c6eb9d21..3b6421de4 100644
--- a/neon_core/util/diagnostic_utils.py
+++ b/neon_core/util/diagnostic_utils.py
@@ -33,10 +33,11 @@
 from os.path import join, isfile, basename, splitext
 from json_database import xdg_data_home, xdg_config_home
 
-from neon_utils import LOG
-from neon_utils.metrics_utils import report_metric
+from ovos_utils.log import LOG
 from neon_utils.configuration_utils import NGIConfig
 
+from ovos_bus_client.message import Message
+from ovos_bus_client.util import get_mycroft_bus
 from ovos_config.config import Configuration
 
 
@@ -111,10 +112,12 @@ def send_diagnostics(allow_logs=True, allow_transcripts=True, allow_config=True)
     # else:
     transcripts = None
 
-    data = {"host": socket.gethostname(),
+    data = {"name": "diagnostics",
+            "host": socket.gethostname(),
             "startup": startup_text,
             "configurations": json.dumps(configs) if configs else None,
             "logs": json.dumps(logs) if logs else None,
             "transcripts": transcripts}
-    report_metric("diagnostics", **data)
+    bus = get_mycroft_bus()
+    bus.emit(Message("neon.metric", data=data))
     return data
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 31e1bb3a8..61b0d4698 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -2,7 +2,7 @@
 ovos-core[lgpl]~=0.0.8
 # padacioso==0.1.3a2
 
-neon-utils[network,audio]~=1.11,>=1.11.1a3
+neon-utils[network,audio]~=1.11,>=1.11.1a4
 # TODO: `audio` extra for dependency resolution
 ovos-utils~=0.0,>=0.0.38
 ovos-bus-client~=0.0,>=0.0.10