diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-06-28 15:52:13 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-06-28 16:04:14 +0200 |
commit | d3b90a80b09394dab9b30a6cc314eae9c0ba4cea (patch) | |
tree | b17696225294174249ee511c0b074bad08796b1d /docproc | |
parent | ea43c079fd365c2fdbf91bedf8412a903fecca9e (diff) |
Simplify and improve encapsulation
Diffstat (limited to 'docproc')
-rw-r--r-- | docproc/src/main/java/com/yahoo/docproc/jdisc/observability/DocprocsStatusExtension.java | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/observability/DocprocsStatusExtension.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/observability/DocprocsStatusExtension.java index 91d1fa8457b..15f6c3a5cd9 100644 --- a/docproc/src/main/java/com/yahoo/docproc/jdisc/observability/DocprocsStatusExtension.java +++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/observability/DocprocsStatusExtension.java @@ -5,7 +5,6 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.yahoo.component.provider.ComponentRegistry; -import com.yahoo.container.Container; import com.yahoo.container.handler.observability.ApplicationStatusHandler; import com.yahoo.docproc.Call; import com.yahoo.docproc.impl.DocprocService; @@ -22,25 +21,25 @@ import java.util.Map; public class DocprocsStatusExtension implements ApplicationStatusHandler.Extension { @Override - public Map<String, ? extends JsonNode> produceExtraFields(ApplicationStatusHandler handler) { - return Map.of("docprocChains", renderDocprocChains(Container.get())); + public Map<String, ? extends JsonNode> produceExtraFields(ApplicationStatusHandler statusHandler) { + return Map.of("docprocChains", renderDocprocChains(statusHandler)); } - private static JsonNode renderDocprocChains(Container container) { - ObjectNode ret = ApplicationStatusHandler.jsonMapper.createObjectNode(); - for (RequestHandler h : container.getRequestHandlerRegistry().allComponents()) { + private static JsonNode renderDocprocChains(ApplicationStatusHandler statusHandler) { + ObjectNode ret = statusHandler.jsonMapper().createObjectNode(); + for (RequestHandler h : statusHandler.requestHandlers()) { if (h instanceof DocumentProcessingHandler) { ComponentRegistry<DocprocService> registry = ((DocumentProcessingHandler) h).getDocprocServiceRegistry(); for (DocprocService service : registry.allComponents()) { - ret.set(service.getId().stringValue(), renderCalls(service.getCallStack().iterator())); + ret.set(service.getId().stringValue(), renderCalls(statusHandler, service.getCallStack().iterator())); } } } return ret; } - private static JsonNode renderCalls(Iterator<Call> components) { - ArrayNode ret = ApplicationStatusHandler.jsonMapper.createArrayNode(); + private static JsonNode renderCalls(ApplicationStatusHandler statusHandler, Iterator<Call> components) { + ArrayNode ret = statusHandler.jsonMapper().createArrayNode(); while (components.hasNext()) { Call c = components.next(); JsonNode jc = ApplicationStatusHandler.renderComponent(c.getDocumentProcessor(), c.getDocumentProcessor().getId()); |