From b4e98625f46f2c95c50da3939445d55b3d0b7556 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sun, 13 Oct 2024 12:03:47 +0900
Subject: [PATCH] Support file watcher to trigger GMR report

Allow generating GMR report upon file trigger in addition to a signal.

The feature has been available in oslo.reports since 1.11.0[1] but it
can't be used in designate without proper initialization.

[1] d23e0a65b23dc77d0104075d2313de6ca22b5cae

Change-Id: Idee38552d7068bff06f919b1e15da358cabbac22
---
 designate/cmd/api.py      | 4 +++-
 designate/cmd/central.py  | 4 +++-
 designate/cmd/manage.py   | 4 +++-
 designate/cmd/mdns.py     | 4 +++-
 designate/cmd/producer.py | 4 +++-
 designate/cmd/sink.py     | 4 +++-
 designate/cmd/worker.py   | 4 +++-
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/designate/cmd/api.py b/designate/cmd/api.py
index d2caa41b2..9eb085e65 100644
--- a/designate/cmd/api.py
+++ b/designate/cmd/api.py
@@ -17,6 +17,7 @@ import sys
 
 from oslo_log import log as logging
 from oslo_reports import guru_meditation_report as gmr
+from oslo_reports import opts as gmr_opts
 
 from designate.api import service as api_service
 import designate.conf
@@ -33,7 +34,8 @@ CONF.import_group('keystone_authtoken', 'keystonemiddleware.auth_token')
 def main():
     utils.read_config('designate', sys.argv)
     logging.setup(CONF, 'designate')
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr_opts.set_defaults(CONF)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
 
     server = api_service.Service()
     heartbeat = heartbeat_emitter.get_heartbeat_emitter(server.service_name)
diff --git a/designate/cmd/central.py b/designate/cmd/central.py
index 28fde84e7..08330303d 100644
--- a/designate/cmd/central.py
+++ b/designate/cmd/central.py
@@ -17,6 +17,7 @@ import sys
 
 from oslo_log import log as logging
 from oslo_reports import guru_meditation_report as gmr
+from oslo_reports import opts as gmr_opts
 
 from designate.central import service as central_service
 import designate.conf
@@ -32,7 +33,8 @@ CONF = designate.conf.CONF
 def main():
     utils.read_config('designate', sys.argv)
     logging.setup(CONF, 'designate')
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr_opts.set_defaults(CONF)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
 
     server = central_service.Service()
     heartbeat = heartbeat_emitter.get_heartbeat_emitter(server.service_name,
diff --git a/designate/cmd/manage.py b/designate/cmd/manage.py
index 856d0d70d..5878eea84 100644
--- a/designate/cmd/manage.py
+++ b/designate/cmd/manage.py
@@ -23,6 +23,7 @@ import eventlet
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_reports import guru_meditation_report as gmr
+from oslo_reports import opts as gmr_opts
 from stevedore.extension import ExtensionManager
 
 import designate.conf
@@ -114,7 +115,8 @@ def main():
     utils.read_config('designate', sys.argv)
     logging.setup(CONF, 'designate')
 
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr_opts.set_defaults(CONF)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
 
     try:
         fn = CONF.category.action_fn
diff --git a/designate/cmd/mdns.py b/designate/cmd/mdns.py
index f7d0fe41d..19cf0b909 100644
--- a/designate/cmd/mdns.py
+++ b/designate/cmd/mdns.py
@@ -17,6 +17,7 @@ import sys
 
 from oslo_log import log as logging
 from oslo_reports import guru_meditation_report as gmr
+from oslo_reports import opts as gmr_opts
 
 import designate.conf
 from designate import heartbeat_emitter
@@ -32,7 +33,8 @@ CONF = designate.conf.CONF
 def main():
     utils.read_config('designate', sys.argv)
     logging.setup(CONF, 'designate')
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr_opts.set_defaults(CONF)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
 
     server = mdns_service.Service()
     heartbeat = heartbeat_emitter.get_heartbeat_emitter(server.service_name)
diff --git a/designate/cmd/producer.py b/designate/cmd/producer.py
index dd01aafd5..e58c7f40f 100644
--- a/designate/cmd/producer.py
+++ b/designate/cmd/producer.py
@@ -17,6 +17,7 @@ import sys
 
 from oslo_log import log as logging
 from oslo_reports import guru_meditation_report as gmr
+from oslo_reports import opts as gmr_opts
 
 import designate.conf
 from designate import heartbeat_emitter
@@ -33,7 +34,8 @@ LOG = logging.getLogger(__name__)
 def main():
     utils.read_config('designate', sys.argv)
     logging.setup(CONF, 'designate')
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr_opts.set_defaults(CONF)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
 
     server = producer_service.Service()
     heartbeat = heartbeat_emitter.get_heartbeat_emitter(server.service_name)
diff --git a/designate/cmd/sink.py b/designate/cmd/sink.py
index b6e6347ac..9c173aa97 100644
--- a/designate/cmd/sink.py
+++ b/designate/cmd/sink.py
@@ -17,6 +17,7 @@ import sys
 
 from oslo_log import log as logging
 from oslo_reports import guru_meditation_report as gmr
+from oslo_reports import opts as gmr_opts
 
 import designate.conf
 from designate import heartbeat_emitter
@@ -32,7 +33,8 @@ CONF = designate.conf.CONF
 def main():
     utils.read_config('designate', sys.argv)
     logging.setup(CONF, 'designate')
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr_opts.set_defaults(CONF)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
 
     server = sink_service.Service()
     heartbeat = heartbeat_emitter.get_heartbeat_emitter(server.service_name)
diff --git a/designate/cmd/worker.py b/designate/cmd/worker.py
index 226c3580a..f40a92daa 100644
--- a/designate/cmd/worker.py
+++ b/designate/cmd/worker.py
@@ -17,6 +17,7 @@ import sys
 
 from oslo_log import log as logging
 from oslo_reports import guru_meditation_report as gmr
+from oslo_reports import opts as gmr_opts
 
 import designate.conf
 from designate import heartbeat_emitter
@@ -33,7 +34,8 @@ LOG = logging.getLogger(__name__)
 def main():
     utils.read_config('designate', sys.argv)
     logging.setup(CONF, 'designate')
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr_opts.set_defaults(CONF)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
 
     server = worker_service.Service()
     heartbeat = heartbeat_emitter.get_heartbeat_emitter(server.service_name)