diff --git a/jaeger-core/src/main/java/io/jaegertracing/Configuration.java b/jaeger-core/src/main/java/io/jaegertracing/Configuration.java index b75bc77e4..2ee69e95e 100644 --- a/jaeger-core/src/main/java/io/jaegertracing/Configuration.java +++ b/jaeger-core/src/main/java/io/jaegertracing/Configuration.java @@ -579,11 +579,6 @@ public SenderConfiguration getSenderConfiguration() { */ @Getter public static class SenderConfiguration { - /** - * A custom sender set by our consumers. If set, nothing else has effect. Optional. - */ - private Sender sender; - /** * The Agent Host. Has no effect if the sender is set. Optional. */ @@ -648,15 +643,11 @@ public SenderConfiguration withAuthPassword(String password) { } /** - * Returns a sender if one was given when creating the configuration, or attempts to create a sender based on the - * configuration's state. + * Returns a sender based on the configuration's state. * @return the sender passed via the constructor or a properly configured sender */ public Sender getSender() { - if (sender == null) { - sender = SenderResolver.resolve(this); - } - return sender; + return SenderResolver.resolve(this); } /** diff --git a/jaeger-core/src/test/java/io/jaegertracing/ConfigurationTest.java b/jaeger-core/src/test/java/io/jaegertracing/ConfigurationTest.java index 0d61541c1..7a9c36a19 100644 --- a/jaeger-core/src/test/java/io/jaegertracing/ConfigurationTest.java +++ b/jaeger-core/src/test/java/io/jaegertracing/ConfigurationTest.java @@ -313,8 +313,11 @@ public void testOverrideServiceName() { @Test public void testDefaultTracer() { Configuration configuration = new Configuration("name"); - assertNotNull(configuration.getTracer()); - assertNotNull(configuration.getTracer()); + JaegerTracer tracer = configuration.getTracer(); + assertNotNull(tracer); + configuration.closeTracer(); + tracer = configuration.getTracer(); + assertNotNull(tracer); configuration.closeTracer(); }