Refactor paasta logs filtering for performance

paasta_tools/cli/cmds/logs.py

@@ -294,18 +294,21 @@ def paasta_log_line_passes_filter(
     except ValueError:
         log.debug("Trouble parsing line as json. Skipping. Line: %r" % line)
         return False
-    timestamp = isodate.parse_datetime(parsed_line.get("timestamp"))
-    if not check_timestamp_in_range(timestamp, start_time, end_time):
-        return False
-    return (
-        (parsed_line.get("level") is None or parsed_line.get("level") in levels)
+
+    if (
+        (instances is None or parsed_line.get("instance") in instances)
+        and (parsed_line.get("level") is None or parsed_line.get("level") in levels)
         and parsed_line.get("component") in components
         and (
             parsed_line.get("cluster") in clusters
             or parsed_line.get("cluster") == ANY_CLUSTER
         )
-        and (instances is None or parsed_line.get("instance") in instances)
-    )
+    ):
+        timestamp = isodate.parse_datetime(parsed_line.get("timestamp"))
+        if check_timestamp_in_range(timestamp, start_time, end_time):
+            return True
+    else:
+        return False
 
 
 def paasta_app_output_passes_filter(
@@ -324,28 +327,25 @@ def paasta_app_output_passes_filter(
     except ValueError:
         log.debug("Trouble parsing line as json. Skipping. Line: %r" % line)
         return False
-    try:
-        timestamp = isodate.parse_datetime(parsed_line.get("timestamp"))
-    # https://github.com/gweis/isodate/issues/53
-    except ValueError:
-        return True
-    except AttributeError:
-        # Timestamp might be missing. We had an issue where OTel was splitting overly long log lines
-        # and not including timestamps in the resulting log records (OBSPLAT-2216).
-        # Although this was then fixed in OTel, we should not rely on timestamps being present,
-        # as the format cannot be guaranteed.
-        return False
-    if not check_timestamp_in_range(timestamp, start_time, end_time):
-        return False
-    return (
-        parsed_line.get("component") in components
-        and (
-            parsed_line.get("cluster") in clusters
-            or parsed_line.get("cluster") == ANY_CLUSTER
-        )
-        and (instances is None or parsed_line.get("instance") in instances)
+
+    if (
+        (instances is None or parsed_line.get("instance") in instances)
+        and parsed_line.get("cluster") in clusters
+        and parsed_line.get("component") in components
         and (pods is None or parsed_line.get("pod_name") in pods)
-    )
+    ):
+        try:
+            timestamp = isodate.parse_datetime(parsed_line.get("timestamp"))
+        except AttributeError:
+            # Timestamp might be missing. We had an issue where OTel was splitting overly long log lines
+            # and not including timestamps in the resulting log records (OBSPLAT-2216).
+            # Although this was then fixed in OTel, we should not rely on timestamps being present,
+            # as the format cannot be guaranteed.
+            return False
+        if check_timestamp_in_range(timestamp, start_time, end_time):
+            return True
+    else:
+        return False
 
 
 def extract_utc_timestamp_from_log_line(line: str) -> datetime.datetime:

requirements-minimal.txt

@@ -21,7 +21,7 @@ humanfriendly
 humanize >= 0.5.1
 inotify >= 0.2.8
 ipaddress >= 1.0.22
-isodate >= 0.5.0
+isodate >= 0.7.2
 jsonschema[format]
 kazoo >= 2.0.0
 # the upper-bound here is mainly for things that use paasta-tools as a library and don't benefit

requirements.txt

@@ -37,7 +37,7 @@ hupper==1.0
 idna==2.6
 inotify==0.2.8
 ipaddress==1.0.22
-isodate==0.6.0
+isodate==0.7.2
 itsdangerous==2.0.1
 Jinja2==2.11.3
 jinja2-time==0.1.0