RED-9255: fix annotations, refactor for observability See merge request redactmanager/persistence-service!563