deleted-libraries.py: fix exception handling and miss-counting

EnvironmentError exceptions deprecated since Python 3.3 and are now longer used. I have this changes running since over a year now and have never encountered any other exceptions than FileNotFoundError or ProcessLookupError. Also due to an indentation error the metric values could never reach anything above 1 even if the outdated library is used more than once. Signed-off-by: Christian Pointner <[email protected]>
prometheus-community · Jul 18, 2023 · a31d7c2 · a31d7c2
1 parent 34dd42e
commit a31d7c2
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/deleted_libraries.py b/deleted_libraries.py
@@ -31,15 +31,18 @@ def main():
                             if path not in processes_linking_deleted_libraries:
                                 processes_linking_deleted_libraries[path] = {}
 
-                                if library in processes_linking_deleted_libraries[path]:
-                                    processes_linking_deleted_libraries[path][library] += 1
-                                else:
-                                    processes_linking_deleted_libraries[path][library] = 1
-        except EnvironmentError as e:
+                            if library in processes_linking_deleted_libraries[path]:
+                                processes_linking_deleted_libraries[path][library] += 1
+                            else:
+                                processes_linking_deleted_libraries[path][library] = 1
+        except FileNotFoundError:
             # Ignore non-existent files, since the files may have changed since
             # we globbed.
-            if e.errno != errno.ENOENT:
-                sys.exit('Failed to open file: {0}'.format(path))
+            pass
+        except ProcessLookupError:
+            # If process vanishes while collecting the linked libs reading lines from
+            # the map file yields this error.
+            pass
 
     num_processes_per_library = {}