1 files changed, 5 insertions, 0 deletions
diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java
index 00e3a61a8..29cccccdf 100644
--- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java
+++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java
@@ -22,6 +22,8 @@ import com.google.inject.name.Names;
 import io.fd.honeycomb.data.ModifiableDataManager;
 import io.fd.honeycomb.data.ReadableDataManager;
 import io.fd.honeycomb.data.init.DataTreeInitializer;
+import io.fd.honeycomb.data.init.ShutdownHandler;
+import io.fd.honeycomb.impl.ShutdownHandlerImpl;
 import io.fd.honeycomb.infra.distro.data.config.WriterRegistryProvider;
 import io.fd.honeycomb.infra.distro.data.oper.ReadableDTDelegProvider;
 import io.fd.honeycomb.infra.distro.data.oper.ReaderRegistryProvider;
@@ -42,6 +44,9 @@ public class ConfigAndOperationalPipelineModule extends PrivateModule {
     public static final String HONEYCOMB_CONFIG = "honeycomb-config";
 
     protected void configure() {
+        bind(ShutdownHandler.class).to(ShutdownHandlerImpl.class).in(Singleton.class);
+        expose(ShutdownHandler.class);
+
         // Expose registries for plugin reader/writer factories
         bind(WriterRegistry.class).toProvider(WriterRegistryProvider.class).in(Singleton.class);
         expose(WriterRegistry.class);