diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsUtil.java b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsUtil.java
index 58521ed5c..d5ca28284 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsUtil.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsUtil.java
@@ -30,6 +30,8 @@ import io.opentelemetry.sdk.resources.ResourceBuilder;
 import java.time.Duration;
 import java.util.Map;
 import java.util.Optional;
+
+import org.eclipse.jetty.util.component.LifeCycle;
 import org.whispersystems.textsecuregcm.WhisperServerConfiguration;
 import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
 import org.whispersystems.textsecuregcm.storage.DynamicConfigurationManager;
@@ -120,10 +122,10 @@ public class MetricsUtil {
 
     OpenTelemetryAppender.install(openTelemetry);
 
-    environment.lifecycle().manage(new Managed() {
+    environment.lifecycle().addEventListener(new LifeCycle.Listener() {
       @Override
-      public void stop() {
-        openTelemetry.shutdown();
+      public void lifeCycleStopped(final LifeCycle event) {
+        openTelemetry.close();
       }
     });
   }
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/OpenTelemetryAppenderFactory.java b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/OpenTelemetryAppenderFactory.java
index 95c1efb9a..c07d10488 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/OpenTelemetryAppenderFactory.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/OpenTelemetryAppenderFactory.java
@@ -33,6 +33,7 @@ public class OpenTelemetryAppenderFactory extends AbstractAppenderFactory<ILoggi
     final OpenTelemetryAppender appender = new OpenTelemetryAppender();
     appender.setCaptureCodeAttributes(true);
     appender.setCaptureLoggerContext(true);
+    appender.setCaptureMarkerAttribute(true);
 
     // The installation of an OpenTelemetry configuration happens in
     // WhisperServerService (or CommandDependencies), in order to let us tie