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

6 files changed, 22 insertions, 22 deletions

diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java
index 53a05ef88f0..33827634ebf 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java
@@ -23,7 +23,7 @@ import java.util.stream.Collectors;
 
 import static ai.vespa.metricsproxy.metric.ExternalMetrics.extractConfigserverDimensions;
 import static ai.vespa.metricsproxy.metric.model.DimensionId.toDimensionId;
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 import static java.util.stream.Collectors.toList;
 
 /**
@@ -91,17 +91,17 @@ public class MetricsManager {
     public List<MetricsPacket.Builder> getMetricsAsBuilders(List<VespaService> services, Instant startTime) {
         if (services.isEmpty()) return Collections.emptyList();
 
-        log.log(DEBUG, () -> "Updating services prior to fetching metrics, number of services= " + services.size());
+        log.log(FINE, () -> "Updating services prior to fetching metrics, number of services= " + services.size());
         vespaServices.updateServices(services);
 
         List<MetricsPacket.Builder> result = vespaMetrics.getMetrics(services);
-        log.log(DEBUG, () -> "Got " + result.size() + " metrics packets for vespa services.");
+        log.log(FINE, () -> "Got " + result.size() + " metrics packets for vespa services.");
 
         purgeStaleMetrics();
         List<MetricsPacket.Builder> externalPackets = externalMetrics.getMetrics().stream()
                 .filter(MetricsPacket.Builder::hasMetrics)
                 .collect(toList());
-        log.log(DEBUG, () -> "Got " + externalPackets.size() + " external metrics packets with whitelisted metrics.");
+        log.log(FINE, () -> "Got " + externalPackets.size() + " external metrics packets with whitelisted metrics.");
 
         result.addAll(externalPackets);
 
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java
index 145eef3f745..a93b5eb31c0 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java
@@ -20,7 +20,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 import static java.util.Collections.emptyList;
 
 /**
@@ -65,13 +65,13 @@ public class NodeMetricsClient {
 
     private Snapshot retrieveMetrics(ConsumerId consumer) {
         String metricsUri = node.metricsUri(consumer).toString();
-        log.log(DEBUG, () -> "Retrieving metrics from host " + metricsUri);
+        log.log(FINE, () -> "Retrieving metrics from host " + metricsUri);
 
         try {
             String metricsJson = httpClient.execute(new HttpGet(metricsUri), new BasicResponseHandler());
             var newMetrics = GenericJsonUtil.toMetricsPackets(metricsJson);
             snapshotsRetrieved ++;
-            log.log(DEBUG, () -> "Successfully retrieved " + newMetrics.size() + " metrics packets from " + metricsUri);
+            log.log(FINE, () -> "Successfully retrieved " + newMetrics.size() + " metrics packets from " + metricsUri);
             return new Snapshot(Instant.now(clock), newMetrics);
         } catch (IOException e) {
             log.warning("Unable to retrieve metrics from " + metricsUri + ": " + Exceptions.toMessageString(e));
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java
index 0a2dbc9a910..337967f3075 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java
@@ -21,7 +21,7 @@ import java.util.logging.Logger;
 import static ai.vespa.metricsproxy.metric.model.DimensionId.toDimensionId;
 import static ai.vespa.metricsproxy.metric.model.MetricId.toMetricId;
 import static ai.vespa.metricsproxy.metric.model.ServiceId.toServiceId;
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 import static java.util.stream.Collectors.toCollection;
 
 /**
@@ -53,7 +53,7 @@ public class ExternalMetrics {
     public void setExtraMetrics(List<MetricsPacket.Builder> externalPackets) {
         // TODO: Metrics filtering per consumer is not yet implemented.
         //       Split each packet per metric, and re-aggregate based on the metrics each consumer wants. Then filter out all packages with no consumers.
-        log.log(DEBUG, () -> "Setting new external metrics with " + externalPackets.size() + " metrics packets.");
+        log.log(FINE, () -> "Setting new external metrics with " + externalPackets.size() + " metrics packets.");
         externalPackets.forEach(packet -> {
             packet.addConsumers(consumers.getAllConsumers())
                     .retainMetrics(metricsToRetain())
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java
index 269b70c8316..c09dc44d3fd 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java
@@ -11,7 +11,7 @@ import com.yahoo.jrt.Transport;
 
 import java.util.logging.Logger;
 
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 import static java.util.logging.Level.INFO;
 
 /**
@@ -30,7 +30,7 @@ public class RpcConnector extends AbstractComponent {
         Spec spec = new Spec(config.port());
         try {
             acceptor = supervisor.listen(spec);
-            log.log(DEBUG, "Listening on " + spec.host() + ":" + acceptor.port());
+            log.log(FINE, "Listening on " + spec.host() + ":" + acceptor.port());
         } catch (ListenFailedException e) {
             stop();
             log.log(INFO, "Failed listening at " + spec.host() + ":" + spec.port());
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java
index ba84347c7ea..e634d533e5c 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java
@@ -20,7 +20,7 @@ import static ai.vespa.metricsproxy.metric.model.ConsumerId.toConsumerId;
 import static ai.vespa.metricsproxy.metric.model.json.YamasJsonUtil.toMetricsPackets;
 import static ai.vespa.metricsproxy.metric.model.json.YamasJsonUtil.toYamasArray;
 import static com.yahoo.collections.CollectionUtil.mkString;
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 
@@ -46,7 +46,7 @@ public class RpcServer {
         this.vespaServices = vespaServices;
         this.metricsManager = metricsManager;
         addMethods(connector);
-        log.log(DEBUG, "RPC server created");
+        log.log(FINE, "RPC server created");
     }
 
     private void addMethods(RpcConnector connector) {
@@ -120,13 +120,13 @@ public class RpcServer {
         Instant startTime = Instant.now();
         req.detach();
         String service = req.parameters().get(0).asString();
-        log.log(DEBUG, () -> "getMetricsForYamas called at " + startTime + " with argument: " + service);
+        log.log(FINE, () -> "getMetricsForYamas called at " + startTime + " with argument: " + service);
         List<VespaService> services = vespaServices.getMonitoringServices(service);
-        log.log(DEBUG, () -> "Getting metrics for services: " + mkString(services, "[", ", ", "]"));
+        log.log(FINE, () -> "Getting metrics for services: " + mkString(services, "[", ", ", "]"));
         if (services.isEmpty()) setNoServiceError(req, service);
         else withExceptionHandling(req, () -> {
             List<MetricsPacket> packets = metricsManager.getMetrics(services, startTime);
-            log.log(DEBUG,() -> "Returning metrics packets:\n" + mkString(packets, "\n"));
+            log.log(FINE,() -> "Returning metrics packets:\n" + mkString(packets, "\n"));
             req.returnValues().add(new StringValue(toYamasArray(packets).serialize()));
         });
         req.returnRequest();
@@ -146,7 +146,7 @@ public class RpcServer {
 
     void setExtraMetrics(Request req) {
         String metricsJson = req.parameters().get(0).asString();
-        log.log(DEBUG, "setExtraMetrics called with argument: " + metricsJson);
+        log.log(FINE, "setExtraMetrics called with argument: " + metricsJson);
         withExceptionHandling(req, () -> metricsManager.setExtraMetrics(toMetricsPackets(metricsJson)));
     }
 
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaServices.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaServices.java
index 76a4ae5046b..e01a68a1f7f 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaServices.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaServices.java
@@ -15,7 +15,7 @@ import java.util.logging.Logger;
 
 import static ai.vespa.metricsproxy.core.MetricsConsumers.toUnmodifiableLinkedMap;
 import static ai.vespa.metricsproxy.metric.model.DimensionId.toDimensionId;
-import static com.yahoo.log.LogLevel.DEBUG;
+import static java.util.logging.Level.FINE;
 
 /**
  * Creates representations for the Vespa services running on the node,
@@ -47,12 +47,12 @@ public class VespaServices {
     private List<VespaService> createServices(VespaServicesConfig servicesConfig, String monitoringSystemName) {
         List<VespaService> services = new ArrayList<>();
         for (Service s : servicesConfig.service()) {
-            log.log(DEBUG, "Creating service " + s.name());
+            log.log(FINE, "Creating service " + s.name());
             VespaService vespaService = VespaService.create(s.name(), s.configId(), s.port(), monitoringSystemName,
                                                             createServiceDimensions(s));
             services.add(vespaService);
         }
-        log.log(DEBUG, "Created new services: " + services.size());
+        log.log(FINE, "Created new services: " + services.size());
         return services;
     }
 
@@ -62,7 +62,7 @@ public class VespaServices {
      */
     public final void updateServices(List<VespaService> services) {
         if (sentinel != null) {
-            log.log(DEBUG, "Updating services ");
+            log.log(FINE, "Updating services ");
             sentinel.updateServiceStatuses(services);
         }
     }
@@ -103,7 +103,7 @@ public class VespaServices {
 
         List<VespaService> myServices = new ArrayList<>();
         for (VespaService s : services) {
-            log.log(DEBUG, () -> "getMonitoringServices. service=" + service + ", checking against " + s + ", which has monitoring name " + s.getMonitoringName());
+            log.log(FINE, () -> "getMonitoringServices. service=" + service + ", checking against " + s + ", which has monitoring name " + s.getMonitoringName());
             if (s.getMonitoringName().equalsIgnoreCase(service)) {
                 myServices.add(s);
             }