Removes unnecessary field in Tracer (openzipkin#496)

daxwang · Sep 18, 2017 · e62a1d9 · e62a1d9
1 parent c30f8cf
commit e62a1d9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/brave/src/main/java/brave/Tracer.java b/brave/src/main/java/brave/Tracer.java
@@ -118,7 +118,6 @@ public Tracer build() {
   }
 
   final Clock clock;
-  final Endpoint localEndpoint;
   final Recorder recorder;
   final Sampler sampler;
   final CurrentTraceContext currentTraceContext;
@@ -128,8 +127,7 @@ public Tracer build() {
   Tracer(Tracing.Builder builder, AtomicBoolean noop) {
     this.noop = noop;
     this.clock = builder.clock;
-    this.localEndpoint = builder.localEndpoint;
-    this.recorder = new Recorder(localEndpoint, clock, builder.reporter, this.noop);
+    this.recorder = new Recorder(builder.localEndpoint, clock, builder.reporter, this.noop);
     this.sampler = builder.sampler;
     this.currentTraceContext = builder.currentTraceContext;
     this.traceId128Bit = builder.traceId128Bit;

diff --git a/brave/src/test/java/brave/TracerTest.java b/brave/src/test/java/brave/TracerTest.java
@@ -34,22 +34,22 @@ public class TracerTest {
   @Test public void localServiceName() {
     tracer = Tracing.newBuilder().localServiceName("my-foo").build().tracer();
 
-    assertThat(tracer.localEndpoint.serviceName())
-        .isEqualTo("my-foo");
+    assertThat(tracer).extracting("recorder.spanMap.localEndpoint.serviceName")
+        .containsExactly("my-foo");
   }
 
   @Test public void localServiceName_defaultIsUnknown() {
-    assertThat(tracer.localEndpoint.serviceName())
-        .isEqualTo("unknown");
+    assertThat(tracer).extracting("recorder.spanMap.localEndpoint.serviceName")
+        .containsExactly("unknown");
   }
 
   @Test public void localServiceName_ignoredWhenGivenLocalEndpoint() {
     Endpoint localEndpoint = Endpoint.newBuilder().serviceName("my-bar").build();
     tracer = Tracing.newBuilder().localServiceName("my-foo")
         .localEndpoint(localEndpoint).build().tracer();
 
-    assertThat(tracer.localEndpoint)
-        .isSameAs(localEndpoint);
+    assertThat(tracer).extracting("recorder.spanMap.localEndpoint")
+        .containsExactly(localEndpoint);
   }
 
   @Test public void clock() {

diff --git a/spring-beans/src/test/java/brave/spring/beans/TracingFactoryBeanTest.java b/spring-beans/src/test/java/brave/spring/beans/TracingFactoryBeanTest.java
@@ -30,7 +30,7 @@ public class TracingFactoryBeanTest {
     context.refresh();
 
     assertThat(context.getBean(Tracing.class))
-        .extracting("tracer.localEndpoint")
+        .extracting("tracer.recorder.spanMap.localEndpoint")
         .extracting("serviceName")
         .containsExactly("brave-webmvc-example");
   }
@@ -50,7 +50,7 @@ public class TracingFactoryBeanTest {
     context.refresh();
 
     assertThat(context.getBean(Tracing.class))
-        .extracting("tracer.localEndpoint")
+        .extracting("tracer.recorder.spanMap.localEndpoint")
         .containsExactly(Endpoint.newBuilder()
             .serviceName("brave-webmvc-example")
             .ip("1.2.3.4")