diff options
author | Ola Aunronning <olaa@yahooinc.com> | 2023-06-15 14:23:31 +0200 |
---|---|---|
committer | Ola Aunronning <olaa@yahooinc.com> | 2023-06-15 14:27:35 +0200 |
commit | 3e22f3b64a889a8045a4008d3b98c542de4301b9 (patch) | |
tree | 560085af8e56961ca04ba5e64b56c3a87e413dd4 /container-core | |
parent | b7fa88adf8cacacba2088d8532d79958182b1916 (diff) |
Don't add status_code and status_msg to metric packets. Remove unused service health and coredump metric gatherers
Diffstat (limited to 'container-core')
3 files changed, 0 insertions, 89 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/CoredumpGatherer.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/CoredumpGatherer.java deleted file mode 100644 index c82f0cb436f..00000000000 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/CoredumpGatherer.java +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.container.jdisc.state; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.yahoo.vespa.defaults.Defaults; - -import java.io.IOException; -import java.io.UncheckedIOException; -import java.nio.file.NoSuchFileException; -import java.nio.file.Path; -import java.time.Instant; -import java.util.stream.Stream; - -/** - * @author olaa - */ -public class CoredumpGatherer { - - private static final ObjectMapper jsonMapper = new ObjectMapper(); - - private static final Path COREDUMP_PATH = Path.of(Defaults.getDefaults().underVespaHome("var/crash/processing")); - - public static JsonNode gatherCoredumpMetrics(FileWrapper fileWrapper) { - int coredumps = getNumberOfCoredumps(fileWrapper); - ObjectNode packet = jsonMapper.createObjectNode(); - packet.put("status_code", coredumps == 0 ? 0 : 1); - packet.put("status_msg", coredumps == 0 ? "OK" : String.format("Found %d coredump(s)", coredumps)); - packet.put("timestamp", Instant.now().getEpochSecond()); - packet.put("application", "system-coredumps-processing"); - return packet; - } - - private static int getNumberOfCoredumps(FileWrapper fileWrapper) { - try (Stream<Path> stream = fileWrapper.walkTree(COREDUMP_PATH)){ - return (int) stream - .filter(fileWrapper::isRegularFile) - .count(); - } catch (NoSuchFileException e) { - return 0; - } catch (IOException e) { - throw new UncheckedIOException(e); - } - } -} diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricGatherer.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricGatherer.java index fbe6c5c0aec..103a4363ac2 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricGatherer.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricGatherer.java @@ -16,7 +16,6 @@ public class MetricGatherer { static List<JsonNode> getAdditionalMetrics() { FileWrapper fileWrapper = new FileWrapper(); List<JsonNode> packetList = new ArrayList<>(); - packetList.add(CoredumpGatherer.gatherCoredumpMetrics(fileWrapper)); if (System.getProperty("os.name").contains("nux")) packetList.add(HostLifeGatherer.getHostLifePacket(fileWrapper)); return packetList; diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/CoredumpGathererTest.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/CoredumpGathererTest.java deleted file mode 100644 index 5cec6c471fe..00000000000 --- a/container-core/src/test/java/com/yahoo/container/jdisc/state/CoredumpGathererTest.java +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.container.jdisc.state; - -import com.fasterxml.jackson.databind.JsonNode; -import org.junit.jupiter.api.Test; - -import java.nio.file.Path; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertEquals; - - -/** - * @author olaa - */ -public class CoredumpGathererTest { - - @Test - void finds_one_coredump() { - JsonNode packet = CoredumpGatherer.gatherCoredumpMetrics(new MockFileWrapper()); - - assertEquals("system-coredumps-processing", packet.get("application").textValue()); - assertEquals(1, packet.get("status_code").intValue()); - assertEquals("Found 1 coredump(s)", packet.get("status_msg").textValue()); - - } - - static class MockFileWrapper extends FileWrapper { - - - @Override - Stream<Path> walkTree(Path path) { - return Stream.of(Path.of("dummy-path")); - } - - @Override - boolean isRegularFile(Path path) { - return true; - } - } - -} |