Handle null timestamps

.github/workflows/main.yml

@@ -15,8 +15,15 @@ jobs:
       # you must check out the repository
       - name: Checkout
         uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10.7'
       - name: Run formatter
         uses: psf/black@stable
+      - name: Run unit tests
+        run: |
+          pip install -r requirements.txt
+          python -m unittest test_push.py
       - name: Step 1
         run: echo step 1
       - name: Step 2

push.py

@@ -6,12 +6,6 @@
 import os
 import sys
 
-LOKI_ENDPOINT = sys.argv[1]
-LOKI_USERNAME = sys.argv[2]
-LOKI_PASSWORD = sys.argv[3]
-WORKFLOW_RUN_URL = sys.argv[4]
-GITHUB_TOKEN = sys.argv[5]
-
 
 def workflow_run_to_stream(workflow_run, branch):
     run_started_at = dateutil.parser.isoparse(workflow_run["run_started_at"])
@@ -42,7 +36,12 @@ def workflow_run_to_stream(workflow_run, branch):
 def job_to_stream(workflow_run, job, branch):
     duration = 0
     completed_at = datetime.datetime.now(datetime.timezone.utc)
-    if "started_at" in job and "completed_at" in job:
+    if (
+        "started_at" in job
+        and job["started_at"] is not None
+        and "completed_at" in job
+        and job["completed_at"] is not None
+    ):
         started_at = dateutil.parser.isoparse(job["started_at"])
         completed_at = dateutil.parser.isoparse(job["completed_at"])
         duration = int(datetime.timedelta.total_seconds(completed_at - started_at))
@@ -69,7 +68,12 @@ def job_to_stream(workflow_run, job, branch):
 def step_to_stream(workflow_run, job, step, branch):
     duration = 0
     completed_at = datetime.datetime.now(datetime.timezone.utc)
-    if "started_at" in step and "completed_at" in step:
+    if (
+        "started_at" in step
+        and step["started_at"] is not None
+        and "completed_at" in step
+        and step["completed_at"] is not None
+    ):
         started_at = dateutil.parser.isoparse(step["started_at"])
         completed_at = dateutil.parser.isoparse(step["completed_at"])
         duration = int(datetime.timedelta.total_seconds(completed_at - started_at))
@@ -93,13 +97,22 @@ def step_to_stream(workflow_run, job, step, branch):
     }
 
 
-def main():
+def jobs_to_stream(workflow_run, jobs, branch):
+    streams = []
+    for job in jobs["jobs"]:
+        streams.append(job_to_stream(workflow_run, job, branch))
+        for step in job["steps"]:
+            streams.append(step_to_stream(workflow_run, job, step, branch))
+    return streams
+
+
+def main(loki_endpoint, loki_username, loki_password, workflow_run_url, github_token):
     # Get workflow run.
     headers = {
         "Accept": "application/vnd.github+json",
-        "Authorization": "token " + GITHUB_TOKEN,
+        "Authorization": "token " + github_token,
     }
-    r = requests.get(WORKFLOW_RUN_URL, headers=headers)
+    r = requests.get(workflow_run_url, headers=headers)
     workflow_run = r.json()
     pprint.pprint(workflow_run)
 
@@ -119,20 +132,15 @@ def main():
     if "pull_requests" in workflow_run and workflow_run["pull_requests"]:
         branch = workflow_run["pull_requests"][0]["base"]["ref"]
 
-    streams = []
-    for job in jobs["jobs"]:
-        streams.append(job_to_stream(workflow_run, job, branch))
-        for step in job["steps"]:
-            streams.append(step_to_stream(workflow_run, job, step, branch))
-
+    streams = jobs_to_stream(workflow_run, jobs, branch)
     streams.append(workflow_run_to_stream(workflow_run, branch))
 
     body = {"streams": streams}
-    r = requests.post(LOKI_ENDPOINT, json=body, auth=(LOKI_USERNAME, LOKI_PASSWORD))
+    r = requests.post(loki_endpoint, json=body, auth=(loki_username, loki_password))
     pprint.pprint(body)
     pprint.pprint(r.status_code)
     return 0
 
 
 if __name__ == "__main__":
-    sys.exit(main())
+    sys.exit(main(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5]))

test_push.py

@@ -0,0 +1,14 @@
+import json
+from unittest import TestCase
+from push import jobs_to_stream
+
+
+class Test(TestCase):
+    def test_jobs_to_stream(self):
+        with open("testdata/run.json") as run_json, open(
+            "testdata/jobs.json"
+        ) as jobs_json:
+            run = json.load(run_json)
+            jobs = json.load(jobs_json)
+            # Make sure it can handle null timestamps
+            jobs_to_stream(run, jobs, "main")