Use java.util.logging.Level in static imports.

14 files changed, 52 insertions, 53 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java
index 557a61ec211..292d4761d8a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java
@@ -21,7 +21,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 
 /**
  * The parent node for all Host instances, and thus accessible
@@ -120,7 +120,7 @@ public class HostSystem extends AbstractConfigProducer<Host> {
             HostResource host = getExistingHost(spec).orElseGet(() -> addNewHost(spec));
             retAllocatedHosts.put(host, spec.membership().orElse(null));
         }
-        retAllocatedHosts.keySet().forEach(host -> log.log(DEBUG, () -> "Allocated host " + host.getHostname() + " with flavor " + host.getFlavor()));
+        retAllocatedHosts.keySet().forEach(host -> log.log(FINE, () -> "Allocated host " + host.getHostname() + " with flavor " + host.getFlavor()));
         return retAllocatedHosts;
     }
 
@@ -131,7 +131,7 @@ public class HostSystem extends AbstractConfigProducer<Host> {
         if (hosts.isEmpty()) {
             return Optional.empty();
         } else {
-            log.log(DEBUG, () -> "Found existing host resource for " + key.hostname() + " with flavor " + hosts.get(0).getFlavor());
+            log.log(FINE, () -> "Found existing host resource for " + key.hostname() + " with flavor " + hosts.get(0).getFlavor());
             return Optional.of(hosts.get(0));
         }
     }
diff --git a/container-di/src/main/java/com/yahoo/container/di/ConfigRetriever.java b/container-di/src/main/java/com/yahoo/container/di/ConfigRetriever.java
index fde4ecfd33a..6ed9c2a2994 100644
--- a/container-di/src/main/java/com/yahoo/container/di/ConfigRetriever.java
+++ b/container-di/src/main/java/com/yahoo/container/di/ConfigRetriever.java
@@ -16,7 +16,7 @@ import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 
 /**
  * @author Tony Vaagenes
@@ -56,7 +56,7 @@ public final class ConfigRetriever {
                 throw new IllegalArgumentException("Component config keys [" + componentConfigKeys +
                                                    "] overlaps with bootstrap config keys [" + bootstrapKeys + "]");
 
-            log.log(DEBUG, "getConfigs: " + componentConfigKeys);
+            log.log(FINE, "getConfigs: " + componentConfigKeys);
             Set<ConfigKey<? extends ConfigInstance>> allKeys = new HashSet<>(componentConfigKeys);
             allKeys.addAll(bootstrapKeys);
             setupComponentSubscriber(allKeys);
@@ -84,7 +84,7 @@ public final class ConfigRetriever {
             throw new IllegalArgumentException(
                     "Component config keys [" + componentConfigKeys + "] overlaps with bootstrap config keys [" + bootstrapKeys + "]");
         }
-        log.log(DEBUG, "getConfigsOnce: " + componentConfigKeys);
+        log.log(FINE, "getConfigsOnce: " + componentConfigKeys);
 
         Set<ConfigKey<? extends ConfigInstance>> allKeys = new HashSet<>(componentConfigKeys);
         allKeys.addAll(bootstrapKeys);
@@ -97,7 +97,7 @@ public final class ConfigRetriever {
 
     private Optional<ConfigSnapshot> getConfigsOptional(long leastGeneration, boolean restartOnRedeploy) {
         long newestComponentGeneration = componentSubscriber.waitNextGeneration();
-        log.log(DEBUG, "getConfigsOptional: new component generation: " + newestComponentGeneration);
+        log.log(FINE, "getConfigsOptional: new component generation: " + newestComponentGeneration);
 
         // leastGeneration is only used to ensure newer generation when the previous generation was invalidated due to an exception
         if (newestComponentGeneration < leastGeneration) {
@@ -106,13 +106,13 @@ public final class ConfigRetriever {
             return Optional.empty();
         } else if (bootstrapSubscriber.generation() < newestComponentGeneration) {
             long newestBootstrapGeneration = bootstrapSubscriber.waitNextGeneration();
-            log.log(DEBUG, "getConfigsOptional: new bootstrap generation: " + bootstrapSubscriber.generation());
+            log.log(FINE, "getConfigsOptional: new bootstrap generation: " + bootstrapSubscriber.generation());
             Optional<ConfigSnapshot> bootstrapConfig = bootstrapConfigIfChanged();
             if (bootstrapConfig.isPresent()) {
                 return bootstrapConfig;
             } else {
                 if (newestBootstrapGeneration == newestComponentGeneration) {
-                    log.log(DEBUG, "Got new components configs with unchanged bootstrap configs.");
+                    log.log(FINE, "Got new components configs with unchanged bootstrap configs.");
                     return componentsConfigIfChanged();
                 } else {
                     // This should not be a normal case, and hence a warning to allow investigation.
@@ -155,7 +155,7 @@ public final class ConfigRetriever {
             componentSubscriber.close();
             componentSubscriberKeys = keys;
             try {
-                log.log(DEBUG, "Setting up new component subscriber for keys: " + keys);
+                log.log(FINE, "Setting up new component subscriber for keys: " + keys);
                 componentSubscriber = subscribe.apply(keys);
             } catch (Throwable e) {
                 log.log(Level.WARNING, "Failed setting up subscriptions for component configs: " + e.getMessage());
diff --git a/container-di/src/main/java/com/yahoo/container/di/Container.java b/container-di/src/main/java/com/yahoo/container/di/Container.java
index 9a9245f4ba2..d8fec35633b 100644
--- a/container-di/src/main/java/com/yahoo/container/di/Container.java
+++ b/container-di/src/main/java/com/yahoo/container/di/Container.java
@@ -30,7 +30,7 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 
 /**
  * @author gjoranv
@@ -139,7 +139,7 @@ public class Container {
         while (true) {
             snapshot = configurer.getConfigs(graph.configKeys(), leastGeneration, restartOnRedeploy);
 
-            log.log(DEBUG, String.format("createNewGraph:\n" + "graph.configKeys = %s\n" + "graph.generation = %s\n" + "snapshot = %s\n",
+            log.log(FINE, String.format("createNewGraph:\n" + "graph.configKeys = %s\n" + "graph.generation = %s\n" + "snapshot = %s\n",
                     graph.configKeys(), graph.generation(), snapshot));
 
             if (snapshot instanceof BootstrapConfigs) {
@@ -148,7 +148,7 @@ public class Container {
                             "Got bootstrap configs out of sequence for old config generation %d.\n" + "Previous config generation is %d",
                             getBootstrapGeneration(), previousConfigGeneration));
                 }
-                log.log(DEBUG,
+                log.log(FINE,
                         String.format(
                                 "Got new bootstrap generation\n" + "bootstrap generation = %d\n" + "components generation: %d\n"
                                         + "previous generation: %d\n",
@@ -165,7 +165,7 @@ public class Container {
                 break;
             }
         }
-        log.log(DEBUG,
+        log.log(FINE,
                 String.format(
                         "Got components configs,\n" + "bootstrap generation = %d\n" + "components generation: %d\n"
                                 + "previous generation: %d",
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java b/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
index 6662ba85e5d..92695565d47 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
+++ b/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
 import static com.yahoo.container.di.componentgraph.core.Exceptions.cutStackTraceAtConstructor;
 import static com.yahoo.container.di.componentgraph.core.Exceptions.removeStackTrace;
 import static com.yahoo.container.di.componentgraph.core.Keys.createKey;
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 
 /**
  * @author Tony Vaagenes
@@ -148,9 +148,9 @@ public class ComponentNode extends Node {
 
         Object instance;
         try {
-            log.log(DEBUG, "Constructing " + idAndType());
+            log.log(FINE, "Constructing " + idAndType());
             instance = constructor.newInstance(actualArguments.toArray());
-            log.log(DEBUG, "Finished constructing " + idAndType());
+            log.log(FINE, "Finished constructing " + idAndType());
         } catch (InvocationTargetException | InstantiationException | IllegalAccessException e) {
             StackTraceElement dependencyInjectorMarker = new StackTraceElement("============= Dependency Injection =============", "newInstance", null, -1);
 
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Node.java b/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Node.java
index 9ed89a6091a..3afc8bb817c 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Node.java
+++ b/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Node.java
@@ -15,8 +15,7 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.logging.Logger;
 
-import static com.yahoo.log.LogLevel.DEBUG;
-import static com.yahoo.log.LogLevel.SPAM;
+import static java.util.logging.Level.FINE;
 
 /**
  * @author Tony Vaagenes
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java b/container-di/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
index ed9b1350b1c..327949bb8d0 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
+++ b/container-di/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
@@ -11,7 +11,7 @@ import java.util.stream.Collectors;
 import static com.yahoo.container.di.componentgraph.cycle.CycleFinder.State.BLACK;
 import static com.yahoo.container.di.componentgraph.cycle.CycleFinder.State.GRAY;
 import static com.yahoo.container.di.componentgraph.cycle.CycleFinder.State.WHITE;
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 import static java.util.Collections.singletonList;
 
 
@@ -58,7 +58,7 @@ public class CycleFinder<T> {
                 if (visitDepthFirst(vertex, new ArrayList<>(singletonList(vertex)))) {
                     if (cycle == null) throw new IllegalStateException("Null cycle - this should never happen");
                     if (cycle.isEmpty()) throw new IllegalStateException("Empty cycle - this should never happen");
-                    log.log(DEBUG, "Cycle detected: " + cycle);
+                    log.log(FINE, "Cycle detected: " + cycle);
                     return cycle;
                 }
             }
@@ -68,7 +68,7 @@ public class CycleFinder<T> {
 
     private boolean visitDepthFirst(T vertex, List<T> path) {
         colors.put(vertex, GRAY);
-        log.log(DEBUG, "Vertex start " + vertex + " - colors: " + colors + " - path: " + path);
+        log.log(FINE, "Vertex start " + vertex + " - colors: " + colors + " - path: " + path);
         for (T adjacent : graph.getAdjacent(vertex)) {
             path.add(adjacent);
             if (colors.get(adjacent) == GRAY) {
@@ -81,7 +81,7 @@ public class CycleFinder<T> {
             path.remove(adjacent);
         }
         colors.put(vertex, BLACK);
-        log.log(DEBUG, "Vertex end " + vertex + " - colors: " + colors + " - path: " + path);
+        log.log(FINE, "Vertex end " + vertex + " - colors: " + colors + " - path: " + path);
         return false;
     }
 
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java b/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java
index d19362ecfb5..e60e8d407cd 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java
@@ -19,7 +19,7 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.SEVERE;
 import static java.util.logging.Level.WARNING;
@@ -52,11 +52,11 @@ public class Deconstructor implements ComponentDeconstructor {
                 }
             } else if (component instanceof Provider) {
                 // TODO Providers should most likely be deconstructed similarly to AbstractComponent
-                log.log(DEBUG, () -> "Starting deconstruction of provider " + component);
+                log.log(FINE, () -> "Starting deconstruction of provider " + component);
                 ((Provider<?>) component).deconstruct();
-                log.log(DEBUG, () -> "Finished deconstruction of provider " + component);
+                log.log(FINE, () -> "Finished deconstruction of provider " + component);
             } else if (component instanceof SharedResource) {
-                log.log(DEBUG, () -> "Releasing container reference to resource " + component);
+                log.log(FINE, () -> "Releasing container reference to resource " + component);
                 // No need to delay release, as jdisc does ref-counting
                 ((SharedResource) component).release();
             }
@@ -89,10 +89,10 @@ public class Deconstructor implements ComponentDeconstructor {
         @Override
         public void run() {
             for (var component : components) {
-                log.log(DEBUG, () -> "Starting deconstruction of component " + component);
+                log.log(FINE, () -> "Starting deconstruction of component " + component);
                 try {
                     component.deconstruct();
-                    log.log(DEBUG, () -> "Finished deconstructing of component " + component);
+                    log.log(FINE, () -> "Finished deconstructing of component " + component);
                 } catch (Exception | NoClassDefFoundError e) { // May get class not found due to it being already unloaded
                     log.log(WARNING, "Exception thrown when deconstructing component " + component, e);
                 } catch (Error e) {
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java
index 53a05ef88f0..33827634ebf 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java
@@ -23,7 +23,7 @@ import java.util.stream.Collectors;
 
 import static ai.vespa.metricsproxy.metric.ExternalMetrics.extractConfigserverDimensions;
 import static ai.vespa.metricsproxy.metric.model.DimensionId.toDimensionId;
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 import static java.util.stream.Collectors.toList;
 
 /**
@@ -91,17 +91,17 @@ public class MetricsManager {
     public List<MetricsPacket.Builder> getMetricsAsBuilders(List<VespaService> services, Instant startTime) {
         if (services.isEmpty()) return Collections.emptyList();
 
-        log.log(DEBUG, () -> "Updating services prior to fetching metrics, number of services= " + services.size());
+        log.log(FINE, () -> "Updating services prior to fetching metrics, number of services= " + services.size());
         vespaServices.updateServices(services);
 
         List<MetricsPacket.Builder> result = vespaMetrics.getMetrics(services);
-        log.log(DEBUG, () -> "Got " + result.size() + " metrics packets for vespa services.");
+        log.log(FINE, () -> "Got " + result.size() + " metrics packets for vespa services.");
 
         purgeStaleMetrics();
         List<MetricsPacket.Builder> externalPackets = externalMetrics.getMetrics().stream()
                 .filter(MetricsPacket.Builder::hasMetrics)
                 .collect(toList());
-        log.log(DEBUG, () -> "Got " + externalPackets.size() + " external metrics packets with whitelisted metrics.");
+        log.log(FINE, () -> "Got " + externalPackets.size() + " external metrics packets with whitelisted metrics.");
 
         result.addAll(externalPackets);
 
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java
index 145eef3f745..a93b5eb31c0 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java
@@ -20,7 +20,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 import static java.util.Collections.emptyList;
 
 /**
@@ -65,13 +65,13 @@ public class NodeMetricsClient {
 
     private Snapshot retrieveMetrics(ConsumerId consumer) {
         String metricsUri = node.metricsUri(consumer).toString();
-        log.log(DEBUG, () -> "Retrieving metrics from host " + metricsUri);
+        log.log(FINE, () -> "Retrieving metrics from host " + metricsUri);
 
         try {
             String metricsJson = httpClient.execute(new HttpGet(metricsUri), new BasicResponseHandler());
             var newMetrics = GenericJsonUtil.toMetricsPackets(metricsJson);
             snapshotsRetrieved ++;
-            log.log(DEBUG, () -> "Successfully retrieved " + newMetrics.size() + " metrics packets from " + metricsUri);
+            log.log(FINE, () -> "Successfully retrieved " + newMetrics.size() + " metrics packets from " + metricsUri);
             return new Snapshot(Instant.now(clock), newMetrics);
         } catch (IOException e) {
             log.warning("Unable to retrieve metrics from " + metricsUri + ": " + Exceptions.toMessageString(e));
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java
index 0a2dbc9a910..337967f3075 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java
@@ -21,7 +21,7 @@ import java.util.logging.Logger;
 import static ai.vespa.metricsproxy.metric.model.DimensionId.toDimensionId;
 import static ai.vespa.metricsproxy.metric.model.MetricId.toMetricId;
 import static ai.vespa.metricsproxy.metric.model.ServiceId.toServiceId;
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 import static java.util.stream.Collectors.toCollection;
 
 /**
@@ -53,7 +53,7 @@ public class ExternalMetrics {
     public void setExtraMetrics(List<MetricsPacket.Builder> externalPackets) {
         // TODO: Metrics filtering per consumer is not yet implemented.
         //       Split each packet per metric, and re-aggregate based on the metrics each consumer wants. Then filter out all packages with no consumers.
-        log.log(DEBUG, () -> "Setting new external metrics with " + externalPackets.size() + " metrics packets.");
+        log.log(FINE, () -> "Setting new external metrics with " + externalPackets.size() + " metrics packets.");
         externalPackets.forEach(packet -> {
             packet.addConsumers(consumers.getAllConsumers())
                     .retainMetrics(metricsToRetain())
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java
index 269b70c8316..c09dc44d3fd 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java
@@ -11,7 +11,7 @@ import com.yahoo.jrt.Transport;
 
 import java.util.logging.Logger;
 
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 import static java.util.logging.Level.INFO;
 
 /**
@@ -30,7 +30,7 @@ public class RpcConnector extends AbstractComponent {
         Spec spec = new Spec(config.port());
         try {
             acceptor = supervisor.listen(spec);
-            log.log(DEBUG, "Listening on " + spec.host() + ":" + acceptor.port());
+            log.log(FINE, "Listening on " + spec.host() + ":" + acceptor.port());
         } catch (ListenFailedException e) {
             stop();
             log.log(INFO, "Failed listening at " + spec.host() + ":" + spec.port());
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java
index ba84347c7ea..e634d533e5c 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java
@@ -20,7 +20,7 @@ import static ai.vespa.metricsproxy.metric.model.ConsumerId.toConsumerId;
 import static ai.vespa.metricsproxy.metric.model.json.YamasJsonUtil.toMetricsPackets;
 import static ai.vespa.metricsproxy.metric.model.json.YamasJsonUtil.toYamasArray;
 import static com.yahoo.collections.CollectionUtil.mkString;
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 
@@ -46,7 +46,7 @@ public class RpcServer {
         this.vespaServices = vespaServices;
         this.metricsManager = metricsManager;
         addMethods(connector);
-        log.log(DEBUG, "RPC server created");
+        log.log(FINE, "RPC server created");
     }
 
     private void addMethods(RpcConnector connector) {
@@ -120,13 +120,13 @@ public class RpcServer {
         Instant startTime = Instant.now();
         req.detach();
         String service = req.parameters().get(0).asString();
-        log.log(DEBUG, () -> "getMetricsForYamas called at " + startTime + " with argument: " + service);
+        log.log(FINE, () -> "getMetricsForYamas called at " + startTime + " with argument: " + service);
         List<VespaService> services = vespaServices.getMonitoringServices(service);
-        log.log(DEBUG, () -> "Getting metrics for services: " + mkString(services, "[", ", ", "]"));
+        log.log(FINE, () -> "Getting metrics for services: " + mkString(services, "[", ", ", "]"));
         if (services.isEmpty()) setNoServiceError(req, service);
         else withExceptionHandling(req, () -> {
             List<MetricsPacket> packets = metricsManager.getMetrics(services, startTime);
-            log.log(DEBUG,() -> "Returning metrics packets:\n" + mkString(packets, "\n"));
+            log.log(FINE,() -> "Returning metrics packets:\n" + mkString(packets, "\n"));
             req.returnValues().add(new StringValue(toYamasArray(packets).serialize()));
         });
         req.returnRequest();
@@ -146,7 +146,7 @@ public class RpcServer {
 
     void setExtraMetrics(Request req) {
         String metricsJson = req.parameters().get(0).asString();
-        log.log(DEBUG, "setExtraMetrics called with argument: " + metricsJson);
+        log.log(FINE, "setExtraMetrics called with argument: " + metricsJson);
         withExceptionHandling(req, () -> metricsManager.setExtraMetrics(toMetricsPackets(metricsJson)));
     }
 
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaServices.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaServices.java
index 76a4ae5046b..e01a68a1f7f 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaServices.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaServices.java
@@ -15,7 +15,7 @@ import java.util.logging.Logger;
 
 import static ai.vespa.metricsproxy.core.MetricsConsumers.toUnmodifiableLinkedMap;
 import static ai.vespa.metricsproxy.metric.model.DimensionId.toDimensionId;
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 
 /**
  * Creates representations for the Vespa services running on the node,
@@ -47,12 +47,12 @@ public class VespaServices {
     private List<VespaService> createServices(VespaServicesConfig servicesConfig, String monitoringSystemName) {
         List<VespaService> services = new ArrayList<>();
         for (Service s : servicesConfig.service()) {
-            log.log(DEBUG, "Creating service " + s.name());
+            log.log(FINE, "Creating service " + s.name());
             VespaService vespaService = VespaService.create(s.name(), s.configId(), s.port(), monitoringSystemName,
                                                             createServiceDimensions(s));
             services.add(vespaService);
         }
-        log.log(DEBUG, "Created new services: " + services.size());
+        log.log(FINE, "Created new services: " + services.size());
         return services;
     }
 
@@ -62,7 +62,7 @@ public class VespaServices {
      */
     public final void updateServices(List<VespaService> services) {
         if (sentinel != null) {
-            log.log(DEBUG, "Updating services ");
+            log.log(FINE, "Updating services ");
             sentinel.updateServiceStatuses(services);
         }
     }
@@ -103,7 +103,7 @@ public class VespaServices {
 
         List<VespaService> myServices = new ArrayList<>();
         for (VespaService s : services) {
-            log.log(DEBUG, () -> "getMonitoringServices. service=" + service + ", checking against " + s + ", which has monitoring name " + s.getMonitoringName());
+            log.log(FINE, () -> "getMonitoringServices. service=" + service + ", checking against " + s + ", which has monitoring name " + s.getMonitoringName());
             if (s.getMonitoringName().equalsIgnoreCase(service)) {
                 myServices.add(s);
             }
diff --git a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java
index bf95b2ef6c5..7a94bbc1e47 100644
--- a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java
+++ b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java
@@ -29,9 +29,9 @@ import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static com.yahoo.log.LogLevel.ERROR;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.logging.Level.INFO;
+import static java.util.logging.Level.SEVERE;
 
 /**
  * @author valerijf
@@ -167,7 +167,7 @@ public class TestRunner {
             success = mavenProcess.waitFor() == 0;
         }
         catch (Exception exception) {
-            LogRecord record = new LogRecord(ERROR, "Failed to execute maven command: " + String.join(" ", builder.command()));
+            LogRecord record = new LogRecord(SEVERE, "Failed to execute maven command: " + String.join(" ", builder.command()));
             record.setThrown(exception);
             logger.log(record);
             log.put(record.getSequenceNumber(), record);