From 3675c9387b8418a1a67dd13d95b338e12ca5dae3 Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Mon, 23 Sep 2024 17:31:51 -0700
Subject: [PATCH] fix: correctly read the SYNC_STATSD_HOST/PORT settings
 (#1601)

Closes SYNC-4417
---
 tools/tokenserver/process_account_events.py | 13 +-----------
 tools/tokenserver/purge_old_records.py      | 13 +-----------
 tools/tokenserver/util.py                   | 23 +++++++++++++++++----
 3 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/tools/tokenserver/process_account_events.py b/tools/tokenserver/process_account_events.py
index 648d8f9c..e2563ed3 100644
--- a/tools/tokenserver/process_account_events.py
+++ b/tools/tokenserver/process_account_events.py
@@ -181,18 +181,7 @@ def main(args=None):
                       help="Control verbosity of log messages")
     parser.add_option("", "--human_logs", action="store_true",
                       help="Human readable logs")
-    parser.add_option(
-        "",
-        "--metric_host",
-        default=None,
-        help="Metric host name"
-    )
-    parser.add_option(
-        "",
-        "--metric_port",
-        default=None,
-        help="Metric host port"
-    )
+    util.add_metric_options(parser)
 
     opts, args = parser.parse_args(args)
     # set up logging
diff --git a/tools/tokenserver/purge_old_records.py b/tools/tokenserver/purge_old_records.py
index 930b7586..ca8e6f10 100644
--- a/tools/tokenserver/purge_old_records.py
+++ b/tools/tokenserver/purge_old_records.py
@@ -386,18 +386,7 @@ def main(args=None):
         action="store_true",
         help="Human readable logs"
     )
-    parser.add_option(
-        "",
-        "--metric_host",
-        default=None,
-        help="Metric host name"
-    )
-    parser.add_option(
-        "",
-        "--metric_port",
-        default=None,
-        help="Metric host port"
-    )
+    util.add_metric_options(parser)
 
     opts, args = parser.parse_args(args)
 
diff --git a/tools/tokenserver/util.py b/tools/tokenserver/util.py
index d2036159..56f57514 100644
--- a/tools/tokenserver/util.py
+++ b/tools/tokenserver/util.py
@@ -11,6 +11,7 @@ import sys
 import time
 import logging
 import base64
+import optparse
 import os
 import json
 from datetime import datetime
@@ -104,13 +105,27 @@ class Metrics():
         options = dict(
             namespace=namespace,
             statsd_namespace=namespace,
-            statsd_host=getattr(
-                opts, "metric_host", os.environ.get("SYNC_STATSD_HOST")),
-            statsd_port=getattr(
-                opts, "metric_port", os.environ.get("SYNC_STATSD_PORT")),
+            statsd_host=getattr(opts, "metric_host"),
+            statsd_port=getattr(opts, "metric_port"),
         )
         self.prefix = options.get("namespace")
         initialize(**options)
 
     def incr(self, label, tags=None):
         statsd.increment(label, tags=tags)
+
+
+def add_metric_options(parser: optparse.OptionParser):
+    """Add generic metric related options to an OptionParser"""
+    parser.add_option(
+        "",
+        "--metric_host",
+        default=os.environ.get("SYNC_STATSD_HOST"),
+        help="Metric host name"
+    )
+    parser.add_option(
+        "",
+        "--metric_port",
+        default=os.environ.get("SYNC_STATSD_PORT"),
+        help="Metric host port"
+    )