From 74b95544b0e4e2725f173bdc0d8b97b247d0f445 Mon Sep 17 00:00:00 2001
From: Erik Olson <eolson@mozilla.com>
Date: Tue, 7 Jan 2020 15:57:46 -0500
Subject: [PATCH] purge_ttl.py updates for PR comments

---
 tools/spanner/purge_ttl.py | 50 +++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/tools/spanner/purge_ttl.py b/tools/spanner/purge_ttl.py
index f3122f49..13f4517f 100644
--- a/tools/spanner/purge_ttl.py
+++ b/tools/spanner/purge_ttl.py
@@ -14,12 +14,8 @@ from urllib import parse
 from google.cloud import spanner
 
 # set up logger
-logger = logging.getLogger()
-logger.setLevel(logging.INFO)
-handler = logging.StreamHandler(sys.stdout)
-formatter = logging.Formatter('{"datetime": "%(asctime)s", "message": "%(message)s"}')
-handler.setFormatter(formatter)
-logger.addHandler(handler)
+logging.basicConfig(format='{"datetime": "%(asctime)s", "message": "%(message)s"}',
+                    stream=sys.stdout,level=logging.INFO)
 
 # Change these to match your install.
 client = spanner.Client()
@@ -48,35 +44,33 @@ def spanner_read_data(request=None):
     instance = client.instance(instance_id)
     database = instance.database(database_id)
 
-    logger.info("For {}:{}".format(instance_id, database_id))
+    logging.info("For {}:{}".format(instance_id, database_id))
 
     # Delete Batches. Also deletes child batch_bsos rows (INTERLEAVE
     # IN PARENT batches ON DELETE CASCADE)
-    batches_start = datetime.now()
-    query = 'DELETE FROM batches WHERE expiry < CURRENT_TIMESTAMP()'
-    result = database.execute_partitioned_dml(query)
-    batches_end = datetime.now()
-    batches_duration = batches_end - batches_start
-    logger.info("batches: removed {} rows, batches_duration: {}".format(result, batches_duration))
-    statsd.timing("sync.purge_ttl.batches_duration", batches_duration)
+    with statsd.timer("syncstorage.purge_ttl.batches_duration"):
+        batches_start = datetime.now()
+        query = 'DELETE FROM batches WHERE expiry < CURRENT_TIMESTAMP()'
+        result = database.execute_partitioned_dml(query)
+        batches_end = datetime.now()
+        logging.info("batches: removed {} rows, batches_duration: {}".format(result, batches_end - batches_start))
 
     # Delete BSOs
-    bso_start = datetime.now()
-    query = 'DELETE FROM bsos WHERE expiry < CURRENT_TIMESTAMP()'
-    result = database.execute_partitioned_dml(query)
-    bso_end = datetime.now()
-    bso_duration = bso_end - bso_start
-    logger.info("bso: removed {} rows, bso_duration: {}".format(result, bso_duration))
-    statsd.timing("sync.purge_ttl.bso_duration", bso_duration)
+    with statsd.timer("syncstorage.purge_ttl.bso_duration"):
+        bso_start = datetime.now()
+        query = 'DELETE FROM bsos WHERE expiry < CURRENT_TIMESTAMP()'
+        result = database.execute_partitioned_dml(query)
+        bso_end = datetime.now()
+        logging.info("bso: removed {} rows, bso_duration: {}".format(result, bso_end - bso_start))
 
 
 if __name__ == "__main__":
-    start_time = datetime.now()
-    logger.info('Starting purge_ttl.py')
+    with statsd.timer("syncstorage.purge_ttl.total_duration"):
+        start_time = datetime.now()
+        logging.info('Starting purge_ttl.py')
 
-    spanner_read_data()
+        spanner_read_data()
 
-    end_time = datetime.now()
-    duration = end_time - start_time
-    logger.info('Completed purge_ttl.py, total_duration: {}'.format(duration))
-    statsd.timing("sync.purge_ttl.total_duration", duration)
+        end_time = datetime.now()
+        duration = end_time - start_time
+        logging.info('Completed purge_ttl.py, total_duration: {}'.format(duration))