From 4d5cc4dc2202bfcea764e657c3a126b6365a7dc2 Mon Sep 17 00:00:00 2001
From: Jonathan Klabunde Tomer <jkt@signal.org>
Date: Fri, 21 Nov 2025 22:45:07 -0800
Subject: [PATCH] support JSON logging and prefer it in sample config

We won't actually remove OTLP logging support until testing side-by-side and
seeing that things look good.
---
 service/config/sample.yml | 13 ++++++++++++-
 service/pom.xml           |  4 ++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/service/config/sample.yml b/service/config/sample.yml
index 0259ebfe0..b54a3813b 100644
--- a/service/config/sample.yml
+++ b/service/config/sample.yml
@@ -10,7 +10,18 @@ logging:
       threshold: ALL
       timeZone: UTC
       target: stdout
-    - type: otlp
+      layout:
+        type: json
+        timestampFormat: ISO_INSTANT
+        includes:
+          - timestamp
+          - level
+          - threadName
+          - marker
+          - loggerName
+          - message
+          - exception
+          - callerData
 
 tlsKeyStore:
   password: secret://tlsKeyStore.password
diff --git a/service/pom.xml b/service/pom.xml
index b7e60e75b..ab4be76c0 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -107,6 +107,10 @@
       <groupId>io.dropwizard</groupId>
       <artifactId>dropwizard-logging</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.dropwizard</groupId>
+      <artifactId>dropwizard-json-logging</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.dropwizard</groupId>
       <artifactId>dropwizard-metrics</artifactId>