diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-06-28 15:11:46 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-06-28 15:52:33 +0200 |
commit | ea43c079fd365c2fdbf91bedf8412a903fecca9e (patch) | |
tree | 105cf3f5a25a011db3f2c3798b8644139324e50d /docproc | |
parent | 878cc49535f5ff9fe6220e31ef0afb9481c21710 (diff) |
Move ApplicationStatusHandler to container-disc
Diffstat (limited to 'docproc')
3 files changed, 66 insertions, 0 deletions
diff --git a/docproc/pom.xml b/docproc/pom.xml index e7d8d6e3a3e..d656559d5ec 100644 --- a/docproc/pom.xml +++ b/docproc/pom.xml @@ -48,6 +48,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>container-disc</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>container-messagebus</artifactId> <version>${project.version}</version> <scope>provided</scope> 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 new file mode 100644 index 00000000000..91d1fa8457b --- /dev/null +++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/observability/DocprocsStatusExtension.java @@ -0,0 +1,52 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.docproc.jdisc.observability; + +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; +import com.yahoo.docproc.jdisc.DocumentProcessingHandler; +import com.yahoo.jdisc.handler.RequestHandler; + +import java.util.Iterator; +import java.util.Map; + + +/** + * @author bjorncs + */ +public class DocprocsStatusExtension implements ApplicationStatusHandler.Extension { + + @Override + public Map<String, ? extends JsonNode> produceExtraFields(ApplicationStatusHandler handler) { + return Map.of("docprocChains", renderDocprocChains(Container.get())); + } + + private static JsonNode renderDocprocChains(Container container) { + ObjectNode ret = ApplicationStatusHandler.jsonMapper.createObjectNode(); + for (RequestHandler h : container.getRequestHandlerRegistry().allComponents()) { + if (h instanceof DocumentProcessingHandler) { + ComponentRegistry<DocprocService> registry = ((DocumentProcessingHandler) h).getDocprocServiceRegistry(); + for (DocprocService service : registry.allComponents()) { + ret.set(service.getId().stringValue(), renderCalls(service.getCallStack().iterator())); + } + } + } + return ret; + } + + private static JsonNode renderCalls(Iterator<Call> components) { + ArrayNode ret = ApplicationStatusHandler.jsonMapper.createArrayNode(); + while (components.hasNext()) { + Call c = components.next(); + JsonNode jc = ApplicationStatusHandler.renderComponent(c.getDocumentProcessor(), c.getDocumentProcessor().getId()); + ret.add(jc); + } + return ret; + } + +} diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/observability/package-info.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/observability/package-info.java new file mode 100644 index 00000000000..0040acf1fdc --- /dev/null +++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/observability/package-info.java @@ -0,0 +1,8 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +/** + * @author bjorncs + */ +@ExportPackage +package com.yahoo.docproc.jdisc.observability; + +import com.yahoo.osgi.annotation.ExportPackage;
\ No newline at end of file |