LogLevel.WARNING -> Level.WARNING

110 files changed, 178 insertions, 178 deletions

diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java
index b101f0bce67..cfc63df4a92 100644
--- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java
+++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java
@@ -77,7 +77,7 @@ public class InstanceValidator {
 
         VespaUniqueInstanceId csrProviderUniqueId = getVespaUniqueInstanceId(instanceConfirmation);
         if(! providerUniqueId.equals(csrProviderUniqueId)) {
-            log.log(LogLevel.WARNING, String.format("Instance %s has invalid provider unique ID in CSR (%s)", providerUniqueId, csrProviderUniqueId));
+            log.log(Level.WARNING, String.format("Instance %s has invalid provider unique ID in CSR (%s)", providerUniqueId, csrProviderUniqueId));
             return false;
         }
 
@@ -107,7 +107,7 @@ public class InstanceValidator {
         try {
             return validateAttributes(confirmation, getVespaUniqueInstanceId(confirmation));
         } catch (Exception e) {
-            log.log(LogLevel.WARNING, "Encountered exception while refreshing certificate for confirmation: " + confirmation, e);
+            log.log(Level.WARNING, "Encountered exception while refreshing certificate for confirmation: " + confirmation, e);
             return false;
         }
     }
@@ -131,7 +131,7 @@ public class InstanceValidator {
 
     private boolean validateAttributes(InstanceConfirmation confirmation, VespaUniqueInstanceId vespaUniqueInstanceId) {
         if(vespaUniqueInstanceId == null) {
-            log.log(LogLevel.WARNING, "Unable to find unique instance ID in refresh request: " + confirmation.toString());
+            log.log(Level.WARNING, "Unable to find unique instance ID in refresh request: " + confirmation.toString());
             return false;
         }
 
@@ -142,7 +142,7 @@ public class InstanceValidator {
                 .findFirst() // Should be only one
                 .orElse(null);
         if(node == null) {
-            log.log(LogLevel.WARNING, "Invalid InstanceConfirmation, No nodes matching uniqueId: " + vespaUniqueInstanceId);
+            log.log(Level.WARNING, "Invalid InstanceConfirmation, No nodes matching uniqueId: " + vespaUniqueInstanceId);
             return false;
         }
 
@@ -162,7 +162,7 @@ public class InstanceValidator {
         // Validate that ipaddresses in request are valid for node
 
         if(! nodeIpAddresses.containsAll(ips)) {
-            log.log(LogLevel.WARNING, "Invalid InstanceConfirmation, wrong ip in : " + vespaUniqueInstanceId);
+            log.log(Level.WARNING, "Invalid InstanceConfirmation, wrong ip in : " + vespaUniqueInstanceId);
             return false;
         }
         return true;
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
index bfa202432b6..b9c839c3b87 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
@@ -510,9 +510,9 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
             try{
                 rpcServer.setSlobrokConnectionSpecs(options.slobrokConnectionSpecs, options.rpcPort);
             } catch (ListenFailedException e) {
-                log.log(LogLevel.WARNING, "Failed to bind RPC server to port " + options.rpcPort +". This may be natural if cluster has altered the services running on this node: " + e.getMessage());
+                log.log(Level.WARNING, "Failed to bind RPC server to port " + options.rpcPort +". This may be natural if cluster has altered the services running on this node: " + e.getMessage());
             } catch (Exception e) {
-                log.log(LogLevel.WARNING, "Failed to initialize RPC server socket: " + e.getMessage());
+                log.log(Level.WARNING, "Failed to initialize RPC server socket: " + e.getMessage());
             }
         }
 
@@ -520,7 +520,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
             try{
                 statusPageServer.setPort(options.httpPort);
             } catch (Exception e) {
-                log.log(LogLevel.WARNING, "Failed to initialize status server socket. This may be natural if cluster has altered the services running on this node: " + e.getMessage());
+                log.log(Level.WARNING, "Failed to initialize status server socket. This may be natural if cluster has altered the services running on this node: " + e.getMessage());
             }
         }
 
@@ -633,7 +633,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
         } catch (InterruptedException e) {
             throw (InterruptedException) new InterruptedException("Interrupted").initCause(e);
         } catch (Exception e) {
-            log.log(LogLevel.WARNING, "Failed to watch master election: " + e.toString());
+            log.log(Level.WARNING, "Failed to watch master election: " + e.toString());
         }
         return false;
     }
@@ -811,7 +811,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
                 taskCompletionQueue.remove();
             } else if (taskCompletion.getDeadlineTimePointMs() <= now) {
                 var details = buildNodesNotYetConvergedMessage(taskCompletion.getMinimumVersion());
-                log.log(LogLevel.WARNING, () -> String.format("Deferred task of type '%s' has exceeded wait deadline; completing with failure (details: %s)",
+                log.log(Level.WARNING, () -> String.format("Deferred task of type '%s' has exceeded wait deadline; completing with failure (details: %s)",
                         taskCompletion.getTask().getClass().getName(), details));
                 taskCompletion.getTask().handleFailure(RemoteClusterControllerTask.Failure.of(
                         RemoteClusterControllerTask.FailureCondition.DEADLINE_EXCEEDED, details));
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeInfo.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeInfo.java
index 12a6d72d400..652c3039430 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeInfo.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeInfo.java
@@ -392,7 +392,7 @@ abstract public class NodeInfo implements Comparable<NodeInfo> {
                 return true;
             }
         }
-        log.log(LogLevel.WARNING, "Node " + toString() + " does not support " + methodName + " which it should.");
+        log.log(Level.WARNING, "Node " + toString() + " does not support " + methodName + " which it should.");
         return false;
     }
 
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateGatherer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateGatherer.java
index 7e7092eb67e..87a572ce4a0 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateGatherer.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateGatherer.java
@@ -135,7 +135,7 @@ public class NodeStateGatherer {
                         listener.handleNewNodeState(info, state.clone());
                     info.setReportedState(state, currentTime);
                 } catch (Exception e) {
-                    log.log(LogLevel.WARNING, "Failed to process get node state response", e);
+                    log.log(Level.WARNING, "Failed to process get node state response", e);
                     info.setReportedState(new NodeState(info.getNode().getType(), State.DOWN), currentTime);
                 }
 
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/DatabaseHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/DatabaseHandler.java
index f648f08a3ea..bb0692c2e24 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/DatabaseHandler.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/DatabaseHandler.java
@@ -181,12 +181,12 @@ public class DatabaseHandler {
         } catch (InterruptedException e) {
             throw (InterruptedException) new InterruptedException("Interrupted").initCause(e);
         } catch (KeeperException.ConnectionLossException e) {
-            log.log(LogLevel.WARNING, "Fleetcontroller " + nodeIndex + ": Failed to connect to ZooKeeper at " + zooKeeperAddress
+            log.log(Level.WARNING, "Fleetcontroller " + nodeIndex + ": Failed to connect to ZooKeeper at " + zooKeeperAddress
                     + " with session timeout " + zooKeeperSessionTimeout + ": " + e.getMessage());
         } catch (Exception e) {
             StringWriter sw = new StringWriter();
             e.printStackTrace(new PrintWriter(sw));
-            log.log(LogLevel.WARNING, "Fleetcontroller " + nodeIndex + ": Failed to connect to ZooKeeper at " + zooKeeperAddress
+            log.log(Level.WARNING, "Fleetcontroller " + nodeIndex + ": Failed to connect to ZooKeeper at " + zooKeeperAddress
                     + " with session timeout " + zooKeeperSessionTimeout + ": " + sw);
         }
         log.log(Level.INFO, "Fleetcontroller " + nodeIndex + ": Done setting up new ZooKeeper session at " + zooKeeperAddress);
@@ -239,7 +239,7 @@ public class DatabaseHandler {
                 didWork |= performZooKeeperWrites();
             }
         } catch (CasWriteFailed e) {
-            log.log(LogLevel.WARNING, String.format("CaS write to ZooKeeper failed, another controller " +
+            log.log(Level.WARNING, String.format("CaS write to ZooKeeper failed, another controller " +
                     "has likely taken over ownership: %s", e.getMessage()));
             // Clear DB and master election state. This shall trigger a full re-fetch of all
             // version and election-related metadata.
@@ -265,7 +265,7 @@ public class DatabaseHandler {
                 currentlyStored.masterVote = pendingStore.masterVote;
                 pendingStore.masterVote = null;
             } else {
-                log.log(LogLevel.WARNING, "Fleetcontroller " + nodeIndex + ": Failed to store master vote");
+                log.log(Level.WARNING, "Fleetcontroller " + nodeIndex + ": Failed to store master vote");
                 return true;
             }
         }
@@ -355,7 +355,7 @@ public class DatabaseHandler {
         Integer version = currentlyStored.lastSystemStateVersion;
         if (version == null) {
             if (usingZooKeeper()) {
-                log.log(LogLevel.WARNING, "Fleetcontroller " + nodeIndex + ": Failed to retrieve latest system state version from ZooKeeper. Returning version 0.");
+                log.log(Level.WARNING, "Fleetcontroller " + nodeIndex + ": Failed to retrieve latest system state version from ZooKeeper. Returning version 0.");
             }
             return 0; // FIXME "fail-oblivious" is not a good error handling mode for such a critical component!
         }
@@ -467,7 +467,7 @@ public class DatabaseHandler {
         Map<Node, Long> startTimestamps = currentlyStored.startTimestamps;
         if (startTimestamps == null) {
             if (usingZooKeeper()) {
-                log.log(LogLevel.WARNING, "Fleetcontroller " + nodeIndex + ": Failed to retrieve start timestamps from ZooKeeper. Cluster state will be bloated with timestamps until we get them set.");
+                log.log(Level.WARNING, "Fleetcontroller " + nodeIndex + ": Failed to retrieve start timestamps from ZooKeeper. Cluster state will be bloated with timestamps until we get them set.");
             }
             startTimestamps = new TreeMap<>();
         }
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/MasterDataGatherer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/MasterDataGatherer.java
index 1c50afa4310..75dfb90d059 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/MasterDataGatherer.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/MasterDataGatherer.java
@@ -63,7 +63,7 @@ public class MasterDataGatherer {
                     session.getData(zooKeeperRoot + "indexes/" + index, this, nodeListener, null);
                     break;
                 case NodeCreated: // How can this happen? Can one leave watches on non-existing nodes?
-                    log.log(LogLevel.WARNING, "Fleetcontroller " + nodeIndex + ": Got unexpected ZooKeeper event NodeCreated");
+                    log.log(Level.WARNING, "Fleetcontroller " + nodeIndex + ": Got unexpected ZooKeeper event NodeCreated");
                     break;
                 case NodeDeleted:
                         // We get this event when fleetcontrollers shut down and node in dir disappears. But it should also trigger a NodeChildrenChanged event, so
@@ -115,7 +115,7 @@ public class MasterDataGatherer {
                         log.log(Level.INFO, "Fleetcontroller " + nodeIndex + ": Node at " + path +
                                 " removed, got no other option than counting it as down.");
                     } else {
-                        log.log(LogLevel.WARNING, "Fleetcontroller " + nodeIndex + ": Failure code " + code +
+                        log.log(Level.WARNING, "Fleetcontroller " + nodeIndex + ": Failure code " + code +
                                 " when listening to node at " + path + ", will assume it's down.");
                     }
                     if (nextMasterData.containsKey(index)) {
@@ -133,7 +133,7 @@ public class MasterDataGatherer {
                             nextMasterData.put(index, value);
                         }
                     } else {
-                        log.log(LogLevel.WARNING, "Fleetcontroller " + nodeIndex + ": Got vote from fleetcontroller " + index + " which is not alive according to current state. Ignoring it");
+                        log.log(Level.WARNING, "Fleetcontroller " + nodeIndex + ": Got vote from fleetcontroller " + index + " which is not alive according to current state. Ignoring it");
                     }
                 }
                 for(Integer vote : nextMasterData.values()) {
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java
index 7e878c80fdb..bba417b1333 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java
@@ -52,7 +52,7 @@ public class ZooKeeperDatabase extends Database {
         public void process(WatchedEvent watchedEvent) {
             // Shouldn't get events after we expire, but just be sure we stop them here.
             if (state != null && state.equals(Event.KeeperState.Expired)) {
-                log.log(LogLevel.WARNING, "Fleetcontroller " + nodeIndex + ": Got event from ZooKeeper session after it expired");
+                log.log(Level.WARNING, "Fleetcontroller " + nodeIndex + ": Got event from ZooKeeper session after it expired");
                 return;
             }
             Event.KeeperState newState = watchedEvent.getState();
@@ -75,20 +75,20 @@ public class ZooKeeperDatabase extends Database {
             }
             switch (watchedEvent.getType()) {
                 case NodeChildrenChanged: // Fleetcontrollers have either connected or disconnected to ZooKeeper
-                    log.log(LogLevel.WARNING, "Fleetcontroller " + nodeIndex + ": Got unexpected ZooKeeper event NodeChildrenChanged");
+                    log.log(Level.WARNING, "Fleetcontroller " + nodeIndex + ": Got unexpected ZooKeeper event NodeChildrenChanged");
                     break;
                 case NodeDataChanged: // A fleetcontroller have changed what node it is voting for
-                    log.log(LogLevel.WARNING, "Fleetcontroller " + nodeIndex + ": Got unexpected ZooKeeper event NodeDataChanged");
+                    log.log(Level.WARNING, "Fleetcontroller " + nodeIndex + ": Got unexpected ZooKeeper event NodeDataChanged");
                     break;
                 case NodeCreated: // How can this happen? Can one leave watches on non-existing nodes?
-                    log.log(LogLevel.WARNING, "Fleetcontroller " + nodeIndex + ": Got unexpected ZooKeeper event NodeCreated");
+                    log.log(Level.WARNING, "Fleetcontroller " + nodeIndex + ": Got unexpected ZooKeeper event NodeCreated");
                     break;
                 case NodeDeleted: // We're not watching any nodes for whether they are deleted or not.
-                    log.log(LogLevel.WARNING, "Fleetcontroller " + nodeIndex + ": Got unexpected ZooKeeper event NodeDeleted");
+                    log.log(Level.WARNING, "Fleetcontroller " + nodeIndex + ": Got unexpected ZooKeeper event NodeDeleted");
                     break;
                 case None:
                     if (state != null && state.equals(watchedEvent.getState())) {
-                        log.log(LogLevel.WARNING, "Fleetcontroller " + nodeIndex + ": Got None type event that didn't even alter session state. What does that indicate?");
+                        log.log(Level.WARNING, "Fleetcontroller " + nodeIndex + ": Got None type event that didn't even alter session state. What does that indicate?");
                     }
             }
             state = watchedEvent.getState();
@@ -166,7 +166,7 @@ public class ZooKeeperDatabase extends Database {
                     + Long.toHexString(session.getSessionId()));
             session.close();
         } catch (InterruptedException e) {
-            log.log(LogLevel.WARNING, "Fleetcontroller " + nodeIndex + ": Got interrupt exception while closing session: " + e);
+            log.log(Level.WARNING, "Fleetcontroller " + nodeIndex + ": Got interrupt exception while closing session: " + e);
         }
     }
 
@@ -178,7 +178,7 @@ public class ZooKeeperDatabase extends Database {
         if (sessionOpen && reportErrors) {
             StringWriter sw = new StringWriter();
             e.printStackTrace(new PrintWriter(sw));
-            log.log(LogLevel.WARNING, String.format("Fleetcontroller %s: %s. Exception: %s\n%s",
+            log.log(Level.WARNING, String.format("Fleetcontroller %s: %s. Exception: %s\n%s",
                     nodeIndex, message, e.getMessage(), sw.toString()));
         }
     }
@@ -277,7 +277,7 @@ public class ZooKeeperDatabase extends Database {
                         NodeState nodeState = NodeState.deserialize(node.getType(), token.substring(colon + 1));
                         wanted.put(node, nodeState);
                     } catch (Exception e) {
-                        log.log(LogLevel.WARNING, "Fleetcontroller " + nodeIndex + ": Ignoring invalid wantedstate line in zookeeper '" + token + "'.");
+                        log.log(Level.WARNING, "Fleetcontroller " + nodeIndex + ": Ignoring invalid wantedstate line in zookeeper '" + token + "'.");
                     }
                 }
             }
@@ -329,7 +329,7 @@ public class ZooKeeperDatabase extends Database {
                         Long timestamp =  Long.valueOf(token.substring(colon + 1));
                         wanted.put(n, timestamp);
                     } catch (Exception e) {
-                        log.log(LogLevel.WARNING, "Fleetcontroller " + nodeIndex + ": Ignoring invalid starttimestamp line in zookeeper '" + token + "'.");
+                        log.log(Level.WARNING, "Fleetcontroller " + nodeIndex + ": Ignoring invalid starttimestamp line in zookeeper '" + token + "'.");
                     }
                 }
             }
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java
index c12f906fe09..fb23e54b82a 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java
@@ -197,13 +197,13 @@ public class RpcServer {
                 if (!e.getMessage().equals(lastConnectError) || time - lastConnectErrorTime > 60 * 1000) {
                     lastConnectError = e.getMessage();
                     lastConnectErrorTime = time;
-                    log.log(LogLevel.WARNING, "Failed to bind RPC server to port " + port +": " + e.getMessage());
+                    log.log(Level.WARNING, "Failed to bind RPC server to port " + port +": " + e.getMessage());
                 }
             } catch (Exception e) {
                 if (!e.getMessage().equals(lastConnectError) || time - lastConnectErrorTime > 60 * 1000) {
                     lastConnectError = e.getMessage();
                     lastConnectErrorTime = time;
-                    log.log(LogLevel.WARNING, "Failed to initailize RPC server socket: " + e.getMessage());
+                    log.log(Level.WARNING, "Failed to initailize RPC server socket: " + e.getMessage());
                 }
             }
         }
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java
index 643a6a94c50..3ef26b2a19f 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java
@@ -142,7 +142,7 @@ public class SlobrokClient implements NodeLookup {
         cluster.setSlobrokGenerationCount(mirrorVersion);
         for (NodeInfo nodeInfo : cluster.getNodeInfo()) {
             if (slobrokNodes.containsKey(nodeInfo.getNode()) && nodeInfo.isRpcAddressOutdated()) {
-                log.log(LogLevel.WARNING, "Node " + nodeInfo
+                log.log(Level.WARNING, "Node " + nodeInfo
                         + " was tagged NOT in slobrok even though it is. It was in the following lists:"
                         + (newNodes.contains(nodeInfo.getNode()) ? " newNodes" : "")
                         + (missingNodeInfos.contains(nodeInfo) ? " missingNodes" : "")
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java
index 8b3bec1b2cf..55241d8310d 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java
@@ -238,7 +238,7 @@ public class StatusPageServer implements Runnable, StatusPageServerInterface {
                    log.log(e.getMessage().indexOf("Broken pipe") >= 0 ? LogLevel.DEBUG : LogLevel.INFO,
                            "Failed to process HTTP request : " + e.getMessage());
                 } catch (Exception e) {
-                    log.log(LogLevel.WARNING, "Caught exception in HTTP server thread: "
+                    log.log(Level.WARNING, "Caught exception in HTTP server thread: "
                             + e.getClass().getName() + ": " + e.getMessage());
                 } finally {
                     if (output != null) try {
@@ -392,7 +392,7 @@ public class StatusPageServer implements Runnable, StatusPageServerInterface {
                 if (!e.getMessage().equals(lastConnectError) || time - lastConnectErrorTime > 60 * 1000) {
                     lastConnectError = e.getMessage();
                     lastConnectErrorTime = time;
-                    log.log(LogLevel.WARNING, "Failed to initialize HTTP status server server socket: " + e.getMessage());
+                    log.log(Level.WARNING, "Failed to initialize HTTP status server server socket: " + e.getMessage());
                 }
             }
         }
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
index fa2eb80506e..5c910983bc9 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
@@ -211,7 +211,7 @@ public abstract class FleetControllerTest implements Waiter {
         if (fleetController == null) {
             fleetController = createFleetController(usingFakeTimer, options, true, null);
         } else {
-            log.log(LogLevel.WARNING, "already started fleetcontroller, not starting another");
+            log.log(Level.WARNING, "already started fleetcontroller, not starting another");
         }
     }
 
diff --git a/config-application-package/src/main/java/com/yahoo/config/application/PropertiesProcessor.java b/config-application-package/src/main/java/com/yahoo/config/application/PropertiesProcessor.java
index 2966030db40..1c5ea8510cb 100644
--- a/config-application-package/src/main/java/com/yahoo/config/application/PropertiesProcessor.java
+++ b/config-application-package/src/main/java/com/yahoo/config/application/PropertiesProcessor.java
@@ -42,7 +42,7 @@ class PropertiesProcessor implements PreProcessor {
                 //System.out.println("Found " + node.getNodeName() + ", " + node.getTextContent());
                 final String propertyName = node.getNodeName();
                 if (properties.containsKey(propertyName)) {
-                    log.log(LogLevel.WARNING, "Duplicate definition for property '" + propertyName + "' detected");
+                    log.log(Level.WARNING, "Duplicate definition for property '" + propertyName + "' detected");
                 }
                 properties.put(propertyName, node.getTextContent());
             }
diff --git a/config-application-package/src/main/java/com/yahoo/config/application/Xml.java b/config-application-package/src/main/java/com/yahoo/config/application/Xml.java
index afc6634b4cd..c48a41083c7 100644
--- a/config-application-package/src/main/java/com/yahoo/config/application/Xml.java
+++ b/config-application-package/src/main/java/com/yahoo/config/application/Xml.java
@@ -61,7 +61,7 @@ public class Xml {
         try {
             return factory.newDocumentBuilder();
         } catch (ParserConfigurationException e) {
-            log.log(LogLevel.WARNING, "No XML parser available - " + e);
+            log.log(Level.WARNING, "No XML parser available - " + e);
             return null;
         }
     }
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/StaticConfigDefinitionRepo.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/StaticConfigDefinitionRepo.java
index 8faef6b2ce6..c930adfb115 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/StaticConfigDefinitionRepo.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/StaticConfigDefinitionRepo.java
@@ -47,7 +47,7 @@ public class StaticConfigDefinitionRepo implements ConfigDefinitionRepo {
             ConfigDefinitionKey key = ConfigUtils.createConfigDefinitionKeyFromDefFile(def);
             addConfigDefinition(key, def);
         } catch (IOException e) {
-            log.log(LogLevel.WARNING, "Exception adding config definition " + def, e);
+            log.log(Level.WARNING, "Exception adding config definition " + def, e);
         }
     }
 
diff --git a/config-model/src/main/java/com/yahoo/config/model/builder/xml/XmlHelper.java b/config-model/src/main/java/com/yahoo/config/model/builder/xml/XmlHelper.java
index 93f308a2c2e..a392a778709 100644
--- a/config-model/src/main/java/com/yahoo/config/model/builder/xml/XmlHelper.java
+++ b/config-model/src/main/java/com/yahoo/config/model/builder/xml/XmlHelper.java
@@ -124,7 +124,7 @@ public final class XmlHelper {
             log.log(Level.FINE, "XML parser now operational!");
             return docBuilder;
         } catch (ParserConfigurationException e) {
-            log.log(LogLevel.WARNING, "No XML parser available - " + e);
+            log.log(Level.WARNING, "No XML parser available - " + e);
             return null;
         }
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
index 8437df43df9..96dc312abd7 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
@@ -154,7 +154,7 @@ public class RankSetupValidator extends Validator {
     private void validateWarn(Exception e, DeployLogger deployLogger) {
         String msg = "Unable to execute '"+ binaryName + "', validation of rank expressions will only take place when you start Vespa: " +
                 Exceptions.toMessageString(e);
-        deployLogger.log(LogLevel.WARNING, msg);
+        deployLogger.log(Level.WARNING, msg);
     }
 
     private void validateFail(String output, SearchCluster sc, String sdName, DeployLogger deployLogger) {
@@ -171,7 +171,7 @@ public class RankSetupValidator extends Validator {
             }
         }
         if (ignoreValidationErrors) {
-            deployLogger.log(LogLevel.WARNING, errMsg.append("(Continuing since ignoreValidationErrors flag is set.)").toString());
+            deployLogger.log(Level.WARNING, errMsg.append("(Continuing since ignoreValidationErrors flag is set.)").toString());
         } else {
             throw new IllegalArgumentException(errMsg.toString());
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java
index 00549cc3a99..be85861ddb6 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java
@@ -40,13 +40,13 @@ public class UserConfigBuilder {
 
         Optional<ConfigDefinition> def = configDefinitionStore.getConfigDefinition(key);
         if ( ! def.isPresent()) { // TODO: Fail instead of warn
-            logger.log(LogLevel.WARNING, "Unable to find config definition '" + key.asFileName() +
+            logger.log(Level.WARNING, "Unable to find config definition '" + key.asFileName() +
                                          "'. Please ensure that the name is spelled correctly, and that the def file is included in a bundle.");
         }
         ConfigPayloadBuilder payloadBuilder = new DomConfigPayloadBuilder(def.orElse(null)).build(element);
         ConfigPayloadBuilder old = builderMap.get(key);
         if (old != null) {
-            logger.log(LogLevel.WARNING, "Multiple overrides for " + key + " found. Applying in the order they are discovered");
+            logger.log(Level.WARNING, "Multiple overrides for " + key + " found. Applying in the order they are discovered");
             old.override(payloadBuilder);
         } else {
             builderMap.put(key, payloadBuilder);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java
index 1afb3abe90f..706311dcdbf 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java
@@ -53,7 +53,7 @@ public class DomAdminV2Builder extends DomAdminBuilderBase {
         addLogForwarders(adminElement.child("logforwarding"), admin);
 
         if (adminElement.child("filedistribution") != null) {
-            deployState.getDeployLogger().log(LogLevel.WARNING, "'filedistribution' element is deprecated and ignored");
+            deployState.getDeployLogger().log(Level.WARNING, "'filedistribution' element is deprecated and ignored");
         }
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java b/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
index 901d81927a5..6e6a4d5ac8f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
@@ -84,7 +84,7 @@ public class FileSender implements Serializable {
         ConfigDefinition configDefinition = builder.getConfigDefinition();
         if (configDefinition == null) {
             // TODO: throw new IllegalArgumentException("Not able to find config definition for " + builder);
-            logger.log(LogLevel.WARNING, "Not able to find config definition for " + key + ". Will not send files for this config");
+            logger.log(Level.WARNING, "Not able to find config definition for " + key + ". Will not send files for this config");
             return;
         }
         // Inspect fields at this level
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java
index 1399c3677af..a19d5809660 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java
@@ -253,7 +253,7 @@ public class ConfigProxyRpcServer implements Runnable, TargetWatcher, RpcServer
                 log.log(Level.FINEST, () -> String.format("Executing RPC request %s.", requestLogId(request)));
                 handler.run();
             } catch (Exception e) {
-                log.log(LogLevel.WARNING,
+                log.log(Level.WARNING,
                         String.format("Exception thrown during execution of RPC request %s: %s", requestLogId(request), e.getMessage()), e);
             }
         });
@@ -273,7 +273,7 @@ public class ConfigProxyRpcServer implements Runnable, TargetWatcher, RpcServer
         log.log(Level.FINE, () ->"getConfig: " + request.getShortDescription() + ",configmd5=" + request.getRequestConfigMd5());
         if (!request.validateParameters()) {
             // Error code is set in verifyParameters if parameters are not OK.
-            log.log(LogLevel.WARNING, "Parameters for request " + request + " did not validate: " + request.errorCode() + " : " + request.errorMessage());
+            log.log(Level.WARNING, "Parameters for request " + request + " did not validate: " + request.errorCode() + " : " + request.errorMessage());
             returnErrorResponse(request, request.errorCode(), "Parameters for request " + request.getShortDescription() + " did not validate: " + request.errorMessage());
             return;
         }
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponseHandler.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponseHandler.java
index 42bb2d21b55..317606ac3ef 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponseHandler.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponseHandler.java
@@ -50,14 +50,14 @@ public class DelayedResponseHandler implements Runnable {
                     rpcServer.returnOkResponse(request, config);
                     i.incrementAndGet();
                 } else {
-                    log.log(LogLevel.WARNING, "Timed out (timeout " + request.getTimeout() + ") getting config " +
+                    log.log(Level.WARNING, "Timed out (timeout " + request.getTimeout() + ") getting config " +
                             request.getConfigKey() + ", will retry");
                 }
             }
             log.log(Level.FINEST, () -> "Finished running DelayedResponseHandler. " + i.get() + " delayed responses sent in " +
                     (System.currentTimeMillis() - start) + " ms");
         } catch (Exception e) {  // To avoid thread throwing exception and executor never running this again
-            log.log(LogLevel.WARNING, "Got exception in DelayedResponseHandler: " + Exceptions.toMessageString(e));
+            log.log(Level.WARNING, "Got exception in DelayedResponseHandler: " + Exceptions.toMessageString(e));
         } catch (Throwable e) {
             com.yahoo.protect.Process.logAndDie("Got error in DelayedResponseHandler, exiting: " + Exceptions.toMessageString(e));
         }
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java
index c7a79cc8d14..aae76c4f980 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java
@@ -131,7 +131,7 @@ public class MemoryCache {
             writer.write("\n");
             writer.close();
         } catch (IOException e) {
-            log.log(LogLevel.WARNING, "Could not write to file '" + filename + "'");
+            log.log(Level.WARNING, "Could not write to file '" + filename + "'");
         } finally {
             if (writer != null) {
                 try {
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
index 25961caf85b..12fd95b8503 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
@@ -84,7 +84,7 @@ class RpcConfigSourceClient implements ConfigSourceClient {
      */
     private void checkConfigSources() {
         if (configSourceSet == null || configSourceSet.getSources() == null || configSourceSet.getSources().size() == 0) {
-            log.log(LogLevel.WARNING, "No config sources defined, could not check connection");
+            log.log(Level.WARNING, "No config sources defined, could not check connection");
         } else {
             Request req = new Request("ping");
             for (String configSource : configSourceSet.getSources()) {
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java
index 14d93ee046e..a24407588be 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java
@@ -56,7 +56,7 @@ public class UpstreamConfigSubscriber implements Subscriber {
             try {
                 updateWithNewConfig(handle);
             } catch (Exception e) {  // To avoid thread throwing exception and loop never running this again
-                log.log(LogLevel.WARNING, "Got exception: " + Exceptions.toMessageString(e));
+                log.log(Level.WARNING, "Got exception: " + Exceptions.toMessageString(e));
             } catch (Throwable e) {
                 com.yahoo.protect.Process.logAndDie("Got error, exiting: " + Exceptions.toMessageString(e));
             }
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/CachedFilesMaintainer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/CachedFilesMaintainer.java
index ffe7f7bec46..247ef8a4dbf 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/CachedFilesMaintainer.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/CachedFilesMaintainer.java
@@ -74,7 +74,7 @@ class CachedFilesMaintainer implements Runnable {
             filesToDelete.forEach(fileReference -> {
                 File file = new File(directory, fileReference);
                 if (!IOUtils.recursiveDeleteDir(file))
-                    log.log(LogLevel.WARNING, "Could not delete " + file.getAbsolutePath());
+                    log.log(Level.WARNING, "Could not delete " + file.getAbsolutePath());
             });
         }
     }
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/RequestTracker.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/RequestTracker.java
index 6b0be5bca16..206c0359850 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/RequestTracker.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/RequestTracker.java
@@ -21,10 +21,10 @@ class RequestTracker {
     void trackRequest(File file) {
         String absolutePath = file.getAbsolutePath();
         if ( ! file.exists())
-            log.log(LogLevel.WARNING, "Could not find file '" + absolutePath + "'");
+            log.log(Level.WARNING, "Could not find file '" + absolutePath + "'");
 
         if ( ! file.setLastModified(Instant.now().toEpochMilli()))
-            log.log(LogLevel.WARNING, "Could not set last modified timestamp for '" + absolutePath + "'");
+            log.log(Level.WARNING, "Could not set last modified timestamp for '" + absolutePath + "'");
     }
 
 }
diff --git a/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/http/FlagsHandler.java b/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/http/FlagsHandler.java
index 64cae0f31a0..c034ea79447 100644
--- a/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/http/FlagsHandler.java
+++ b/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/http/FlagsHandler.java
@@ -48,7 +48,7 @@ public class FlagsHandler extends LoggingRequestHandler {
             return ErrorResponse.badRequest(Exceptions.toMessageString(e));
         }
         catch (RuntimeException e) {
-            log.log(LogLevel.WARNING, "Unexpected error handling '" + request.getUri() + "'", e);
+            log.log(Level.WARNING, "Unexpected error handling '" + request.getUri() + "'", e);
             return ErrorResponse.internalServerError(Exceptions.toMessageString(e));
         }
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index 583d560994e..f6846a7448e 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -447,7 +447,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
                                                    .map(FileReference::value)
                                                    .collect(Collectors.toSet()));
             } catch (Exception e) {
-                log.log(LogLevel.WARNING, "Getting file references in use for '" + application + "' failed", e);
+                log.log(Level.WARNING, "Getting file references in use for '" + application + "' failed", e);
             }
         }
         log.log(Level.FINE, "File references in use : " + fileReferencesInUse);
@@ -470,7 +470,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
             fileReferencesToDelete.forEach(fileReference -> {
                 File file = new File(fileReferencesPath, fileReference);
                 if ( ! IOUtils.recursiveDeleteDir(file))
-                    log.log(LogLevel.WARNING, "Could not delete " + file.getAbsolutePath());
+                    log.log(Level.WARNING, "Could not delete " + file.getAbsolutePath());
             });
         }
         return fileReferencesToDelete;
@@ -498,10 +498,10 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
             if (session == null) throw new NotFoundException("Remote session " + sessionId + " not found");
             return session.ensureApplicationLoaded().getForVersionOrLatest(version, clock.instant());
         } catch (NotFoundException e) {
-            log.log(LogLevel.WARNING, "Failed getting application for '" + applicationId + "': " + e.getMessage());
+            log.log(Level.WARNING, "Failed getting application for '" + applicationId + "': " + e.getMessage());
             throw e;
         } catch (Exception e) {
-            log.log(LogLevel.WARNING, "Failed getting application for '" + applicationId + "'", e);
+            log.log(Level.WARNING, "Failed getting application for '" + applicationId + "'", e);
             throw e;
         }
     }
@@ -785,7 +785,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
     private void cleanupTempDirectory(File tempDir) {
         logger.log(Level.FINE, "Deleting tmp dir '" + tempDir + "'");
         if (!IOUtils.recursiveDeleteDir(tempDir)) {
-            logger.log(LogLevel.WARNING, "Not able to delete tmp dir '" + tempDir + "'");
+            logger.log(Level.WARNING, "Not able to delete tmp dir '" + tempDir + "'");
         }
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
index 35cbd0c4303..36767e6fc5f 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
@@ -127,7 +127,7 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable
             try {
                 thread.join();
             } catch (InterruptedException e) {
-                log.log(LogLevel.WARNING, "Error joining server thread on shutdown: " + e.getMessage());
+                log.log(Level.WARNING, "Error joining server thread on shutdown: " + e.getMessage());
             }
         });
     }
@@ -246,7 +246,7 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable
                     log.log(Level.INFO, "Redeploying " + app +
                             " failed with transient error, will retry after bootstrap: " + Exceptions.toMessageString(e));
                 } else {
-                    log.log(LogLevel.WARNING, "Redeploying " + app + " failed, will retry", e);
+                    log.log(Level.WARNING, "Redeploying " + app + " failed, will retry", e);
                     failedDeployments.add(app);
                 }
             }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/UserConfigDefinitionRepo.java b/configserver/src/main/java/com/yahoo/vespa/config/server/UserConfigDefinitionRepo.java
index 2a632a75330..15a9b8f74d0 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/UserConfigDefinitionRepo.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/UserConfigDefinitionRepo.java
@@ -32,7 +32,7 @@ public class UserConfigDefinitionRepo implements ConfigDefinitionRepo {
                 defs.put(dKey, new ConfigDefinition(dKey.getName(), Splitter.on("\n").splitToList(payload).toArray(new String[0])));
             }
         } else {
-            log.log(LogLevel.WARNING, "Path " + appPath + " does not exist, not able to load add user config definitions");
+            log.log(Level.WARNING, "Path " + appPath + " does not exist, not able to load add user config definitions");
         }
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStream.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStream.java
index 2cab0ea5e20..eeb4d31fe12 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStream.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStream.java
@@ -96,7 +96,7 @@ public class CompressedApplicationInputStream implements AutoCloseable {
                     log.log(Level.FINE, "Creating dir: " + outFile.getAbsolutePath());
                     boolean res = outFile.mkdirs();
                     if (!res) {
-                        log.log(LogLevel.WARNING, "Could not create dir " + entry.getName());
+                        log.log(Level.WARNING, "Could not create dir " + entry.getName());
                     }
                 }
             } else {
@@ -113,7 +113,7 @@ public class CompressedApplicationInputStream implements AutoCloseable {
             entries++;
         }
         if (entries == 0) {
-            log.log(LogLevel.WARNING, "Not able to read any entries from " + application.getName());
+            log.log(Level.WARNING, "Not able to read any entries from " + application.getName());
         }
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java
index f00acacef03..092db354ffd 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java
@@ -56,7 +56,7 @@ public class FileDistributionStatus extends AbstractComponent {
             try {
                 hostStatuses.add(future.get());
             } catch (InterruptedException | ExecutionException e) {
-                log.log(LogLevel.WARNING, "Failed getting file distribution status", e);
+                log.log(Level.WARNING, "Failed getting file distribution status", e);
             }
         });
         return createStatusForAllHosts(hostStatuses);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/HttpProxy.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/HttpProxy.java
index 88b13662b7f..8c53a9bc9d5 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/HttpProxy.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/HttpProxy.java
@@ -58,7 +58,7 @@ public class HttpProxy {
         try {
             url = new URL(urlString);
         } catch (MalformedURLException e) {
-            logger.log(LogLevel.WARNING, "Badly formed url: " + urlString, e);
+            logger.log(Level.WARNING, "Badly formed url: " + urlString, e);
             return HttpErrorResponse.internalServerError("Failed to construct URL for backend");
         }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
index 825a0b4a631..989fa10c202 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
@@ -298,7 +298,7 @@ public class ZooKeeperClient {
                 configCurator.deleteRecurse(getZooKeeperAppPath(null).append(subPath).getAbsolute());
             }
         } catch (Exception e) {
-            logger.log(LogLevel.WARNING, "Could not clean up in zookeeper");
+            logger.log(Level.WARNING, "Could not clean up in zookeeper");
             //Might be called in an exception handler before re-throw, so do not throw here.
         }
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
index c4279414a9b..cfa648ce351 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
@@ -32,7 +32,7 @@ public class FileDirectory  {
         try {
             ensureRootExist();
         } catch (IllegalArgumentException e) {
-            log.log(LogLevel.WARNING, "Failed creating directory in constructor, will retry on demand : " + e.toString());
+            log.log(Level.WARNING, "Failed creating directory in constructor, will retry on demand : " + e.toString());
         }
     }
 
@@ -85,7 +85,7 @@ public class FileDirectory  {
                     log.log(Level.FINE, "Calculating hash for '" + path + "'");
                     return hash(path.toFile(), hasher);
                 } catch (IOException e) {
-                    log.log(LogLevel.WARNING, "Failed getting hash from '" + path + "'");
+                    log.log(Level.WARNING, "Failed getting hash from '" + path + "'");
                     return 0;
                 }
             }).mapToLong(Number::longValue).sum();
@@ -153,7 +153,7 @@ public class FileDirectory  {
                 if (!destinationDir.exists()) {
                     log.log(Level.FINE, "Moving from " + tempDestinationDir + " to " + destinationDir.getAbsolutePath());
                     if ( ! tempDestinationDir.toFile().renameTo(destinationDir)) {
-                        log.log(LogLevel.WARNING, "Failed moving '" + tempDestinationDir.toFile().getAbsolutePath() + "' to '" + destination.getAbsolutePath() + "'.");
+                        log.log(Level.WARNING, "Failed moving '" + tempDestinationDir.toFile().getAbsolutePath() + "' to '" + destination.getAbsolutePath() + "'.");
                     }
                 } else {
                     IOUtils.copyDirectory(tempDestinationDir.toFile(), destinationDir, -1);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
index 6cde8cca18f..805ee2bef95 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
@@ -133,7 +133,7 @@ public class FileServer {
             target.receive(fileData, new ReplayStatus(success ? 0 : 1, success ? "OK" : errorDescription));
             log.log(Level.FINE, "Done serving file reference '" + reference.value() + "' with file '" + file.getAbsolutePath() + "'");
         } catch (Exception e) {
-            log.log(LogLevel.WARNING, "Failed serving file reference '" + reference.value() + "': " + Exceptions.toMessageString(e));
+            log.log(Level.WARNING, "Failed serving file reference '" + reference.value() + "': " + Exceptions.toMessageString(e));
         } finally {
             fileData.close();
         }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java
index e1a5845c4a1..e92eb52028b 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java
@@ -71,7 +71,7 @@ public class HttpHandler extends LoggingRequestHandler {
         } catch (LoadBalancerServiceException e) {
             return HttpErrorResponse.loadBalancerNotReady(getMessage(e, request));
         } catch (Exception e) {
-            log.log(LogLevel.WARNING, "Unexpected exception handling a config server request", e);
+            log.log(Level.WARNING, "Unexpected exception handling a config server request", e);
             return HttpErrorResponse.internalServerError(getMessage(e, request));
         }
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SimpleHttpFetcher.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SimpleHttpFetcher.java
index 28dfa30e7ac..9c77442dcc8 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SimpleHttpFetcher.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SimpleHttpFetcher.java
@@ -42,15 +42,15 @@ public class SimpleHttpFetcher implements HttpFetcher {
             }
         } catch (ConnectTimeoutException | SocketTimeoutException e) {
             String message = "Timed out after " + params.readTimeoutMs + " ms reading response from " + url;
-            logger.log(LogLevel.WARNING, message, e);
+            logger.log(Level.WARNING, message, e);
             throw new RequestTimeoutException(message);
         } catch (IOException e) {
             String message = "Failed to get response from " + url;
-            logger.log(LogLevel.WARNING, message, e);
+            logger.log(Level.WARNING, message, e);
             throw new InternalServerException(message);
         } catch (URISyntaxException e) {
             String message = "Invalid URL: " + e.getMessage();
-            logger.log(LogLevel.WARNING, message, e);
+            logger.log(Level.WARNING, message, e);
             throw new InternalServerException(message, e);
         }
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
index 1aaa090d145..ebb399076ad 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
@@ -121,10 +121,10 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
                     log.log(Level.INFO, applicationId + ": Skipping major version " + majorVersion, e);
                 } else  {
                     if (e instanceof NullPointerException || e instanceof NoSuchElementException | e instanceof UncheckedTimeoutException) {
-                        log.log(LogLevel.WARNING, "Unexpected error when building model ", e);
+                        log.log(Level.WARNING, "Unexpected error when building model ", e);
                         throw new InternalServerException(applicationId + ": Error loading model", e);
                     } else {
-                        log.log(LogLevel.WARNING, "Input error when building model ", e);
+                        log.log(Level.WARNING, "Input error when building model ", e);
                         throw new IllegalArgumentException(applicationId + ": Error loading model", e);
                     }
                 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java
index 3c18d5f11d2..cb7e5e4bf13 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java
@@ -185,7 +185,7 @@ public class DelayedConfigResponses {
                 response.schedule(Math.max(0, request.getTimeout()));
                 metricDelayedResponses(context.applicationId(), delayedResponsesQueue.size());
             } catch (InterruptedException e) {
-                log.log(LogLevel.WARNING, context.logPre()+"Interrupted when putting on delayed requests queue.");
+                log.log(Level.WARNING, context.logPre()+"Interrupted when putting on delayed requests queue.");
             }
         }
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java
index f2099388c7c..d55235d4602 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java
@@ -71,7 +71,7 @@ class GetConfigProcessor implements Runnable {
         //Request has already been detached
         if ( ! request.validateParameters()) {
             // Error code is set in verifyParameters if parameters are not OK.
-            log.log(LogLevel.WARNING, "Parameters for request " + request + " did not validate: " + request.errorCode() + " : " + request.errorMessage());
+            log.log(Level.WARNING, "Parameters for request " + request + " did not validate: " + request.errorCode() + " : " + request.errorMessage());
             respond(request);
             return null;
         }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
index 977e1f8cc28..22528e31dc0 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
@@ -398,7 +398,7 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
             String msg = TenantRepository.logPre(tenant) + "Unable to find request handler for tenant. Requested from host '" + request.getClientHostName() + "'";
             metrics.incUnknownHostRequests();
             trace.trace(TRACELEVEL, msg);
-            log.log(LogLevel.WARNING, msg);
+            log.log(Level.WARNING, msg);
             return null;
         }
         RequestHandler handler = requestHandler.get();
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionRepo.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionRepo.java
index bf76cf67cf1..97c4530e447 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionRepo.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionRepo.java
@@ -71,7 +71,7 @@ public class LocalSessionRepo extends SessionRepo<LocalSession> {
             try {
                 addSession(loader.loadSession(Long.parseLong(session.getName())));
             } catch (IllegalArgumentException e) {
-                log.log(LogLevel.WARNING, "Could not load session '" +
+                log.log(Level.WARNING, "Could not load session '" +
                         session.getAbsolutePath() + "':" + e.getMessage() + ", skipping it.");
             }
         }
@@ -88,7 +88,7 @@ public class LocalSessionRepo extends SessionRepo<LocalSession> {
             }
             // Make sure to catch here, to avoid executor just dying in case of issues ...
         } catch (Throwable e) {
-            log.log(LogLevel.WARNING, "Error when purging old sessions ", e);
+            log.log(Level.WARNING, "Error when purging old sessions ", e);
         }
         log.log(Level.FINE, "Done purging old sessions");
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionStateWatcher.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionStateWatcher.java
index 5a972086d82..268a755b266 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionStateWatcher.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionStateWatcher.java
@@ -54,7 +54,7 @@ public class LocalSessionStateWatcher {
         try {
             fileCache.close();
         } catch (Exception e) {
-            log.log(LogLevel.WARNING, "Exception when closing watcher", e);
+            log.log(Level.WARNING, "Exception when closing watcher", e);
         }
     }
 
@@ -66,7 +66,7 @@ public class LocalSessionStateWatcher {
                     sessionChanged(Session.Status.parse(Utf8.toString(node.getData())));
                 }
             } catch (Exception e) {
-                log.log(LogLevel.WARNING, session.logPre() + "Error handling session changed for session " + getSessionId(), e);
+                log.log(Level.WARNING, session.logPre() + "Error handling session changed for session " + getSessionId(), e);
             }
         });
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java
index d66525326a2..6dade946e5d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java
@@ -178,7 +178,7 @@ public class RemoteSessionRepo extends SessionRepo<RemoteSession> {
                 directoryCache.close();
             }
         } catch (Exception e) {
-            log.log(LogLevel.WARNING, "Exception when closing path cache", e);
+            log.log(Level.WARNING, "Exception when closing path cache", e);
         } finally {
             checkForRemovedSessions(new ArrayList<>());
         }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionStateWatcher.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionStateWatcher.java
index 549ad2a2d24..eb4047e5fea 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionStateWatcher.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionStateWatcher.java
@@ -66,7 +66,7 @@ public class RemoteSessionStateWatcher {
         try {
             fileCache.close();
         } catch (Exception e) {
-            log.log(LogLevel.WARNING, "Exception when closing watcher", e);
+            log.log(Level.WARNING, "Exception when closing watcher", e);
         }
     }
 
@@ -78,7 +78,7 @@ public class RemoteSessionStateWatcher {
                     sessionChanged(Session.Status.parse(Utf8.toString(node.getData())));
                 }
             } catch (Exception e) {
-                log.log(LogLevel.WARNING, session.logPre() + "Error handling session changed for session " + getSessionId(), e);
+                log.log(Level.WARNING, session.logPre() + "Error handling session changed for session " + getSessionId(), e);
                 metrics.incSessionChangeErrors();
             }
         });
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
index 49bfc20233e..04deed40c54 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
@@ -175,10 +175,10 @@ public class TenantRepository {
             try {
                 f.getValue().get();
             } catch (ExecutionException e) {
-                log.log(LogLevel.WARNING, "Failed to create tenant " + tenantName, e);
+                log.log(Level.WARNING, "Failed to create tenant " + tenantName, e);
                 failed.add(tenantName);
             } catch (InterruptedException e) {
-                log.log(LogLevel.WARNING, "Interrupted while creating tenant '" + tenantName + "'", e);
+                log.log(Level.WARNING, "Interrupted while creating tenant '" + tenantName + "'", e);
             }
         }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/InitializedCounter.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/InitializedCounter.java
index 6bf645cc02c..389649f4680 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/InitializedCounter.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/InitializedCounter.java
@@ -45,7 +45,7 @@ public class InitializedCounter {
         try {
             return configCurator.exists(appsPath);
         } catch (Exception e) {
-            log.log(LogLevel.WARNING, e.getMessage());
+            log.log(Level.WARNING, e.getMessage());
             return false;
         }
     }
@@ -64,7 +64,7 @@ public class InitializedCounter {
                 newestGeneration = Collections.max(getDeployedApplicationGenerations(configCurator, appsPath));
             }
         } catch (Exception e) {
-            log.log(LogLevel.WARNING, "Could not get newest application generation from Zookeeper");
+            log.log(Level.WARNING, "Could not get newest application generation from Zookeeper");
         }
         return newestGeneration;
     }
@@ -79,7 +79,7 @@ public class InitializedCounter {
                 }
             }
         } catch (RuntimeException e) {
-            log.log(LogLevel.WARNING, "Could not get application generations from Zookeeper");
+            log.log(Level.WARNING, "Could not get application generations from Zookeeper");
         }
         return generations;
     }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLoggerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLoggerTest.java
index a52788031c7..da450dfbedb 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLoggerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLoggerTest.java
@@ -45,6 +45,6 @@ public class DeployHandlerLoggerTest {
         logger.log(Level.FINE, "foobar");
         logger.log(Level.FINEST, "foobar");
         logger.log(LogLevel.FINE, "baz");
-        logger.log(LogLevel.WARNING, "baz");
+        logger.log(Level.WARNING, "baz");
     }
 }
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java
index 6878b6df09d..d7b846cef5c 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java
@@ -166,7 +166,7 @@ public abstract class LoggingRequestHandler extends ThreadedHttpRequestHandler {
         b.append("Timeout: ").append(timeoutInterval).append(" ms. ");
         b.append("Request string: ").append(req);
 
-        log.log(LogLevel.WARNING, "Slow execution. " + b);
+        log.log(Level.WARNING, "Slow execution. " + b);
     }
 
     private static class NullResponse extends ExtendedResponse {
@@ -308,7 +308,7 @@ public abstract class LoggingRequestHandler extends ThreadedHttpRequestHandler {
             logEntry.setHttpMethod(AccessLogUtil.getHttpMethod(httpRequest));
             logEntry.setHttpVersion(AccessLogUtil.getHttpVersion(httpRequest));
         } catch (Exception e) {
-            log.log(LogLevel.WARNING, "Could not populate the access log [" + fullRequest + "]", e);
+            log.log(Level.WARNING, "Could not populate the access log [" + fullRequest + "]", e);
         }
     }
 
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java
index a34ceb7f613..34ba7676680 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java
@@ -147,7 +147,7 @@ public abstract class ThreadedRequestHandler extends AbstractRequestHandler {
             currentFailureIntervalStartedMillis = 0L;
             numRejectedRequests = 0;
         }
-        log.log(LogLevel.WARNING, "Rejected " + numRejectedRequestsSnapshot + " requests on cause of no available worker threads.");
+        log.log(Level.WARNING, "Rejected " + numRejectedRequestsSnapshot + " requests on cause of no available worker threads.");
     }
 
     private void incrementRejectedRequests() {
diff --git a/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java b/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java
index 3a1eb216d42..cedd5b97ed6 100644
--- a/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java
+++ b/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java
@@ -471,7 +471,7 @@ public abstract class AsynchronousSectionedRenderer<RESPONSE extends Response> e
                 stream.close();
             } catch (IOException e) {
                 closeException = e;
-                logger.log(LogLevel.WARNING, "Exception caught while closing stream to client.", e);
+                logger.log(Level.WARNING, "Exception caught while closing stream to client.", e);
             } finally {
                 if (failed != null) {
                     success.setException(failed);
diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/StemmingSearcher.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/StemmingSearcher.java
index 5b8f7b8b106..af473dd7628 100644
--- a/container-search/src/main/java/com/yahoo/prelude/querytransform/StemmingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/StemmingSearcher.java
@@ -168,7 +168,7 @@ public class StemmingSearcher extends Searcher {
             if (i instanceof TermItem) {
                 return ((TermItem) i).getOrigin(); // this should always be the case
             } else {
-                getLogger().log(LogLevel.WARNING, "Weird, BlockItem '" + b + "' was a composite containing " + 
+                getLogger().log(Level.WARNING, "Weird, BlockItem '" + b + "' was a composite containing " + 
                                                   i.getClass().getName() + ", expected TermItem.");
             }
         }
diff --git a/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java b/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java
index 8e83782c9c7..b4b23a0e94a 100644
--- a/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java
@@ -243,7 +243,7 @@ public class StatisticsSearcher extends Searcher {
         if (latency >= 0) {
             addLatency(latency, metricContext);
         } else {
-            getLogger().log(LogLevel.WARNING,
+            getLogger().log(Level.WARNING,
                             "Apparently negative latency measure, start: " + start
                             + ", end: " + end + ", for query: " + query.toString());
         }
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/UniqueGroupingSearcher.java b/container-search/src/main/java/com/yahoo/search/grouping/UniqueGroupingSearcher.java
index d30464e349e..3abfa3a6531 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/UniqueGroupingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/UniqueGroupingSearcher.java
@@ -110,7 +110,7 @@ public class UniqueGroupingSearcher extends Searcher {
         if (null == root) {
             String msg = "Result group not found for deduping grouping request, returning empty result.";
             query.trace(msg, 3);
-            log.log(LogLevel.WARNING, msg);
+            log.log(Level.WARNING, msg);
             throw new IllegalStateException("Failed to produce deduped result set.");
         }
         result.hits().remove(root.getId().toString()); // hide our tracks
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index 2a8eeaf8e7f..432b378938e 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -417,7 +417,7 @@ public class SearchHandler extends LoggingRequestHandler {
         if (searchConnections != null) {
             connectionStatistics();
         } else {
-            log.log(LogLevel.WARNING,
+            log.log(Level.WARNING,
                     "searchConnections is a null reference, probably a known race condition during startup.",
                     new IllegalStateException("searchConnections reference is null."));
         }
diff --git a/container-search/src/main/java/com/yahoo/search/rendering/SyncDefaultRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/SyncDefaultRenderer.java
index d678b4d2487..d79122ac9c4 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/SyncDefaultRenderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/SyncDefaultRenderer.java
@@ -395,7 +395,7 @@ public final class SyncDefaultRenderer extends Renderer {
         if (e instanceof IOException) {
             throw (IOException) e;
         } else {
-            log.log(LogLevel.WARNING, "Exception thrown when rendering the result:", e);
+            log.log(Level.WARNING, "Exception thrown when rendering the result:", e);
         }
     }
 
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/tracing/LoggingTraceExporter.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/tracing/LoggingTraceExporter.java
index e9de02b243b..230af8971c2 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/tracing/LoggingTraceExporter.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/tracing/LoggingTraceExporter.java
@@ -17,7 +17,7 @@ public class LoggingTraceExporter implements TraceExporter {
     public void maybeExport(Supplier<TraceDescription> traceDescriptionSupplier) {
         var traceDescription = traceDescriptionSupplier.get();
         if (traceDescription.getTrace() != null) {
-            log.log(LogLevel.WARNING, String.format("%s: %s", traceDescription.getDescription(),
+            log.log(Level.WARNING, String.format("%s: %s", traceDescription.getDescription(),
                     traceDescription.getTrace().toString()));
         }
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateManager.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateManager.java
index a1b97dad56a..7e0fec4ba66 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateManager.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateManager.java
@@ -251,10 +251,10 @@ public class EndpointCertificateManager {
                 // Normally because the cert is in the process of being provisioned - this will cause a retry in InternalStepRunner
                 throw new EndpointCertificateException(EndpointCertificateException.Type.CERT_NOT_AVAILABLE, "Certificate not found in secret store");
             } catch (EndpointCertificateException e) {
-                log.log(LogLevel.WARNING, "Certificate validation failure for " + instance.id().serializedForm(), e);
+                log.log(Level.WARNING, "Certificate validation failure for " + instance.id().serializedForm(), e);
                 throw e;
             } catch (Exception e) {
-                log.log(LogLevel.WARNING, "Certificate validation failure for " + instance.id().serializedForm(), e);
+                log.log(Level.WARNING, "Certificate validation failure for " + instance.id().serializedForm(), e);
                 throw new EndpointCertificateException(EndpointCertificateException.Type.VERIFICATION_FAILURE, "Certificate validation failure for app " + instance.id().serializedForm(), e);
             }
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
index 56d3b928b8f..e2fb74ec0b4 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
@@ -69,7 +69,7 @@ public class DeploymentTrigger {
 
     public void notifyOfSubmission(TenantAndApplicationId id, ApplicationVersion version, long projectId) {
         if (applications().getApplication(id).isEmpty()) {
-            log.log(LogLevel.WARNING, "Ignoring submission from project '" + projectId +
+            log.log(Level.WARNING, "Ignoring submission from project '" + projectId +
                                       "': Unknown application '" + id + "'");
             return;
         }
@@ -117,7 +117,7 @@ public class DeploymentTrigger {
      */
     public void notifyOfCompletion(ApplicationId id) {
         if (applications().getInstance(id).isEmpty()) {
-            log.log(LogLevel.WARNING, "Ignoring completion of job of unknown application '" + id + "'");
+            log.log(Level.WARNING, "Ignoring completion of job of unknown application '" + id + "'");
             return;
         }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java
index 6f60106c79e..855cbdb5337 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java
@@ -74,7 +74,7 @@ public class NameServiceForwarder {
             NameServiceQueue queue = db.readNameServiceQueue();
             var queued = queue.requests().size();
             if (queued >= maxQueuedRequests) {
-                log.log(LogLevel.WARNING, "Queue is at capacity (size: " + queued + "), dropping older " +
+                log.log(Level.WARNING, "Queue is at capacity (size: " + queued + "), dropping older " +
                                           "requests. This likely means that the name service is not successfully " +
                                           "executing requests");
             }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueue.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueue.java
index aebf4a61966..ee5d50414c1 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueue.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueue.java
@@ -78,7 +78,7 @@ public class NameServiceQueue {
                 request.dispatchTo(nameService);
                 queue.requests.poll();
             } catch (Exception e) {
-                log.log(LogLevel.WARNING, "Failed to execute " + request + ": " + e.getMessage() +
+                log.log(Level.WARNING, "Failed to execute " + request + ": " + e.getMessage() +
                                           ", request will be retried");
             }
         }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContactInformationMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContactInformationMaintainer.java
index 8346fe7a0f9..12b52d1bf2f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContactInformationMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContactInformationMaintainer.java
@@ -55,7 +55,7 @@ public class ContactInformationMaintainer extends Maintainer {
                         throw new IllegalArgumentException("Unexpected tenant type '" + tenant.type() + "'.");
                 }
             } catch (Exception e) {
-                log.log(LogLevel.WARNING, "Failed to update contact information for " + tenant + ": " +
+                log.log(Level.WARNING, "Failed to update contact information for " + tenant + ": " +
                                           Exceptions.toMessageString(e) + ". Retrying in " +
                                           maintenanceInterval());
             }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java
index 9843d808564..a4078f7e028 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java
@@ -80,7 +80,7 @@ public class DeploymentMetricsMaintainer extends Maintainer {
         try {
             pool.awaitTermination(30, TimeUnit.MINUTES);
             if (lastException.get() != null) {
-                log.log(LogLevel.WARNING,
+                log.log(Level.WARNING,
                         String.format("Failed to gather metrics for %d/%d applications. Retrying in %s. Last error: %s",
                                       failures.get(),
                                       attempts.get(),
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java
index d78091b5116..e8391b8aded 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java
@@ -86,7 +86,7 @@ public class JobRunner extends Maintainer {
                         .ifPresent(run -> controller().applications().deploymentTrigger().notifyOfCompletion(id.application()));
         }
         catch (Exception e) {
-            log.log(LogLevel.WARNING, "Exception finishing " + id, e);
+            log.log(Level.WARNING, "Exception finishing " + id, e);
         }
     }
 
@@ -118,7 +118,7 @@ public class JobRunner extends Maintainer {
             // Something else is already advancing this step, or a prerequisite -- try again later!
         }
         catch (RuntimeException e) {
-            log.log(LogLevel.WARNING, "Exception attempting to advance " + step + " of " + id, e);
+            log.log(Level.WARNING, "Exception attempting to advance " + step + " of " + id, e);
         }
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsVersionStatusUpdater.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsVersionStatusUpdater.java
index e08ed6a6178..4b4d2c8698d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsVersionStatusUpdater.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsVersionStatusUpdater.java
@@ -23,7 +23,7 @@ public class OsVersionStatusUpdater extends Maintainer {
             OsVersionStatus newStatus = OsVersionStatus.compute(controller());
             controller().updateOsVersionStatus(newStatus);
         } catch (Exception e) {
-            log.log(LogLevel.WARNING, "Failed to compute version status: " + Exceptions.toMessageString(e) +
+            log.log(Level.WARNING, "Failed to compute version status: " + Exceptions.toMessageString(e) +
                                       ". Retrying in " + maintenanceInterval());
         }
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RotationStatusUpdater.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RotationStatusUpdater.java
index 0253cdb1e34..68f8e5464a0 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RotationStatusUpdater.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RotationStatusUpdater.java
@@ -68,7 +68,7 @@ public class RotationStatusUpdater extends Maintainer {
         try {
             pool.awaitTermination(30, TimeUnit.SECONDS);
             if (lastException.get() != null) {
-                log.log(LogLevel.WARNING, String.format("Failed to get global routing status of %d/%d applications. Retrying in %s. Last error: ",
+                log.log(Level.WARNING, String.format("Failed to get global routing status of %d/%d applications. Retrying in %s. Last error: ",
                                                         failures.get(),
                                                         attempts.get(),
                                                         maintenanceInterval()),
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VersionStatusUpdater.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VersionStatusUpdater.java
index e678c4bb5ca..22030931944 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VersionStatusUpdater.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VersionStatusUpdater.java
@@ -27,7 +27,7 @@ public class VersionStatusUpdater extends Maintainer {
             VersionStatus newStatus = VersionStatus.compute(controller());
             controller().updateVersionStatus(newStatus);
         } catch (Exception e) {
-            log.log(LogLevel.WARNING, "Failed to compute version status: " + Exceptions.toMessageString(e) +
+            log.log(Level.WARNING, "Failed to compute version status: " + Exceptions.toMessageString(e) +
                                       ". Retrying in " + maintenanceInterval());
         }
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java
index 757ccbe900e..2b9fe708df6 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java
@@ -52,7 +52,7 @@ public class ControllerAuthorizationFilter extends JsonSecurityRequestFilterBase
                 return Optional.empty();
         }
         catch (Exception e) {
-            log.log(LogLevel.WARNING, "Exception evaluating access control: ", e);
+            log.log(Level.WARNING, "Exception evaluating access control: ", e);
         }
         return Optional.of(new ErrorResponse(Response.Status.FORBIDDEN, "Access denied"));
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployer.java
index b4fa9d261c1..538ab36374b 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployer.java
@@ -85,7 +85,7 @@ class SystemFlagsDeployer  {
             currentFlagData = lookupTable(client.listFlagData(target));
             definedFlags = client.listDefinedFlags(target);
         } catch (Exception e) {
-            log.log(LogLevel.WARNING, String.format("Failed to list flag data for target '%s': %s", target, e.getMessage()), e);
+            log.log(Level.WARNING, String.format("Failed to list flag data for target '%s': %s", target, e.getMessage()), e);
             return new SystemFlagsDeployResult(List.of(OperationError.listFailed(e.getMessage(), target)));
         }
 
@@ -119,7 +119,7 @@ class SystemFlagsDeployer  {
                     dryRunFlagDataValidation(data);
                 }
             } catch (Exception e) {
-                log.log(LogLevel.WARNING, String.format("Failed to put flag '%s' for target '%s': %s", data.id(), target, e.getMessage()), e);
+                log.log(Level.WARNING, String.format("Failed to put flag '%s' for target '%s': %s", data.id(), target, e.getMessage()), e);
                 errors.add(OperationError.createFailed(e.getMessage(), target, data));
                 return;
             }
@@ -145,7 +145,7 @@ class SystemFlagsDeployer  {
                     dryRunFlagDataValidation(wantedData);
                 }
             } catch (Exception e) {
-                log.log(LogLevel.WARNING, String.format("Failed to update flag '%s' for target '%s': %s", wantedData.id(), target, e.getMessage()), e);
+                log.log(Level.WARNING, String.format("Failed to update flag '%s' for target '%s': %s", wantedData.id(), target, e.getMessage()), e);
                 errors.add(OperationError.updateFailed(e.getMessage(), target, wantedData));
                 return;
             }
@@ -167,7 +167,7 @@ class SystemFlagsDeployer  {
                 try {
                     client.deleteFlagData(target, id);
                 } catch (Exception e) {
-                    log.log(LogLevel.WARNING, String.format("Failed to delete flag '%s' for target '%s': %s", id, target, e.getMessage()), e);
+                    log.log(Level.WARNING, String.format("Failed to delete flag '%s' for target '%s': %s", id, target, e.getMessage()), e);
                     errors.add(OperationError.deleteFailed(e.getMessage(), target, id));
                     return;
                 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
index 41a3784163d..19b98ae12cc 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
@@ -151,7 +151,7 @@ public class VersionStatus {
                 if (nodes.isEmpty()) continue;
                 var configConverged = application.configConvergedIn(zone.getId(), controller, Optional.empty());
                 if (!configConverged) {
-                    log.log(LogLevel.WARNING, "Config for " + application.id() + " in " + zone.getId() +
+                    log.log(Level.WARNING, "Config for " + application.id() + " in " + zone.getId() +
                                               " has not converged");
                 }
                 for (var node : nodes) {
diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java
index 810e8c6ada4..022c8254870 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java
@@ -60,7 +60,7 @@ public class DocumentProcessingTask implements Runnable {
                 processings.addAll(requestContext.getProcessings());
             } catch (Exception e) {
                 //deserialization failed:
-                log.log(LogLevel.WARNING, "Deserialization of message failed.", e);
+                log.log(Level.WARNING, "Deserialization of message failed.", e);
                 requestContext.processingFailed(e);
                 return;
             }
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
index c2c36d01805..b40da64df30 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
@@ -467,7 +467,7 @@ public class MessageBusVisitorSession implements VisitorSession {
                  // we just immediately go into a failure destruction mode as soon as this
                  // happens, in which we do not wait for any active messages to be replied
                  // to.
-                log.log(LogLevel.WARNING, "Visitor session '" + sessionName +
+                log.log(Level.WARNING, "Visitor session '" + sessionName +
                         "': failed to submit reply task to executor service! " +
                         "Session cannot reliably continue; terminating it early.", e);
 
@@ -661,7 +661,7 @@ public class MessageBusVisitorSession implements VisitorSession {
                     String msg = "Got exception of type " + e.getClass().getName() +
                             " with message '" + e.getMessage() +
                             "' while attempting to send visitors";
-                    log.log(LogLevel.WARNING, msg);
+                    log.log(Level.WARNING, msg);
                     transitionTo(new StateDescription(State.FAILED, msg));
                     // It's likely that the exception caused a failure to send a
                     // visitor message, meaning we won't get a reply task in the
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/StoragePolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/StoragePolicy.java
index f89ab28ee16..12dea1759c4 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/StoragePolicy.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/StoragePolicy.java
@@ -148,7 +148,7 @@ public class StoragePolicy extends SlobrokPolicy {
                 if (arr.size() == 1) {
                     return convertSlobrokNameToSessionName(arr.get(0).getSpecString());
                 } else {
-                    log.log(LogLevel.WARNING, "Got " + arr.size() + " matches for a distributor.");
+                    log.log(Level.WARNING, "Got " + arr.size() + " matches for a distributor.");
                 }
             } else {
                 return convertSlobrokNameToSessionName(arr.get(randomizer.nextInt(arr.size())).getSpecString());
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/SubsetServicePolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/SubsetServicePolicy.java
index b13a273da27..ee851acc0f8 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/SubsetServicePolicy.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/SubsetServicePolicy.java
@@ -38,7 +38,7 @@ public class SubsetServicePolicy implements DocumentProtocolRoutingPolicy {
                 subsetSize = Integer.parseInt(param);
             }
             catch (NumberFormatException e) {
-                log.log(LogLevel.WARNING, "Parameter '" + param + "' could not be parsed as an integer.", e);
+                log.log(Level.WARNING, "Parameter '" + param + "' could not be parsed as an integer.", e);
             }
             if (subsetSize <= 0) {
                 log.warning("Ignoring a request to set the subset size to " + subsetSize + " because it makes no " +
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/CompressedFileReference.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/CompressedFileReference.java
index 66b713ac6ba..0ed72076549 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/CompressedFileReference.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/CompressedFileReference.java
@@ -80,14 +80,14 @@ public class CompressedFileReference {
                 if (!(outFile.exists() && outFile.isDirectory())) {
                     log.log(Level.FINE, () -> "Creating dir: " + outFile.getAbsolutePath());
                     if (!outFile.mkdirs()) {
-                        log.log(LogLevel.WARNING, "Could not create dir " + entry.getName());
+                        log.log(Level.WARNING, "Could not create dir " + entry.getName());
                     }
                 }
             } else {
                 // Create parent dir if necessary
                 File parent = new File(outFile.getParent());
                 if (!parent.exists() && !parent.mkdirs()) {
-                    log.log(LogLevel.WARNING, "Could not create dir " + parent.getAbsolutePath());
+                    log.log(Level.WARNING, "Could not create dir " + parent.getAbsolutePath());
                 }
                 FileOutputStream fos = new FileOutputStream(outFile);
                 ByteStreams.copy(archiveInputStream, fos);
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
index cb3a3caf2d4..a68d2860874 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
@@ -51,7 +51,7 @@ public class FileDownloader {
         try {
             return getFutureFile(fileReferenceDownload).get(timeout.toMillis(), TimeUnit.MILLISECONDS);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
-            log.log(LogLevel.WARNING, "Failed downloading '" + fileReferenceDownload.fileReference().value() + "', removing from download queue: " + e.getMessage());
+            log.log(Level.WARNING, "Failed downloading '" + fileReferenceDownload.fileReference().value() + "', removing from download queue: " + e.getMessage());
             fileReferenceDownloader.failedDownloading(fileReferenceDownload.fileReference());
             return Optional.empty();
         }
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
index 4af10b69be6..b18b415931b 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
@@ -210,7 +210,7 @@ public class FileReceiver {
             else
                 Files.delete(path.toPath());
         } catch (IOException ioe) {
-            log.log(LogLevel.WARNING, "Failed deleting file/dir " + path);
+            log.log(Level.WARNING, "Failed deleting file/dir " + path);
         }
     }
 
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
index 35f8636c0f9..11dd5195ee0 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
@@ -155,7 +155,7 @@ public class FileReferenceDownloader {
         } else if (request.returnValues().size() == 0) {
             return false;
         } else if (!request.checkReturnTypes("is")) { // TODO: Do not hard-code return type
-            log.log(LogLevel.WARNING, "Invalid return types for response: " + request.errorMessage());
+            log.log(Level.WARNING, "Invalid return types for response: " + request.errorMessage());
             return false;
         }
         return true;
diff --git a/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/MbusClient.java b/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/MbusClient.java
index 8045e35604a..922e4140868 100644
--- a/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/MbusClient.java
+++ b/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/MbusClient.java
@@ -86,7 +86,7 @@ public final class MbusClient extends AbstractResource implements ClientProvider
             handler.handleResponse(new MbusResponse(StatusCodes.fromMbusReply(reply), reply))
                    .close(IgnoredCompletionHandler.INSTANCE);
         } catch (final Exception e) {
-            log.log(LogLevel.WARNING, "Ignoring exception thrown by ResponseHandler.", e);
+            log.log(Level.WARNING, "Ignoring exception thrown by ResponseHandler.", e);
         }
     }
 
@@ -139,7 +139,7 @@ public final class MbusClient extends AbstractResource implements ClientProvider
                     }
                     sendBlocking(request);
                 } catch (final Exception e) {
-                    log.log(LogLevel.WARNING, "Ignoring exception thrown by MbusClient.", e);
+                    log.log(Level.WARNING, "Ignoring exception thrown by MbusClient.", e);
                 }
             }
         }
diff --git a/logserver/src/main/java/com/yahoo/logserver/Flusher.java b/logserver/src/main/java/com/yahoo/logserver/Flusher.java
index b155c8eb893..21af3d77f34 100644
--- a/logserver/src/main/java/com/yahoo/logserver/Flusher.java
+++ b/logserver/src/main/java/com/yahoo/logserver/Flusher.java
@@ -51,7 +51,7 @@ public class Flusher extends Thread {
                 }
             }
         } catch (InterruptedException e) {
-            log.log(LogLevel.WARNING, "flusher was interrupted", e);
+            log.log(Level.WARNING, "flusher was interrupted", e);
         }
     }
 }
diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java b/logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java
index dc457d81ed5..da19edb8413 100644
--- a/logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java
+++ b/logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java
@@ -215,7 +215,7 @@ public class LogMetricsHandler extends AbstractLogHandler {
                 try {
                     Thread.sleep(EVENTINTERVAL * 1000);
                 } catch (InterruptedException e) {
-                    log.log(LogLevel.WARNING, e.getMessage());
+                    log.log(Level.WARNING, e.getMessage());
                 }
                 sendEvents();
             }
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/TraceNode.java b/messagebus/src/main/java/com/yahoo/messagebus/TraceNode.java
index 8fe3072cba9..b6d41a0f112 100755
--- a/messagebus/src/main/java/com/yahoo/messagebus/TraceNode.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/TraceNode.java
@@ -440,11 +440,11 @@ public class TraceNode implements Comparable<TraceNode> {
                     node.setStrict(c == '(');
                 } else if (c == ')' || c == '}') {
                     if (node == null) {
-                        log.log(LogLevel.WARNING, "Unexpected closing brace in trace '" + str + "' at position " + i + ".");
+                        log.log(Level.WARNING, "Unexpected closing brace in trace '" + str + "' at position " + i + ".");
                         return new TraceNode();
                     }
                     if (node.isStrict() != (c == ')')) {
-                        log.log(LogLevel.WARNING, "Mismatched closing brace in trace '" + str + "' at position " + i + ".");
+                        log.log(Level.WARNING, "Mismatched closing brace in trace '" + str + "' at position " + i + ".");
                         return new TraceNode();
                     }
                     node = node.parent;
@@ -452,15 +452,15 @@ public class TraceNode implements Comparable<TraceNode> {
             }
         }
         if (note != null) {
-            log.log(LogLevel.WARNING, "Unterminated note in trace '" + str + "'.");
+            log.log(Level.WARNING, "Unterminated note in trace '" + str + "'.");
             return new TraceNode();
         }
         if (node != proxy) {
-            log.log(LogLevel.WARNING, "Missing closing brace in trace '" + str + "'.");
+            log.log(Level.WARNING, "Missing closing brace in trace '" + str + "'.");
             return new TraceNode();
         }
         if (proxy.getNumChildren() == 0) {
-            log.log(LogLevel.WARNING, "No nodes found in trace '" + str + "'.");
+            log.log(Level.WARNING, "No nodes found in trace '" + str + "'.");
             return new TraceNode();
         }
         if (proxy.getNumChildren() != 1) {
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java
index c1029175080..25a5253d7be 100755
--- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java
@@ -141,7 +141,7 @@ public class RPCTarget implements RequestWaiter {
                         log.log(Level.FINE, "Target '" + name + "' has version " + version + ".");
                     }
                 } catch (IllegalArgumentException e) {
-                    log.log(LogLevel.WARNING, "Failed to parse '" + str + "' as version for target '" + name + "'.", e);
+                    log.log(Level.WARNING, "Failed to parse '" + str + "' as version for target '" + name + "'.", e);
                 }
             } else {
                 log.log(Level.INFO, "Method mbus.getVersion() failed for target '" + name + "'; " +
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ConfigSentinelClient.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ConfigSentinelClient.java
index 06036aa90d5..17a6fb234c0 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ConfigSentinelClient.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ConfigSentinelClient.java
@@ -166,10 +166,10 @@ public class ConfigSentinelClient extends AbstractComponent {
                 {
                     servicelist = req.returnValues().get(0).asString();
                 } else {
-                    log.log(LogLevel.WARNING, "Bad answer to RPC request: " + req.errorMessage());
+                    log.log(Level.WARNING, "Bad answer to RPC request: " + req.errorMessage());
                 }
             } else {
-                log.log(LogLevel.WARNING, "Could not connect to sentinel at: "+spec);
+                log.log(Level.WARNING, "Could not connect to sentinel at: "+spec);
             }
             return servicelist;
         } finally {
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java
index 905682df889..d1e1d6f14cc 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java
@@ -72,7 +72,7 @@ public abstract class HttpMetricFetcher {
 
     void logMessageNoResponse(String message, int timesFetched) {
         if (timesFetched > 5) {
-            log.log(LogLevel.WARNING, message);
+            log.log(Level.WARNING, message);
         } else {
             log.log(Level.INFO, message);
         }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java
index ca2e7d192dd..453f4f4b4c1 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java
@@ -180,9 +180,9 @@ public class NodeAdminStateUpdater {
                     .collect(Collectors.toSet());
             nodeAdmin.refreshContainersToRun(nodeAgentContexts);
         } catch (ConvergenceException e) {
-            log.log(LogLevel.WARNING, "Failed to update which containers should be running: " + Exceptions.toMessageString(e));
+            log.log(Level.WARNING, "Failed to update which containers should be running: " + Exceptions.toMessageString(e));
         } catch (RuntimeException e) {
-            log.log(LogLevel.WARNING, "Failed to update which containers should be running", e);
+            log.log(Level.WARNING, "Failed to update which containers should be running", e);
         }
     }
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index 12628933e9a..d473b3dcf40 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -568,7 +568,7 @@ public class NodeAgentImpl implements NodeAgent {
             try {
                 aclMaintainer.ifPresent(maintainer -> maintainer.converge(context));
             } catch (RuntimeException suppressed) {
-                logger.log(LogLevel.WARNING, "Suppressing ACL update failure: " + suppressed);
+                logger.log(Level.WARNING, "Suppressing ACL update failure: " + suppressed);
                 e.addSuppressed(suppressed);
             }
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ChildProcess2Impl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ChildProcess2Impl.java
index 577ff53ebdf..668bffd570a 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ChildProcess2Impl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ChildProcess2Impl.java
@@ -92,7 +92,7 @@ public class ChildProcess2Impl implements ChildProcess2 {
             if (commandLine.getOutputFile().isEmpty())
                 Files.delete(outputPath);
         } catch (Throwable t) {
-            logger.log(LogLevel.WARNING, "Failed to delete " + outputPath, t);
+            logger.log(Level.WARNING, "Failed to delete " + outputPath, t);
         }
     }
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImpl.java
index 4bab918c5a7..f4be8b7479f 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImpl.java
@@ -88,7 +88,7 @@ public class ProcessFactoryImpl implements ProcessFactory {
                 if (commandLine.getOutputFile().isEmpty())
                     Files.delete(outputFile);
             } catch (IOException ioException) {
-                logger.log(LogLevel.WARNING, "Failed to delete temporary file at " +
+                logger.log(Level.WARNING, "Failed to delete temporary file at " +
                                              outputFile, ioException);
             }
             throw throwable;
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityReportMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityReportMaintainer.java
index 00856e6653c..b4c0d469272 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityReportMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityReportMaintainer.java
@@ -42,7 +42,7 @@ public class CapacityReportMaintainer extends Maintainer {
         CapacityChecker capacityChecker = new CapacityChecker(this.nodeRepository);
         List<Node> overcommittedHosts = capacityChecker.findOvercommittedHosts();
         if (overcommittedHosts.size() != 0) {
-            log.log(LogLevel.WARNING, String.format("%d nodes are overcommitted! [ %s ]", overcommittedHosts.size(),
+            log.log(Level.WARNING, String.format("%d nodes are overcommitted! [ %s ]", overcommittedHosts.size(),
                                                     overcommittedHosts.stream().map(Node::hostname).collect(Collectors.joining(", "))));
         }
         metric.set("overcommittedHosts", overcommittedHosts.size(), null);
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirer.java
index e6b1823f830..55152f52744 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirer.java
@@ -79,7 +79,7 @@ public class LoadBalancerExpirer extends Maintainer {
             }
         });
         if (!failed.isEmpty()) {
-            log.log(LogLevel.WARNING, String.format("Failed to remove %d load balancers: %s, retrying in %s",
+            log.log(Level.WARNING, String.format("Failed to remove %d load balancers: %s, retrying in %s",
                                                     failed.size(),
                                                     failed.stream()
                                                           .map(LoadBalancerId::serializedForm)
@@ -107,7 +107,7 @@ public class LoadBalancerExpirer extends Maintainer {
             }
         });
         if (!failed.isEmpty()) {
-            log.log(LogLevel.WARNING, String.format("Failed to remove reals from %d load balancers: %s, retrying in %s",
+            log.log(Level.WARNING, String.format("Failed to remove reals from %d load balancers: %s, retrying in %s",
                                                     failed.size(),
                                                     failed.stream()
                                                           .map(LoadBalancerId::serializedForm)
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java
index 6145a696af8..3319db33730 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java
@@ -88,7 +88,7 @@ class MaintenanceDeployment implements Closeable {
             return false;
         } catch (RuntimeException e) {
             metric.add("maintenanceDeployment.failure", 1, metric.createContext(Map.of()));
-            log.log(LogLevel.WARNING, "Exception on maintenance deploy of " + application, e);
+            log.log(Level.WARNING, "Exception on maintenance deploy of " + application, e);
             return false;
         }
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java
index 590847b8b7e..c33a61b0ea3 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java
@@ -155,7 +155,7 @@ public class NodePrioritizer {
                 allocation = host.ipConfig().pool().findAllocation(allNodes, nameResolver);
                 if (allocation.isEmpty()) continue; // No free addresses in this pool
             } catch (Exception e) {
-                log.log(LogLevel.WARNING, "Failed allocating IP address on " + host.hostname(), e);
+                log.log(Level.WARNING, "Failed allocating IP address on " + host.hostname(), e);
                 continue;
             }
 
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkApplicationLock.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkApplicationLock.java
index 7632bcb8936..1a8105e682f 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkApplicationLock.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkApplicationLock.java
@@ -82,7 +82,7 @@ class ZkApplicationLock implements ApplicationLock {
             onClose.run();
         } catch (RuntimeException e) {
             // We may want to avoid logging some exceptions that may be expected, like when session expires.
-            log.log(LogLevel.WARNING,
+            log.log(Level.WARNING,
                     "Failed close application lock in " +
                     ZkApplicationLock.class.getSimpleName() + ", will ignore and continue",
                     e);
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkStatusService.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkStatusService.java
index 21c3c846385..a851781660a 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkStatusService.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkStatusService.java
@@ -195,7 +195,7 @@ public class ZkStatusService implements StatusService {
                 lock.close();
             } catch (RuntimeException e) {
                 // We may want to avoid logging some exceptions that may be expected, like when session expires.
-                log.log(LogLevel.WARNING,
+                log.log(Level.WARNING,
                         "Failed to close application lock for " +
                                 ZkStatusService.class.getSimpleName() + ", will ignore and continue",
                         e);
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModel.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModel.java
index dea80254b05..c9df077aeef 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModel.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModel.java
@@ -132,7 +132,7 @@ public class DuperModel {
                             // If an activation contains a host that is currently assigned to a
                             // different application we will patch up our data structures to remain
                             // internally consistent. But listeners may be fooled.
-                            logger.log(LogLevel.WARNING, hostname + " has been reassigned from " +
+                            logger.log(Level.WARNING, hostname + " has been reassigned from " +
                                     previousId.toFullString() + " to " + id.toFullString());
 
                             Set<HostName> previousHostnames = hostnamesById.get(previousId);
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/executor/RunletExecutorImpl.java b/service-monitor/src/main/java/com/yahoo/vespa/service/executor/RunletExecutorImpl.java
index dcaba9d6755..39aeb94667c 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/executor/RunletExecutorImpl.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/executor/RunletExecutorImpl.java
@@ -62,7 +62,7 @@ public class RunletExecutorImpl implements RunletExecutor {
         try {
             executor.awaitTermination(10, TimeUnit.MINUTES);
         } catch (InterruptedException e) {
-            logger.log(LogLevel.WARNING, "Timed out waiting for termination of executor", e);
+            logger.log(Level.WARNING, "Timed out waiting for termination of executor", e);
         }
     }
 }
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthClient.java b/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthClient.java
index f13d2ee006a..dd70c8d6992 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthClient.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthClient.java
@@ -68,7 +68,7 @@ public class StateV1HealthClient implements AutoCloseable {
         try {
             httpClient.close();
         } catch (Exception e) {
-            logger.log(LogLevel.WARNING, "Failed to close CloseableHttpClient", e);
+            logger.log(Level.WARNING, "Failed to close CloseableHttpClient", e);
         }
     }
 
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java b/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java
index 3c6ff8bd903..2fa97d41284 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java
@@ -64,7 +64,7 @@ public class SlobrokMonitorManagerImpl implements SlobrokApi, MonitorManager {
         synchronized (monitor) {
             SlobrokMonitor slobrokMonitor = slobrokMonitors.remove(id);
             if (slobrokMonitor == null) {
-                logger.log(LogLevel.WARNING, "Removed application " + id +
+                logger.log(Level.WARNING, "Removed application " + id +
                         ", but it was never registered");
             } else {
                 slobrokMonitor.close();
diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/Bucket.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/Bucket.java
index 1a82b0ff42f..b75a0529a03 100644
--- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/Bucket.java
+++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/Bucket.java
@@ -78,7 +78,7 @@ public class Bucket {
                     get(entry.getKey(), entry.getValue()).merge(entry.getValue(), otherIsNewer);
                 }
             } catch (IllegalArgumentException e) {
-                log.log(LogLevel.WARNING, "Problems merging metric " + metricName + ", possibly ignoring data.");
+                log.log(Level.WARNING, "Problems merging metric " + metricName + ", possibly ignoring data.");
                 // avoid spamming the log if there are a lot of mismatching
                 // threads
                 malformedMetrics.add(metricName);
diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/UntypedMetric.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/UntypedMetric.java
index 0a085b0c9ab..f757ab15022 100644
--- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/UntypedMetric.java
+++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/UntypedMetric.java
@@ -96,7 +96,7 @@ public class UntypedMetric {
                 try {
                     histogram.add(other.histogram);
                 } catch (ArrayIndexOutOfBoundsException e) {
-                    log.log(LogLevel.WARNING, "Had trouble merging histograms: " + e.getMessage());
+                    log.log(Level.WARNING, "Had trouble merging histograms: " + e.getMessage());
                 }
             }
         }
diff --git a/statistics/src/main/java/com/yahoo/statistics/Value.java b/statistics/src/main/java/com/yahoo/statistics/Value.java
index 4260093fb20..8a5dbdbd880 100644
--- a/statistics/src/main/java/com/yahoo/statistics/Value.java
+++ b/statistics/src/main/java/com/yahoo/statistics/Value.java
@@ -360,7 +360,7 @@ public class Value extends Handle {
                 throw new IllegalStateException("The Limits instance must be frozen.");
             }
             if (parameters.histogramId != HistogramType.REGULAR) {
-                log.log(LogLevel.WARNING, HISTOGRAM_TYPE_WARNING + " '" + name + "'");
+                log.log(Level.WARNING, HISTOGRAM_TYPE_WARNING + " '" + name + "'");
             }
             this.histogramId = HistogramType.REGULAR;
             this.histogram = parameters.limits;
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java
index a6498386b9a..71a4c1a9954 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java
@@ -305,7 +305,7 @@ public final class AthenzIdentityProviderImpl extends AbstractComponent implemen
                                       ? athenzCredentialsService.registerInstance()
                                       : athenzCredentialsService.updateCredentials(credentials.getIdentityDocument(), identitySslContext));
         } catch (Throwable t) {
-            log.log(LogLevel.WARNING, "Failed to update credentials: " + t.getMessage(), t);
+            log.log(Level.WARNING, "Failed to update credentials: " + t.getMessage(), t);
         }
     }
 
@@ -315,7 +315,7 @@ public final class AthenzIdentityProviderImpl extends AbstractComponent implemen
             Duration remainingLifetime = Duration.between(clock.instant(), expirationTime);
             metric.set(CERTIFICATE_EXPIRY_METRIC_NAME, remainingLifetime.getSeconds(), null);
         } catch (Throwable t) {
-            log.log(LogLevel.WARNING, "Failed to update metrics: " + t.getMessage(), t);
+            log.log(Level.WARNING, "Failed to update metrics: " + t.getMessage(), t);
         }
     }
 }
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java
index b45bd0f4e9f..ccd2d80efb2 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java
@@ -239,7 +239,7 @@ public class RestApi extends LoggingRequestHandler {
                                                 RestUri.apiErrorCodes.PARSER_ERROR);
         }
         catch (RuntimeException systemException) {
-            log.log(LogLevel.WARNING, "Internal runtime exception during Document V1 request handling", systemException);
+            log.log(Level.WARNING, "Internal runtime exception during Document V1 request handling", systemException);
             return Response.createErrorResponse(500, Exceptions.toMessageString(systemException),
                                                 restUri,
                                                 RestUri.apiErrorCodes.UNSPECIFIED);
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java
index 6bb74e98fbd..859b763ab9d 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java
@@ -144,7 +144,7 @@ class ClientFeederV3 {
             } catch (InterruptedException e) {
                 // NOP, just terminate
             } catch (Throwable e) {
-                log.log(LogLevel.WARNING, "Unhandled exception while feeding: " + Exceptions.toMessageString(e), e);
+                log.log(Level.WARNING, "Unhandled exception while feeding: " + Exceptions.toMessageString(e), e);
             } finally {
                 replies.add(createOperationStatus("-", "-", ErrorCode.END_OF_FEED, false, null));
             }
@@ -183,7 +183,7 @@ class ClientFeederV3 {
                 message = getNextMessage(operationId.get(), requestInputStream, settings);
             } catch (Exception e) {
                 if (log.isLoggable(LogLevel.WARNING)) {
-                    log.log(LogLevel.WARNING, Exceptions.toMessageString(e));
+                    log.log(Level.WARNING, Exceptions.toMessageString(e));
                 }
                 metric.add(MetricNames.PARSE_ERROR, 1, null);
 
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java
index 502ddcddc9c..05a64d633a4 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java
@@ -116,11 +116,11 @@ public class FeedHandlerV3 extends LoggingRequestHandler {
             return clientFeederV3.handleRequest(request);
         } catch (UnknownClientException uce) {
             String msg = Exceptions.toMessageString(uce);
-            log.log(LogLevel.WARNING, msg);
+            log.log(Level.WARNING, msg);
             return new ErrorHttpResponse(com.yahoo.jdisc.http.HttpResponse.Status.BAD_REQUEST, msg);
         } catch (Exception e) {
             String msg = "Could not initialize document parsing: " + Exceptions.toMessageString(e);
-            log.log(LogLevel.WARNING, msg);
+            log.log(Level.WARNING, msg);
             return new ErrorHttpResponse(com.yahoo.jdisc.http.HttpResponse.Status.INTERNAL_SERVER_ERROR, msg);
         }
     }
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedReplyReader.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedReplyReader.java
index 7fb9d019e6c..5c0c4ffaf3d 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedReplyReader.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedReplyReader.java
@@ -62,7 +62,7 @@ public class FeedReplyReader implements ReplyHandler {
 
             context.feedReplies.put(new OperationStatus(message, context.docId, status, isConditionNotMet, traceMessage));
         } catch (InterruptedException e) {
-            log.log(LogLevel.WARNING, 
+            log.log(Level.WARNING, 
                     "Interrupted while enqueueing result from putting document with id: " + context.docId);
             Thread.currentThread().interrupt();
         }
diff --git a/vespaclient-core/src/main/java/com/yahoo/feedapi/SharedSender.java b/vespaclient-core/src/main/java/com/yahoo/feedapi/SharedSender.java
index aa2849a027b..6629ce5086a 100755
--- a/vespaclient-core/src/main/java/com/yahoo/feedapi/SharedSender.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/SharedSender.java
@@ -139,7 +139,7 @@ public class SharedSender implements ReplyHandler {
                 owner.getPending().clear();
             }
         } else {
-            log.log(LogLevel.WARNING, "Received reply " + r + " for message " + r.getMessage() + " without context");
+            log.log(Level.WARNING, "Received reply " + r + " for message " + r.getMessage() + " without context");
         }
     }
 
diff --git a/zookeeper-server/zookeeper-server-3.5/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java b/zookeeper-server/zookeeper-server-3.5/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java
index f3a2540b244..1f4be8852a3 100644
--- a/zookeeper-server/zookeeper-server-3.5/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java
+++ b/zookeeper-server/zookeeper-server-3.5/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java
@@ -165,7 +165,7 @@ public class VespaZooKeeperServerImpl extends AbstractComponent implements Runna
         try {
             zkServerThread.join();
         } catch (InterruptedException e) {
-            log.log(LogLevel.WARNING, "Error joining server thread on shutdown", e);
+            log.log(Level.WARNING, "Error joining server thread on shutdown", e);
         }
     }