Skip to content
This repository has been archived by the owner on Jul 1, 2022. It is now read-only.

Fix repeated resolving of sender in configuration #555

Merged
merged 3 commits into from
Sep 19, 2018
Merged

Fix repeated resolving of sender in configuration #555

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
537cd02
Fix repeated resolving of sender in configuration
pavolloffay Sep 18, 2018
3bf9ea6
Add test
pavolloffay Sep 18, 2018
61f27f7
resolve if null
pavolloffay Sep 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions jaeger-core/src/main/java/io/jaegertracing/Configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,8 +635,7 @@ public Sender getSender() {
if (null != sender) {
return sender;
}

return SenderResolver.resolve(this);
return (sender = SenderResolver.resolve(this));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit:

if sender == null {
    sender = resolve()
}
return sender

}

/**
Expand Down
7 changes: 7 additions & 0 deletions jaeger-core/src/test/java/io/jaegertracing/ConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import io.jaegertracing.Configuration.CodecConfiguration;
import io.jaegertracing.Configuration.ReporterConfiguration;
import io.jaegertracing.Configuration.SamplerConfiguration;
import io.jaegertracing.Configuration.SenderConfiguration;
import io.jaegertracing.internal.JaegerSpanContext;
import io.jaegertracing.internal.JaegerTracer;
import io.jaegertracing.internal.metrics.InMemoryMetricsFactory;
Expand Down Expand Up @@ -183,6 +184,12 @@ public void testSenderBackwardsCompatibilityGettingAgentHostAndPort() {
.getSenderConfiguration().getAgentPort());
}

@Test
public void testSenderInstanceIsCached() {
SenderConfiguration senderConfiguration = SenderConfiguration.fromEnv();
assertEquals(senderConfiguration.getSender(), senderConfiguration.getSender());
}

@Test
public void testPropagationB3Only() {
System.setProperty(Configuration.JAEGER_PROPAGATION, "b3");
Expand Down