refactoring for backward compatiblity

Author: Ashish Aggarwal

commons/src/main/java/com/expedia/www/haystack/client/dispatchers/clients/BaseGrpcClient.java

@@ -30,7 +30,7 @@
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
-abstract public class BaseGrpcClient {
+abstract public class BaseGrpcClient<R> implements Client<R> {
     private static final Logger LOGGER = LoggerFactory.getLogger(BaseGrpcClient.class);
 
     protected final ManagedChannel channel;
@@ -140,7 +140,7 @@ public void onNext(DispatchResult value) {
         }
     }
 
-    public static class Builder {
+    public static abstract class Builder {
         protected StreamObserver<DispatchResult> observer;
 
         protected Metrics metrics;
@@ -228,5 +228,7 @@ protected ManagedChannel buildManagedChannel() {
                     .negotiationType(negotiationType)
                     .build();
         }
+
+        public abstract BaseGrpcClient build();
     }
 }

commons/src/main/java/com/expedia/www/haystack/client/dispatchers/clients/GRPCAgentProtoClient.java

@@ -26,7 +26,7 @@
 import io.grpc.ManagedChannel;
 import io.grpc.stub.StreamObserver;
 
-public class GRPCAgentProtoClient extends BaseGrpcClient implements Client<Span> {
+public class GRPCAgentProtoClient extends BaseGrpcClient<Span> {
     public GRPCAgentProtoClient(Metrics metrics,
                                 ManagedChannel channel,
                                 SpanAgentStub stub,

core/src/main/java/com/expedia/www/haystack/client/Tracer.java

@@ -62,6 +62,11 @@ public class Tracer implements io.opentracing.Tracer {
     private final Timer extractTimer;
     private final Counter extractFailureCounter;
 
+    public Tracer(String serviceName, ScopeManager scopeManager, Clock clock,
+                  Dispatcher dispatcher, PropagationRegistry registry, Metrics metrics) {
+        this(serviceName, scopeManager, clock, dispatcher, registry, metrics, false);
+
+    }
     public Tracer(String serviceName, ScopeManager scopeManager, Clock clock,
                   Dispatcher dispatcher, PropagationRegistry registry, Metrics metrics, boolean dualSpanMode) {
         this.serviceName = serviceName;
@@ -266,15 +271,15 @@ boolean isServerSpan() {
             return Tags.SPAN_KIND_SERVER.equals(tags.get(Tags.SPAN_KIND.getKey()));
         }
 
-        SpanContext createNewContext() {
+        protected SpanContext createNewContext() {
             return createContext(UUID.randomUUID(), UUID.randomUUID(), null, Collections.emptyMap());
         }
 
-        SpanContext createContext(UUID traceId, UUID spanId, UUID parentId, Map<String, String> baggage) {
+        protected SpanContext createContext(UUID traceId, UUID spanId, UUID parentId, Map<String, String> baggage) {
             return new SpanContext(traceId, spanId, parentId, baggage, false);
         }
 
-        SpanContext createDependentContext() {
+        protected SpanContext createDependentContext() {
             Reference parent = references.get(0);
             for (Reference reference : references) {
                 if (References.CHILD_OF.equals(reference.getReferenceType())) {

core/src/main/java/com/expedia/www/haystack/client/dispatchers/clients/GRPCAgentClient.java

@@ -28,7 +28,7 @@
 import io.grpc.ManagedChannel;
 import io.grpc.stub.StreamObserver;
 
-public class GRPCAgentClient extends BaseGrpcClient implements com.expedia.www.haystack.client.dispatchers.clients.Client<Span> {
+public class GRPCAgentClient extends BaseGrpcClient<Span> {
     private final Format<com.expedia.open.tracing.Span> format;
 
     public GRPCAgentClient(Metrics metrics, Format<com.expedia.open.tracing.Span> format, ManagedChannel channel, SpanAgentStub stub, StreamObserver<DispatchResult> observer, long shutdownTimeoutMS) {

integrations/opencensus/src/test/scala/com/www/expedia/opencensus/exporter/trace/HaystackExporterIntegrationSpec.scala

@@ -50,7 +50,7 @@ class HaystackExporterIntegrationSpec extends FunSpec with GivenWhenThen with Ma
     HaystackTraceExporter.unregister()
   }
 
-  private def generateTrace(tracer: Tracer, startTimeInMillis: Long) = {
+  private def generateTrace(tracer: Tracer) = {
     val spanBuilder = tracer.spanBuilder(OPERATION_NAME).setRecordEvents(true).setSampler(Samplers.alwaysSample())
     val spanDurationInMillis = new Random().nextInt(10) + 1
 
@@ -72,14 +72,12 @@ class HaystackExporterIntegrationSpec extends FunSpec with GivenWhenThen with Ma
 
   describe("Integration Test with haystack and opencensus") {
     it ("should dispatch the spans to haystack-agent") {
-      val startTimeMillis = System.currentTimeMillis()
       HaystackTraceExporter.createAndRegister(new GrpcAgentDispatcherConfig("haystack-agent", 35000), SERVICE_NAME)
-
       val tracer = Tracing.getTracer
 
-      generateTrace(tracer, startTimeMillis)
+      generateTrace(tracer)
       Thread.sleep(2000)
-      generateTrace(tracer, startTimeMillis)
+      generateTrace(tracer)
 
       // wait for few sec to let the span reach kafka
       Thread.sleep(10000)
@@ -89,7 +87,6 @@ class HaystackExporterIntegrationSpec extends FunSpec with GivenWhenThen with Ma
       val record = records.iterator().next()
       val protoSpan = com.expedia.open.tracing.Span.parseFrom(record.value())
       protoSpan.getTraceId shouldEqual record.key()
-      protoSpan.getStartTime should (be >= startTimeMillis * 1000 and be <= System.currentTimeMillis() * 1000) // micros
       protoSpan.getServiceName shouldEqual SERVICE_NAME
       protoSpan.getOperationName shouldEqual OPERATION_NAME
       protoSpan.getTagsCount shouldBe 2