Replace remaining LogLevel.<level> with corresponding Level

25 files changed, 57 insertions, 57 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLog.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLog.java
index 4af4b2b15a1..367771ff87a 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLog.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLog.java
@@ -57,9 +57,9 @@ public class EventLog implements EventLogInterface {
         }
 
         if (e instanceof NodeEvent) {
-            addNodeOnlyEvent((NodeEvent)e, logInfo ? LogLevel.INFO: Level.FINE);
+            addNodeOnlyEvent((NodeEvent)e, logInfo ? Level.INFO: Level.FINE);
         } else {
-            log.log(logInfo ? LogLevel.INFO : Level.FINE, e.toString());
+            log.log(logInfo ? Level.INFO : Level.FINE, e.toString());
         }
     }
 
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 87a572ce4a0..da32caa0c4e 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
@@ -157,7 +157,7 @@ public class NodeStateGatherer {
         if (req.getReply().getReturnCode() == ErrorCode.TIMEOUT) {
             String msg = "RPC timeout";
             if (info.getReportedState().getState().oneOf("ui")) {
-                eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + "RPC timeout talking to node.", NodeEvent.Type.REPORTED, currentTime), LogLevel.INFO);
+                eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + "RPC timeout talking to node.", NodeEvent.Type.REPORTED, currentTime), Level.INFO);
             } else if (!info.getReportedState().hasDescription() || !info.getReportedState().getDescription().equals(msg)) {
                 log.log(Level.FINE, "Failed to talk to node " + info + ": " + req.getReply().getReturnCode() + " " + req.getReply().getReturnMessage() + ": " + msg);
             }
@@ -172,7 +172,7 @@ public class NodeStateGatherer {
                 if (msg.equals("Connection refused")) {
                     msg = "Connection error: Connection refused";
                     if (info.getReportedState().getState().oneOf("ui")) {
-                        eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), LogLevel.INFO);
+                        eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), Level.INFO);
                     } else if (!info.getReportedState().hasDescription() || !info.getReportedState().getDescription().equals(msg)) {
                         log.log(Level.FINE, "Failed to talk to node " + info + ": " + req.getReply().getReturnCode()
                                 + " " + req.getReply().getReturnMessage() + ": " + msg);
@@ -184,7 +184,7 @@ public class NodeStateGatherer {
                         msg += " Node is no longer in slobrok.";
                     }
                     if (info.getReportedState().getState().oneOf("ui")) {
-                        eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), LogLevel.INFO);
+                        eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), Level.INFO);
                     } else if (!info.getReportedState().hasDescription() || !info.getReportedState().getDescription().equals(msg)) {
                         log.log(Level.FINE, "Failed to talk to node " + info + ": " + req.getReply().getReturnCode() + " " + req.getReply().getReturnMessage() + ": " + msg);
                     }
@@ -192,14 +192,14 @@ public class NodeStateGatherer {
                 } else if (msg.equals("Connection timed out")) {
                     if (info.getReportedState().getState().oneOf("ui")) {
                         msg = "Connection error: Timeout";
-                        eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), LogLevel.INFO);
+                        eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), Level.INFO);
                     } else {
                         log.log(Level.FINE, "Failed to talk to node " + info + ": " + req.getReply().getReturnCode() + " " + req.getReply().getReturnMessage() + ": " + msg);
                     }
                 } else {
                     msg = "Connection error: " + reason;
                     if (info.getReportedState().getState().oneOf("ui")) {
-                        eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), LogLevel.WARNING);
+                        eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), Level.WARNING);
                     } else if (!info.getReportedState().hasDescription() || !info.getReportedState().getDescription().equals(msg)) {
                         log.log(Level.FINE, "Failed to talk to node " + info + ": " + req.getReply().getReturnCode() + " " + req.getReply().getReturnMessage() + ": " + msg);
                     }
@@ -210,7 +210,7 @@ public class NodeStateGatherer {
                         req.getReply().getReturnCode() + ": " + req.getReply().getReturnMessage();
 
                 if (info.getReportedState().getState().oneOf("ui")) {
-                    eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), LogLevel.WARNING);
+                    eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), Level.WARNING);
                 } else if (!info.getReportedState().hasDescription() || !info.getReportedState().getDescription().equals(msg)) {
                     log.log(Level.FINE, "Failed to talk to node " + info + ": " + req.getReply().getReturnCode() + " " + req.getReply().getReturnMessage() + ": " + msg);
                 }
@@ -221,7 +221,7 @@ public class NodeStateGatherer {
         } else if (req.getReply().getReturnCode() == ErrorCode.NO_SUCH_METHOD) {
             String msg = "no such RPC method error";
             if (info.getReportedState().getState().oneOf("ui")) {
-                eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), LogLevel.WARNING);
+                eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), Level.WARNING);
             } else if (!info.getReportedState().hasDescription() || !info.getReportedState().getDescription().equals(msg)) {
                 log.log(Level.FINE, "Failed to talk to node " + info + ": " + req.getReply().getReturnCode() + " " + req.getReply().getReturnMessage() + ": " + msg);
             }
@@ -233,7 +233,7 @@ public class NodeStateGatherer {
                 log.log(Level.FINE, "Failed to get node state from " + info + " because it is still shutting down.");
             } else {
                 if (info.getReportedState().getState().oneOf("ui")) {
-                    eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), LogLevel.INFO);
+                    eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), Level.INFO);
                 } else if (!info.getReportedState().hasDescription() || !info.getReportedState().getDescription().equals(msg)) {
                     log.log(Level.FINE, "Failed to talk to node " + info + ": " + req.getReply().getReturnCode() + " " + req.getReply().getReturnMessage() + ": " + msg);
                 }
@@ -242,7 +242,7 @@ public class NodeStateGatherer {
         } else {
             String msg = "Got unexpected error, assumed to be node issue " + req.getReply().getReturnCode() + ": " + req.getReply().getReturnMessage();
             if (info.getReportedState().getState().oneOf("ui")) {
-                eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), LogLevel.WARNING);
+                eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), Level.WARNING);
             } else if (!info.getReportedState().hasDescription() || !info.getReportedState().getDescription().equals(msg)) {
                 log.log(Level.FINE, "Failed to talk to node " + info + ": " + req.getReply().getReturnCode() + " " + req.getReply().getReturnMessage() + ": " + msg);
             }
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java
index abdb6255ca2..18e548f6f1c 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java
@@ -132,7 +132,7 @@ public class StateChangeHandler {
         // *** LOGGING ONLY
         if ( ! reportedState.similarTo(node.getReportedState())) {
             if (reportedState.getState().equals(State.DOWN)) {
-                eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(node, "Failed to get node state: " + reportedState.toString(true), NodeEvent.Type.REPORTED, currentTime), LogLevel.INFO);
+                eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(node, "Failed to get node state: " + reportedState.toString(true), NodeEvent.Type.REPORTED, currentTime), Level.INFO);
             } else {
                 eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(node, "Now reporting state " + reportedState.toString(true), NodeEvent.Type.REPORTED, currentTime), Level.FINE);
             }
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java
index 95e03d1f6f1..502a0823b13 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java
@@ -66,7 +66,7 @@ public class SystemStateBroadcaster {
         long time = timer.getCurrentTimeInMillis();
         Long lastReported = lastErrorReported.get(info.getNode());
         boolean alreadySeen = (lastReported != null && time - lastReported < minTimeBetweenNodeErrorLogging);
-        log.log((nodeOk && !alreadySeen) ? LogLevel.WARNING : Level.FINE, message);
+        log.log((nodeOk && !alreadySeen) ? Level.WARNING : Level.FINE, message);
         if (!alreadySeen) {
             lastErrorReported.put(info.getNode(), time);
         }
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 3028ffe6e2c..3d3de32c356 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
@@ -146,7 +146,7 @@ public class StatusPageServer implements Runnable, StatusPageServerInterface {
                 } catch (SocketTimeoutException e) {
                     // Ignore, since timeout is set to 100 ms
                 } catch (java.io.IOException e) {
-                    log.log(shouldBeConnected ? LogLevel.WARNING : Level.FINE, "Caught IO exception in ServerSocket.accept(): " + e.getMessage());
+                    log.log(shouldBeConnected ? Level.WARNING : Level.FINE, "Caught IO exception in ServerSocket.accept(): " + e.getMessage());
                 }
                 if (connection == null) continue;
                 log.log(Level.FINE, "Got a status page request.");
@@ -235,7 +235,7 @@ public class StatusPageServer implements Runnable, StatusPageServerInterface {
                     output.write(header.toString().getBytes());
                     output.write(response.getOutputStream().toByteArray());
                 } catch (java.io.IOException e) {
-                   log.log(e.getMessage().indexOf("Broken pipe") >= 0 ? Level.FINE : LogLevel.INFO,
+                   log.log(e.getMessage().indexOf("Broken pipe") >= 0 ? Level.FINE : Level.INFO,
                            "Failed to process HTTP request : " + e.getMessage());
                 } catch (Exception e) {
                     log.log(Level.WARNING, "Caught exception in HTTP server thread: "
@@ -244,7 +244,7 @@ public class StatusPageServer implements Runnable, StatusPageServerInterface {
                     if (output != null) try {
                         output.close();
                     } catch (IOException e) {
-                        log.log(e.getMessage().indexOf("Broken pipe") >= 0 ? Level.FINE : LogLevel.INFO,
+                        log.log(e.getMessage().indexOf("Broken pipe") >= 0 ? Level.FINE : Level.INFO,
                                 "Failed to close output stream on socket " + connection + ": " + e.getMessage());
                     }
                     if (connection != null) try{
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java
index f45e2cf6285..ced73cda6fb 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java
@@ -33,7 +33,7 @@ public class DeployHandlerLogger implements DeployLogger {
 
     @Override
     public void log(Level level, String message) {
-        if ((level == LogLevel.FINE ||
+        if ((level == Level.FINE ||
              level == Level.FINE ||
              level == Level.FINEST) &&
             !verbose) {
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 cf6890e22d2..7809000695a 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
@@ -49,7 +49,7 @@ class GetConfigProcessor implements Runnable {
     private void respond(JRTServerConfigRequest request) {
         Request req = request.getRequest();
         if (req.isError()) {
-            Level logLevel = (req.errorCode() == ErrorCode.APPLICATION_NOT_LOADED) ? Level.FINE : LogLevel.INFO;
+            Level logLevel = (req.errorCode() == ErrorCode.APPLICATION_NOT_LOADED) ? Level.FINE : Level.INFO;
             log.log(logLevel, logPre + req.errorMessage());
         }
         rpcServer.respond(request);
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 eb5770972ff..662094fc0ca 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
@@ -37,7 +37,7 @@ public class LocalSessionStateWatcher {
     // Will delete session if it exists in local session repo
     private void sessionChanged(Session.Status status) {
         long sessionId = session.getSessionId();
-        log.log(status == Session.Status.DELETE ? LogLevel.INFO : Level.FINE,
+        log.log(status == Session.Status.DELETE ? Level.INFO : Level.FINE,
                 session.logPre() + "Session change: Local session " + sessionId + " changed status to " + status);
 
         if (status.equals(Session.Status.DELETE) && localSessionRepo.getSession(sessionId) != null) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
index 287996f6bec..cdf57b68814 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
@@ -176,7 +176,7 @@ public class SessionPreparerTest {
         final StringBuilder logged = new StringBuilder();
         DeployLogger logger = (level, message) -> {
             System.out.println(level + ": "+message);
-            if (level.equals(LogLevel.WARNING) && message.contains("The host mytesthost is already in use")) logged.append("ok");
+            if (level.equals(Level.WARNING) && message.contains("The host mytesthost is already in use")) logged.append("ok");
         };
         preparer.prepare(ctx, logger, new PrepareParams.Builder().build(), Optional.empty(), tenantPath, Instant.now());
         assertEquals(logged.toString(), "");
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
index 9eec85f58b6..2a4fc66dc27 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
@@ -118,7 +118,7 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler
         catch (IOException e) {
             metric.add(RENDERING_ERRORS, 1, null);
             long time = System.currentTimeMillis() - startTime;
-            log.log(time < 900 ? LogLevel.INFO : LogLevel.WARNING,
+            log.log(time < 900 ? Level.INFO : LogLevel.WARNING,
                     "IO error while responding to " + " ["
                             + request.getUri() + "] " + "(total time "
                             + time + " ms) ", e);
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 6c5ac7718d5..ba246f26639 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
@@ -527,7 +527,7 @@ public abstract class AsynchronousSectionedRenderer<RESPONSE extends Response> e
                     try {
                         render();
                     } catch (Exception e) {
-                        Level level = LogLevel.WARNING;
+                        Level level = Level.WARNING;
                         if ((e instanceof IOException)) {
                             level = Level.FINE;
                             if ( ! clientClosed) {
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/LoggingTestCase.java b/container-core/src/test/java/com/yahoo/container/jdisc/LoggingTestCase.java
index 876fd0d2b57..22e55eb5291 100644
--- a/container-core/src/test/java/com/yahoo/container/jdisc/LoggingTestCase.java
+++ b/container-core/src/test/java/com/yahoo/container/jdisc/LoggingTestCase.java
@@ -101,7 +101,7 @@ public class LoggingTestCase {
         stream.send(createData());
         stream.send(createData());
         stream.flush();
-        assertNull(logChecker.errorCounter.get(LogLevel.INFO));
+        assertNull(logChecker.errorCounter.get(Level.INFO));
         assertEquals(1, logChecker.errorCounter.get(Level.FINE).intValue());
         assertEquals(2, logChecker.errorCounter.get(Level.FINEST).intValue());
     }
diff --git a/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java
index 3afeb35ad2d..db79c610dc7 100644
--- a/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java
@@ -71,7 +71,7 @@ public abstract class ClusterSearcher<T> extends PingableSearcher implements Nod
     /** Pinging a node, called from ClusterMonitor */
     @Override
     public final void ping(ClusterMonitor<T> clusterMonitor, T p, Executor executor) {
-        log(LogLevel.FINE, "Sending ping to: ", p);
+        log(Level.FINE, "Sending ping to: ", p);
         Pinger pinger = new Pinger(p);
         FutureTask<Pong> future = new FutureTask<>(pinger);
 
@@ -97,10 +97,10 @@ public abstract class ClusterSearcher<T> extends PingableSearcher implements Nod
 
         if (pong.badResponse()) {
             clusterMonitor.failed(p, pong.error().get());
-            log(LogLevel.FINE, "Failed ping - ", pong);
+            log(Level.FINE, "Failed ping - ", pong);
         } else {
             clusterMonitor.responded(p);
-            log(LogLevel.FINE, "Answered ping - ", p);
+            log(Level.FINE, "Answered ping - ", p);
         }
 
         if (logThrowable != null) {
@@ -173,7 +173,7 @@ public abstract class ClusterSearcher<T> extends PingableSearcher implements Nod
             if (result.hits().getError().getCode() == Error.TIMEOUT.code)
                 return result; // Retry is unlikely to help
 
-            log(LogLevel.FINER, "No result, checking for timeout.");
+            log(Level.FINER, "No result, checking for timeout.");
             tries++;
             connection = nodes.select(code, tries);
         } while (tries < nodes.getNodeCount());
@@ -211,7 +211,7 @@ public abstract class ClusterSearcher<T> extends PingableSearcher implements Nod
         try {
             result = search(query, execution, connection);
         } catch (RuntimeException e) { //TODO: Exceptions should not be used to signal backend communication errors
-            log(LogLevel.WARNING, "An exception occurred while invoking backend searcher.", e);
+            log(Level.WARNING, "An exception occurred while invoking backend searcher.", e);
             result = new Result(query, ErrorMessage.createBackendCommunicationError("Failed calling " + connection +
                                                                                     " in " + this + " for " + query +
                                                                                     ": " + Exceptions.toMessageString(e)));
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogEntry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogEntry.java
index c16e72e3ad1..49813474315 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogEntry.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogEntry.java
@@ -63,7 +63,7 @@ public class LogEntry {
                          .filter(parts -> parts.length == 7)
                          .map(parts -> new LogEntry(0,
                                                     Instant.EPOCH.plus((long) (Double.parseDouble(parts[0]) * 1_000_000), ChronoUnit.MICROS),
-                                                    typeOf(LogLevel.parse(parts[5])),
+                                                    typeOf(Level.parse(parts[5])),
                                                     parts[1] + '\t' + parts[3] + '\t' + parts[4] + '\n' +
                                                     parts[6].replaceAll("\\\\n", "\n")
                                                             .replaceAll("\\\\t", "\t")))
@@ -103,8 +103,8 @@ public class LogEntry {
     }
 
     public static Type typeOf(Level level) {
-        return    level.intValue() < LogLevel.INFO.intValue() ? Type.debug
-                : level.intValue() < LogLevel.WARNING.intValue() ? Type.info
+        return    level.intValue() < Level.INFO.intValue() ? Type.debug
+                : level.intValue() < Level.WARNING.intValue() ? Type.info
                 : level.intValue() < Level.SEVERE.intValue() ? Type.warning
                 : Type.error;
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
index 58547edc52a..ab4f76b5a92 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
@@ -216,7 +216,7 @@ public class InternalStepRunner implements StepRunner {
                 logger.logAll(prepareResponse.log.stream()
                                                  .map(entry -> new LogEntry(0, // Sequenced by BufferedLogStore.
                                                                             Instant.ofEpochMilli(entry.time),
-                                                                            LogEntry.typeOf(LogLevel.parse(entry.level)),
+                                                                            LogEntry.typeOf(Level.parse(entry.level)),
                                                                             entry.message))
                                                  .collect(toList()));
             if ( ! prepareResponse.configChangeActions.refeedActions.stream().allMatch(action -> action.allowed)) {
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 78afcd72056..4ee9eacc2be 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
@@ -117,7 +117,7 @@ public class FileReferenceDownloader {
         request.parameters().add(new Int32Value(fileReferenceDownload.downloadFromOtherSourceIfNotFound() ? 0 : 1));
 
         connection.invokeSync(request, (double) rpcTimeout.getSeconds());
-        Level logLevel = (retryCount > 0 ? LogLevel.INFO : Level.FINE);
+        Level logLevel = (retryCount > 0 ? Level.INFO : Level.FINE);
         if (validateResponse(request)) {
             log.log(logLevel, () -> "Request callback, OK. Req: " + request + "\nSpec: " + connection + ", retry count " + retryCount);
             if (request.returnValues().get(0).asInt32() == 0) {
diff --git a/logserver/src/main/java/ai/vespa/logserver/protocol/ProtobufSerialization.java b/logserver/src/main/java/ai/vespa/logserver/protocol/ProtobufSerialization.java
index 3f040821a7f..9065b47fa52 100644
--- a/logserver/src/main/java/ai/vespa/logserver/protocol/ProtobufSerialization.java
+++ b/logserver/src/main/java/ai/vespa/logserver/protocol/ProtobufSerialization.java
@@ -3,12 +3,12 @@ package ai.vespa.logserver.protocol;
 
 import ai.vespa.logserver.protocol.protobuf.LogProtocol;
 import com.google.protobuf.InvalidProtocolBufferException;
-import java.util.logging.Level;
+import com.yahoo.log.LogLevel;
 import com.yahoo.log.LogMessage;
 
 import java.time.Instant;
 import java.util.List;
-import com.yahoo.log.LogLevel;
+import java.util.logging.Level;
 
 import static java.util.stream.Collectors.toList;
 
@@ -82,9 +82,9 @@ class ProtobufSerialization {
     private static Level fromLogMessageLevel(LogProtocol.LogMessage.Level level) {
         switch (level) {
             case FATAL:
-                return Level.SEVERE;
+                return LogLevel.FATAL;
             case ERROR:
-                return Level.SEVERE;
+                return LogLevel.ERROR;
             case WARNING:
                 return LogLevel.WARNING;
             case CONFIG:
@@ -94,9 +94,9 @@ class ProtobufSerialization {
             case EVENT:
                 return LogLevel.EVENT;
             case DEBUG:
-                return Level.FINE;
+                return LogLevel.DEBUG;
             case SPAM:
-                return Level.FINEST;
+                return LogLevel.SPAM;
             case UNKNOWN:
             case UNRECOGNIZED:
             default:
@@ -106,9 +106,9 @@ class ProtobufSerialization {
 
     private static LogProtocol.LogMessage.Level toLogMessageLevel(Level level) {
         Level vespaLevel = LogLevel.getVespaLogLevel(level);
-        if (vespaLevel.equals(Level.SEVERE)) {
+        if (vespaLevel.equals(LogLevel.FATAL)) {
             return LogProtocol.LogMessage.Level.FATAL;
-        } else if (vespaLevel.equals(Level.SEVERE)) {
+        } else if (vespaLevel.equals(LogLevel.ERROR)) {
             return LogProtocol.LogMessage.Level.ERROR;
         } else if (vespaLevel.equals(LogLevel.WARNING)) {
             return LogProtocol.LogMessage.Level.WARNING;
@@ -118,9 +118,9 @@ class ProtobufSerialization {
             return LogProtocol.LogMessage.Level.INFO;
         } else if (vespaLevel.equals(LogLevel.EVENT)) {
             return LogProtocol.LogMessage.Level.EVENT;
-        } else if (vespaLevel.equals(Level.FINE)) {
+        } else if (vespaLevel.equals(LogLevel.DEBUG)) {
             return LogProtocol.LogMessage.Level.DEBUG;
-        } else if (vespaLevel.equals(Level.FINEST)) {
+        } else if (vespaLevel.equals(LogLevel.SPAM)) {
             return LogProtocol.LogMessage.Level.SPAM;
         } else {
             return LogProtocol.LogMessage.Level.UNKNOWN;
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/SendProxyTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/SendProxyTestCase.java
index fa9dbd0460e..48b0d355e87 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/SendProxyTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/SendProxyTestCase.java
@@ -64,7 +64,7 @@ public class SendProxyTestCase {
         LogHandler logHandler = new LogHandler();
         log.addHandler(logHandler);
 
-        log.setLevel(LogLevel.INFO);
+        log.setLevel(Level.INFO);
         sendMessage(0, null);
         assertNull(logHandler.trace);
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/TaskContext.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/TaskContext.java
index 74b47a49d2e..b84e25f59ed 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/TaskContext.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/TaskContext.java
@@ -28,7 +28,7 @@ public interface TaskContext {
     }
 
     /**
-     * Log message at LogLevel.INFO, scoped to denote the current task. The message may
+     * Log message at Level.INFO, scoped to denote the current task. The message may
      * also be directed to status pages or similar.
      *
      * Please do not call this too many times as that spams the log. Typically a task may call
@@ -37,7 +37,7 @@ public interface TaskContext {
      * Do not log a message that is also recorded with recordSystemModification.
      */
     default void log(Logger logger, String message) {
-        log(logger, LogLevel.INFO, message);
+        log(logger, Level.INFO, message);
     }
 
     default void log(Logger logger, String messageFormat, Object... args) {
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
index 16d0d823ac2..ef515022ae6 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
@@ -82,7 +82,7 @@ public class StorageMaintainer {
             diskUsage.put(context.containerName(), diskUsageBytes);
             return Optional.of(diskUsageBytes);
         } catch (Exception e) {
-            context.log(logger, LogLevel.WARNING, "Failed to get disk usage", e);
+            context.log(logger, Level.WARNING, "Failed to get disk usage", e);
             return Optional.empty();
         }
     }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java
index 0b5ddc6a943..360cea8a60d 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java
@@ -106,7 +106,7 @@ public class AclMaintainer {
                         context.log(logger, Level.SEVERE, "Rollback of table " + table + " failed, giving up", ne);
                     }
                 } else {
-                    context.log(logger, LogLevel.WARNING, "Unable to sync iptables for " + table, e);
+                    context.log(logger, Level.WARNING, "Unable to sync iptables for " + table, e);
                 }
             }
         };
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java
index 860cc8468e6..3320851a36c 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java
@@ -136,7 +136,7 @@ public class AthenzCredentialsMaintainer implements CredentialsMaintainer {
             if (shouldRefreshCredentials(age)) {
                 context.log(logger, "Certificate is ready to be refreshed (age=%s)", age.toString());
                 if (shouldThrottleRefreshAttempts(context.containerName(), now)) {
-                    context.log(logger, LogLevel.WARNING, String.format(
+                    context.log(logger, Level.WARNING, String.format(
                             "Skipping refresh attempt as last refresh was on %s (less than %s ago)",
                             lastRefreshAttempt.get(context.containerName()).toString(), REFRESH_BACKOFF.toString()));
                     return false;
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 bc532a84b64..eb3bd0d6d2e 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
@@ -290,7 +290,7 @@ public class NodeAgentImpl implements NodeAgent {
         } catch (RuntimeException e) {
             // It's bad to continue as-if nothing happened, but on the other hand if we do not proceed to
             // remove container, we will not be able to upgrade to fix any problems in the suspend logic!
-            context.log(logger, LogLevel.WARNING, "Failed trying to suspend container", e);
+            context.log(logger, Level.WARNING, "Failed trying to suspend container", e);
         }
     }
 
@@ -340,7 +340,7 @@ public class NodeAgentImpl implements NodeAgent {
                 }
                 stopServices(context);
             } catch (Exception e) {
-                context.log(logger, LogLevel.WARNING, "Failed stopping services, ignoring", e);
+                context.log(logger, Level.WARNING, "Failed stopping services, ignoring", e);
             }
         }
 
@@ -396,12 +396,12 @@ public class NodeAgentImpl implements NodeAgent {
     public void converge(NodeAgentContext context) {
         try {
             doConverge(context);
-            context.log(logger, LogLevel.INFO, "Converged");
+            context.log(logger, Level.INFO, "Converged");
         } catch (ConvergenceException e) {
             context.log(logger, e.getMessage());
         } catch (ContainerNotFoundException e) {
             containerState = ABSENT;
-            context.log(logger, LogLevel.WARNING, "Container unexpectedly gone, resetting containerState to " + containerState);
+            context.log(logger, Level.WARNING, "Container unexpectedly gone, resetting containerState to " + containerState);
         } catch (DockerException e) {
             numberOfUnhandledException++;
             context.log(logger, Level.SEVERE, "Caught a DockerException", e);
@@ -510,7 +510,7 @@ public class NodeAgentImpl implements NodeAgent {
         StringBuilder builder = new StringBuilder();
         appendIfDifferent(builder, "state", lastNode, node, NodeSpec::state);
         if (builder.length() > 0) {
-            context.log(logger, LogLevel.INFO, "Changes to node: " + builder.toString());
+            context.log(logger, Level.INFO, "Changes to node: " + builder.toString());
         }
     }
 
diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusServiceTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusServiceTest.java
index fc025d013c4..02c336e4109 100644
--- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusServiceTest.java
+++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusServiceTest.java
@@ -82,7 +82,7 @@ public class ZkStatusServiceTest {
 
     @Before
     public void setUp() throws Exception {
-        Logger.getLogger("").setLevel(LogLevel.WARNING);
+        Logger.getLogger("").setLevel(Level.WARNING);
 
         testingServer = new TestingServer();
         curator = createConnectedCurator(testingServer);
diff --git a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunnerHandler.java b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunnerHandler.java
index 666dfd47b47..e92dbcede5a 100644
--- a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunnerHandler.java
+++ b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunnerHandler.java
@@ -119,8 +119,8 @@ public class TestRunnerHandler extends LoggingRequestHandler {
 
     public static String typeOf(Level level) {
         return    level.getName().equals("html") ? "html"
-                : level.intValue() < LogLevel.INFO.intValue() ? "debug"
-                : level.intValue() < LogLevel.WARNING.intValue() ? "info"
+                : level.intValue() < Level.INFO.intValue() ? "debug"
+                : level.intValue() < Level.WARNING.intValue() ? "info"
                 : level.intValue() < Level.SEVERE.intValue() ? "warning"
                 : "error";
     }