diff options
author | Jon Bratseth <bratseth@gmail.com> | 2023-03-03 15:16:12 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2023-03-03 15:16:12 +0100 |
commit | 47188f0c7749ec328e4f9bc555c44b8ab2b90182 (patch) | |
tree | 8216de8385b45ed52364c8e52ae92f00d86c7e1f /container-disc | |
parent | f3d1ec3b144acbfde712a6cd61a5ff47e1ecf1b1 (diff) |
Use the metric provider returned after configuration
Diffstat (limited to 'container-disc')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java index b7381631251..0d18eb9aa8f 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java @@ -74,7 +74,6 @@ public final class ConfiguredApplication implements Application { private final Set<ClientProvider> startedClients = createIdentityHashSet(); private final Set<ServerProvider> startedServers = createIdentityHashSet(); private final SubscriberFactory subscriberFactory; - private final Metric metric; private final ContainerActivator activator; private final String configId; private final OsgiFramework osgiFramework; @@ -100,6 +99,7 @@ public final class ConfiguredApplication implements Application { private final Thread portWatcher; private HandlersConfigurerDi configurer; private QrConfig qrConfig; + private Metric metric; // Cannot be injected before the application is set up private Register slobrokRegistrator = null; private Supervisor supervisor = null; @@ -141,13 +141,11 @@ public final class ConfiguredApplication implements Application { public ConfiguredApplication(ContainerActivator activator, OsgiFramework osgiFramework, com.yahoo.jdisc.Timer timer, - SubscriberFactory subscriberFactory, - Metric metric) { + SubscriberFactory subscriberFactory) { this.activator = activator; this.osgiFramework = osgiFramework; this.timerSingleton = timer; this.subscriberFactory = subscriberFactory; - this.metric = metric; this.configId = System.getProperty("config.id"); this.slobrokConfigSubscriber = (subscriberFactory instanceof CloudSubscriberFactory) ? new SlobrokConfigSubscriber(configId) @@ -166,6 +164,7 @@ public final class ConfiguredApplication implements Application { ContainerBuilder builder = createBuilderWithGuiceBindings(); configurer = createConfigurer(builder.guiceModules().activate()); + metric = configurer.getComponent(Metric.class); initializeAndActivateContainer(builder, () -> {}); reconfigurerThread.setDaemon(true); reconfigurerThread.start(); |