diff --git a/server/src/main/java/org/apache/druid/guice/http/HttpClientModule.java b/server/src/main/java/org/apache/druid/guice/http/HttpClientModule.java index 2aaf30a469f..f3f157f6528 100644 --- a/server/src/main/java/org/apache/druid/guice/http/HttpClientModule.java +++ b/server/src/main/java/org/apache/druid/guice/http/HttpClientModule.java @@ -31,6 +31,7 @@ import org.apache.druid.guice.annotations.EscalatedClient; import org.apache.druid.guice.annotations.EscalatedGlobal; import org.apache.druid.guice.annotations.Global; import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.emitter.service.ServiceEmitter; import org.apache.druid.java.util.http.client.HttpClient; import org.apache.druid.java.util.http.client.HttpClientConfig; import org.apache.druid.java.util.http.client.HttpClientInit; @@ -87,6 +88,8 @@ public class HttpClientModule implements Module private final boolean isEscalated; private final boolean eagerByDefault; private Escalator escalator; + private ServiceEmitter emitter; + public HttpClientProvider(Class annotationClazz, boolean isEscalated, boolean eagerByDefault) { @@ -96,9 +99,10 @@ public class HttpClientModule implements Module } @Inject - public void inject(Escalator escalator) + public void inject(Escalator escalator, ServiceEmitter emitter) { this.escalator = escalator; + this.emitter = emitter; } @Override @@ -125,7 +129,8 @@ public class HttpClientModule implements Module HttpClient client = HttpClientInit.createClient( builder.build(), - getLifecycleProvider().get() + getLifecycleProvider().get(), + emitter ); if (isEscalated) { diff --git a/server/src/test/java/org/apache/druid/server/initialization/BaseJettyTest.java b/server/src/test/java/org/apache/druid/server/initialization/BaseJettyTest.java index 422d336e3bf..b27b08bfa28 100644 --- a/server/src/test/java/org/apache/druid/server/initialization/BaseJettyTest.java +++ b/server/src/test/java/org/apache/druid/server/initialization/BaseJettyTest.java @@ -25,6 +25,7 @@ import com.google.inject.Key; import com.google.inject.servlet.GuiceFilter; import org.apache.druid.guice.annotations.Self; import org.apache.druid.java.util.common.lifecycle.Lifecycle; +import org.apache.druid.java.util.emitter.core.NoopEmitter; import org.apache.druid.java.util.http.client.HttpClient; import org.apache.druid.java.util.http.client.HttpClientConfig; import org.apache.druid.java.util.http.client.HttpClientInit; @@ -128,7 +129,8 @@ public abstract class BaseJettyTest .withReadTimeout(Duration.ZERO) .withEagerInitialization(true) .build(), - druidLifecycle + druidLifecycle, + new NoopEmitter() ); } catch (Exception e) { diff --git a/server/src/test/java/org/apache/druid/server/initialization/JettyCertRenewTest.java b/server/src/test/java/org/apache/druid/server/initialization/JettyCertRenewTest.java index 031bdac1ee5..3a0c5eca32d 100644 --- a/server/src/test/java/org/apache/druid/server/initialization/JettyCertRenewTest.java +++ b/server/src/test/java/org/apache/druid/server/initialization/JettyCertRenewTest.java @@ -34,6 +34,7 @@ import org.apache.druid.guice.LazySingleton; import org.apache.druid.guice.LifecycleModule; import org.apache.druid.guice.annotations.Self; import org.apache.druid.initialization.Initialization; +import org.apache.druid.java.util.emitter.core.NoopEmitter; import org.apache.druid.java.util.http.client.HttpClient; import org.apache.druid.java.util.http.client.HttpClientConfig; import org.apache.druid.java.util.http.client.HttpClientInit; @@ -385,7 +386,8 @@ public class JettyCertRenewTest extends BaseJettyTest try { client = HttpClientInit.createClient( getSslConfig(), - lifecycle + lifecycle, + new NoopEmitter() ); } catch (Exception e) { diff --git a/server/src/test/java/org/apache/druid/server/initialization/JettyTest.java b/server/src/test/java/org/apache/druid/server/initialization/JettyTest.java index a2fcea83434..a98f6874d19 100644 --- a/server/src/test/java/org/apache/druid/server/initialization/JettyTest.java +++ b/server/src/test/java/org/apache/druid/server/initialization/JettyTest.java @@ -35,6 +35,7 @@ import org.apache.druid.guice.LifecycleModule; import org.apache.druid.guice.annotations.Self; import org.apache.druid.initialization.Initialization; import org.apache.druid.java.util.common.concurrent.Execs; +import org.apache.druid.java.util.emitter.core.NoopEmitter; import org.apache.druid.java.util.http.client.HttpClient; import org.apache.druid.java.util.http.client.HttpClientConfig; import org.apache.druid.java.util.http.client.HttpClientInit; @@ -501,7 +502,8 @@ public class JettyTest extends BaseJettyTest try { client = HttpClientInit.createClient( sslConfig, - lifecycle + lifecycle, + new NoopEmitter() ); } catch (Exception e) {