2 files changed, 4 insertions, 5 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/ErrorResponse.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/ErrorResponse.java
index b553763c2b5..650555bf427 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/metrics/ErrorResponse.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/ErrorResponse.java
@@ -1,6 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.container.handler.metrics;
 
+import ai.vespa.json.Jackson;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -16,15 +17,13 @@ public class ErrorResponse extends JsonResponse {
 
     private static final Logger log = Logger.getLogger(ErrorResponse.class.getName());
 
-    private static final ObjectMapper objectMapper = new ObjectMapper();
-
     public ErrorResponse(int code, String message) {
         super(code, asErrorJson(message != null ? message : "<null>"));
     }
 
     static String asErrorJson(String message) {
         try {
-            return objectMapper.writeValueAsString(Map.of("error", message));
+            return Jackson.mapper().writeValueAsString(Map.of("error", message));
         } catch (JsonProcessingException e) {
             log.log(WARNING, "Could not encode error message to json:", e);
             return "Could not encode error message to json, check the log for details.";
diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/HttpHandlerBase.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/HttpHandlerBase.java
index d0c1197b91e..d94a4e64bd3 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/metrics/HttpHandlerBase.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/HttpHandlerBase.java
@@ -1,8 +1,8 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.container.handler.metrics;
 
+import ai.vespa.json.Jackson;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.yahoo.container.jdisc.HttpRequest;
@@ -31,7 +31,6 @@ import static java.util.logging.Level.WARNING;
  */
 public abstract class HttpHandlerBase extends ThreadedHttpRequestHandler implements CapabilityRequiringRequestHandler {
 
-    private static final ObjectMapper jsonMapper = new ObjectMapper();
     private final Duration defaultTimeout;
 
     protected HttpHandlerBase(Executor executor) {
@@ -85,6 +84,7 @@ public abstract class HttpHandlerBase extends ThreadedHttpRequestHandler impleme
             base.append(":").append(port);
         }
         String uriBase = base.toString();
+        var jsonMapper = Jackson.mapper();
         ArrayNode linkList = jsonMapper.createArrayNode();
         for (String api : resources) {
             ObjectNode resource = jsonMapper.createObjectNode();