1 files changed, 32 insertions, 19 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/cores/CoreDumpMetadata.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/cores/CoreDumpMetadata.java
index 7367a254b4a..92cccf86ecb 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/cores/CoreDumpMetadata.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/cores/CoreDumpMetadata.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.hosted.node.admin.configserver.cores;
 import com.yahoo.config.provision.DockerImage;
 
 import java.nio.file.Path;
+import java.time.Instant;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -12,7 +13,11 @@ import java.util.Optional;
  * @author hakonhall
  */
 public class CoreDumpMetadata {
+    public enum Type { CORE_DUMP, JVM_HEAP, OOM }
+
+    private Type type;
     private String binPath;
+    private Instant created;
     private List<String> backtrace;
     private List<String> backtraceAllThreads;
     private Path coreDumpPath;
@@ -24,30 +29,36 @@ public class CoreDumpMetadata {
 
     public CoreDumpMetadata() {}
 
-    public Optional<String> binPath() { return Optional.ofNullable(binPath); };
-    public Optional<List<String>> backtrace() { return Optional.ofNullable(backtrace); };
-    public Optional<List<String>> backtraceAllThreads() { return Optional.ofNullable(backtraceAllThreads); };
-    public Optional<Path> coredumpPath() { return Optional.ofNullable(coreDumpPath); };
+    public Optional<Type> type() { return Optional.ofNullable(type); }
+    public Optional<String> binPath() { return Optional.ofNullable(binPath); }
+    public Optional<Instant> created() { return Optional.ofNullable(created); }
+    public Optional<List<String>> backtrace() { return Optional.ofNullable(backtrace); }
+    public Optional<List<String>> backtraceAllThreads() { return Optional.ofNullable(backtraceAllThreads); }
+    public Optional<Path> coredumpPath() { return Optional.ofNullable(coreDumpPath); }
     public Optional<String> decryptionToken() { return Optional.ofNullable(decryptionToken); }
-    public Optional<String> kernelVersion() { return Optional.ofNullable(kernelVersion); };
-    public Optional<String> cpuMicrocodeVersion() { return Optional.ofNullable(cpuMicrocodeVersion); };
-    public Optional<DockerImage> dockerImage() { return Optional.ofNullable(dockerImage); };
-    public Optional<String> vespaVersion() { return Optional.ofNullable(vespaVersion); };
+    public Optional<String> kernelVersion() { return Optional.ofNullable(kernelVersion); }
+    public Optional<String> cpuMicrocodeVersion() { return Optional.ofNullable(cpuMicrocodeVersion); }
+    public Optional<DockerImage> dockerImage() { return Optional.ofNullable(dockerImage); }
+    public Optional<String> vespaVersion() { return Optional.ofNullable(vespaVersion); }
 
-    public CoreDumpMetadata setBinPath(String binPath) { this.binPath = binPath; return this; };
-    public CoreDumpMetadata setBacktrace(List<String> backtrace) { this.backtrace = backtrace; return this; };
-    public CoreDumpMetadata setBacktraceAllThreads(List<String> backtraceAllThreads) { this.backtraceAllThreads = backtraceAllThreads; return this; };
-    public CoreDumpMetadata setCoreDumpPath(Path coreDumpPath) { this.coreDumpPath = coreDumpPath; return this; };
+    public CoreDumpMetadata setType(Type type) { this.type = type; return this; }
+    public CoreDumpMetadata setBinPath(String binPath) { this.binPath = binPath; return this; }
+    public CoreDumpMetadata setCreated(Instant created) { this.created = created; return this; }
+    public CoreDumpMetadata setBacktrace(List<String> backtrace) { this.backtrace = backtrace; return this; }
+    public CoreDumpMetadata setBacktraceAllThreads(List<String> backtraceAllThreads) { this.backtraceAllThreads = backtraceAllThreads; return this; }
+    public CoreDumpMetadata setCoreDumpPath(Path coreDumpPath) { this.coreDumpPath = coreDumpPath; return this; }
     public CoreDumpMetadata setDecryptionToken(String decryptionToken) { this.decryptionToken = decryptionToken; return this; }
-    public CoreDumpMetadata setKernelVersion(String kernelVersion) { this.kernelVersion = kernelVersion; return this; };
-    public CoreDumpMetadata setCpuMicrocodeVersion(String cpuMicrocodeVersion) { this.cpuMicrocodeVersion = cpuMicrocodeVersion; return this; };
-    public CoreDumpMetadata setDockerImage(DockerImage dockerImage) { this.dockerImage = dockerImage; return this; };
-    public CoreDumpMetadata setVespaVersion(String vespaVersion) { this.vespaVersion = vespaVersion; return this; };
+    public CoreDumpMetadata setKernelVersion(String kernelVersion) { this.kernelVersion = kernelVersion; return this; }
+    public CoreDumpMetadata setCpuMicrocodeVersion(String cpuMicrocodeVersion) { this.cpuMicrocodeVersion = cpuMicrocodeVersion; return this; }
+    public CoreDumpMetadata setDockerImage(DockerImage dockerImage) { this.dockerImage = dockerImage; return this; }
+    public CoreDumpMetadata setVespaVersion(String vespaVersion) { this.vespaVersion = vespaVersion; return this; }
 
     @Override
     public String toString() {
         return "CoreDumpMetadata{" +
-               "binPath=" + binPath +
+               "type=" + type +
+               ", binPath=" + binPath +
+               ", created=" + created +
                ", backtrace=" + backtrace +
                ", backtraceAllThreads=" + backtraceAllThreads +
                ", coreDumpPath=" + coreDumpPath +
@@ -64,7 +75,9 @@ public class CoreDumpMetadata {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         CoreDumpMetadata metadata = (CoreDumpMetadata) o;
-        return Objects.equals(binPath, metadata.binPath) &&
+        return type == metadata.type &&
+               Objects.equals(binPath, metadata.binPath) &&
+               Objects.equals(created, metadata.created) &&
                Objects.equals(backtrace, metadata.backtrace) &&
                Objects.equals(backtraceAllThreads, metadata.backtraceAllThreads) &&
                Objects.equals(coreDumpPath, metadata.coreDumpPath) &&
@@ -77,7 +90,7 @@ public class CoreDumpMetadata {
 
     @Override
     public int hashCode() {
-        return Objects.hash(binPath, backtrace, backtraceAllThreads, coreDumpPath, decryptionToken, kernelVersion,
+        return Objects.hash(type, binPath, created, backtrace, backtraceAllThreads, coreDumpPath, decryptionToken, kernelVersion,
                             cpuMicrocodeVersion, dockerImage, vespaVersion);
     }
 }