1 files changed, 15 insertions, 16 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/HostLifeGatherer.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/HostLifeGatherer.java
index 730f7bc13cd..28f99096d84 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/HostLifeGatherer.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/HostLifeGatherer.java
@@ -1,8 +1,9 @@
 // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.container.jdisc.state;
 
-import org.json.JSONException;
-import org.json.JSONObject;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -13,9 +14,11 @@ import java.time.Instant;
  */
 public class HostLifeGatherer {
 
+    private static final ObjectMapper jsonMapper = new ObjectMapper();
+
     private static final Path UPTIME_PATH = Path.of("/proc");
 
-    public static JSONObject getHostLifePacket(FileWrapper fileWrapper) {
+    public static JsonNode getHostLifePacket(FileWrapper fileWrapper) {
         long upTime;
         int statusCode = 0;
         String statusMessage = "OK";
@@ -29,19 +32,15 @@ public class HostLifeGatherer {
         }
 
 
-        JSONObject jsonObject = new JSONObject();
-        try {
-            jsonObject.put("status_code", statusCode);
-            jsonObject.put("status_msg", statusMessage);
-            jsonObject.put("timestamp", Instant.now().getEpochSecond());
-            jsonObject.put("application", "host_life");
-            JSONObject metrics = new JSONObject();
-            metrics.put("uptime", upTime);
-            metrics.put("alive", 1);
-            jsonObject.put("metrics", metrics);
-
-        } catch (JSONException e) {}
-
+        ObjectNode jsonObject = jsonMapper.createObjectNode();
+        jsonObject.put("status_code", statusCode);
+        jsonObject.put("status_msg", statusMessage);
+        jsonObject.put("timestamp", Instant.now().getEpochSecond());
+        jsonObject.put("application", "host_life");
+        ObjectNode metrics = jsonMapper.createObjectNode();
+        metrics.put("uptime", upTime);
+        metrics.put("alive", 1);
+        jsonObject.set("metrics", metrics);
         return jsonObject;
     }