diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java b/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java index 4f4c067fdc..c795dfe4bf 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java @@ -261,8 +261,12 @@ public class DDTracer implements io.opentracing.Tracer, Closeable, datadog.trace @Override public void finalize() { - Runtime.getRuntime().removeShutdownHook(shutdownCallback); - shutdownCallback.run(); + try { + Runtime.getRuntime().removeShutdownHook(shutdownCallback); + shutdownCallback.run(); + } catch (final Exception e) { + log.error("Error while finalizing DDTracer.", e); + } } /** diff --git a/dd-trace/src/main/java/datadog/trace/tracer/Tracer.java b/dd-trace/src/main/java/datadog/trace/tracer/Tracer.java index f309f0a0f2..4aaf25bb09 100644 --- a/dd-trace/src/main/java/datadog/trace/tracer/Tracer.java +++ b/dd-trace/src/main/java/datadog/trace/tracer/Tracer.java @@ -138,8 +138,12 @@ public class Tracer implements Closeable { @Override public void finalize() { - Runtime.getRuntime().removeShutdownHook(shutdownCallback); - shutdownCallback.run(); + try { + Runtime.getRuntime().removeShutdownHook(shutdownCallback); + shutdownCallback.run(); + } catch (final Exception e) { + log.error("Error while finalizing Tracer.", e); + } } @Override