Remove unused code

2 files changed, 2 insertions, 51 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
index 6f3d2d74bc6..f0182ae36e4 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
@@ -27,27 +27,21 @@ import com.yahoo.vespa.hosted.node.admin.task.util.process.Terminal;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import static com.yahoo.vespa.hosted.node.admin.maintenance.disk.DiskCleanupRule.Priority;
-import static com.yahoo.yolean.Exceptions.uncheck;
 
 /**
  * @author freva
@@ -172,33 +166,7 @@ public class StorageMaintainer {
     /** Checks if container has any new coredumps, reports and archives them if so */
     public void handleCoreDumpsForContainer(NodeAgentContext context, Optional<Container> container, boolean throwIfCoreBeingWritten) {
         if (context.isDisabled(NodeAgentTask.CoreDumps)) return;
-        coredumpHandler.converge(context, () -> getCoredumpNodeAttributes(context, container),
-                                 container.map(Container::image), throwIfCoreBeingWritten);
-    }
-
-    private Map<String, Object> getCoredumpNodeAttributes(NodeAgentContext context, Optional<Container> container) {
-        Map<String, String> attributes = new HashMap<>();
-        attributes.put("hostname", context.node().hostname());
-        attributes.put("system", context.zone().getSystemName().value());
-        attributes.put("region", context.zone().getRegionName().value());
-        attributes.put("environment", context.zone().getEnvironment().value());
-        attributes.put("flavor", context.node().flavor());
-        attributes.put("kernel_version", System.getProperty("os.version"));
-        attributes.put("cpu_microcode_version", getMicrocodeVersion());
-
-        container.map(c -> c.image().asString()).ifPresent(image -> attributes.put("docker_image", image));
-        container.flatMap(c -> c.image().tag()).ifPresent(version -> attributes.put("vespa_version", version));
-        context.node().parentHostname().ifPresent(parent -> attributes.put("parent_hostname", parent));
-        context.node().owner().ifPresent(owner -> {
-            attributes.put("tenant", owner.tenant().value());
-            attributes.put("application", owner.application().value());
-            attributes.put("instance", owner.instance().value());
-        });
-        context.node().membership().ifPresent(membership -> {
-            attributes.put("cluster_id", membership.clusterId());
-            attributes.put("cluster_type", membership.type().value());
-        });
-        return Collections.unmodifiableMap(attributes);
+        coredumpHandler.converge(context, container.map(Container::image), throwIfCoreBeingWritten);
     }
 
     /**
@@ -225,18 +193,4 @@ public class StorageMaintainer {
         if (context.nodeType() != NodeType.tenant)
             context.paths().of("/").getFileSystem().createRoot();
     }
-
-    private String getMicrocodeVersion() {
-        String output = uncheck(() -> Files.readAllLines(Paths.get("/proc/cpuinfo")).stream()
-                .filter(line -> line.startsWith("microcode"))
-                .findFirst()
-                .orElse("microcode : UNKNOWN"));
-
-        String[] results = output.split(":");
-        if (results.length != 2) {
-            throw ConvergenceException.ofError("Result from detect microcode command not as expected: " + output);
-        }
-
-        return results[1].trim();
-    }
 }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java
index e2da984fa10..ebb3271e55c 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java
@@ -4,7 +4,6 @@ package com.yahoo.vespa.hosted.node.admin.maintenance.coredump;
 import com.yahoo.config.provision.DockerImage;
 import com.yahoo.security.KeyId;
 import com.yahoo.security.SecretSharedKey;
-import com.yahoo.security.SharedKeyGenerator;
 import com.yahoo.vespa.flags.FetchVector;
 import com.yahoo.vespa.flags.FlagSource;
 import com.yahoo.vespa.flags.Flags;
@@ -33,7 +32,6 @@ import java.nio.file.Paths;
 import java.time.Clock;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Predicate;
@@ -101,8 +99,7 @@ public class CoredumpHandler {
     }
 
 
-    public void converge(NodeAgentContext context, Supplier<Map<String, Object>> nodeAttributesSupplier,
-                         Optional<DockerImage> dockerImage, boolean throwIfCoreBeingWritten) {
+    public void converge(NodeAgentContext context, Optional<DockerImage> dockerImage, boolean throwIfCoreBeingWritten) {
         ContainerPath containerCrashPath = context.paths().of(crashPatchInContainer, context.users().vespa());
         ContainerPath containerProcessingPath = containerCrashPath.resolve(PROCESSING_DIRECTORY_NAME);