add logger and update action version

GSA · Jul 22, 2024 · e26ee39 · e26ee39
1 parent 5638c44
commit e26ee39
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/build-metrics-report.yml b/.github/workflows/build-metrics-report.yml
@@ -35,7 +35,7 @@ jobs:
         run: |
           poetry config virtualenvs.create true --local
           poetry config virtualenvs.in-project true --local
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         name: Define a cache for the virtual environment based on the dependencies lock file
         with:
           path: ./.venv

diff --git a/metrics/datagov_metrics/ga.py b/metrics/datagov_metrics/ga.py
@@ -1,12 +1,15 @@
 import datetime
 import io
 import csv
+import logging
 
 from datagov_metrics.s3_util import put_data_to_s3
 import requests
 from google.oauth2 import service_account
 from googleapiclient.discovery import build
 
+log = logging.getLogger("datagov_metrics.ga")
+
 KEY_FILE_LOCATION = "datagov_metrics/credentials.json"
 GA4_PROPERTY_ID = "properties/381392243"
 
@@ -213,7 +216,7 @@ def write_data_to_csv(response):
 def main():
     reports = setup_reports()
     for report in reports:
-        print(f"Fetching report: {report}")
+        log.info(f"Fetching report: {report}")
         fetched_report = fetch_report(reports[report])
         csv_data = write_data_to_csv(fetched_report)
         put_data_to_s3(f"{report}.csv", csv_data)

diff --git a/metrics/datagov_metrics/s3_util.py b/metrics/datagov_metrics/s3_util.py
@@ -9,7 +9,7 @@
 AWS_ACCESS_KEY_ID = os.getenv("AWS_ACCESS_KEY_ID_METRICS")
 AWS_SECRET_ACCESS_KEY = os.getenv("AWS_SECRET_ACCESS_KEY_METRICS")
 
-boto3.set_stream_logger("", logging.INFO)
+log = logging.getLogger("datagov_metrics.s3util")
 
 s3_client = boto3.client(
     "s3",
@@ -24,6 +24,6 @@ def put_data_to_s3(file_name, csv_data):
     status = response.get("ResponseMetadata", {}).get("HTTPStatusCode")
 
     if status == 200:
-        print(f"Successful S3 put_object {file_name} response. Status - {status}")
+        log.info(f"Successful S3 put_object {file_name} response. Status - {status}")
     else:
-        print(f"Unsuccessful S3 put_object {file_name} response. Status - {status}")
+        log.error(f"Unsuccessful S3 put_object {file_name} response. Status - {status}")