Merge branch 'release/0.9.2'

Author: rdegnan

gradle.properties

@@ -1,2 +1,2 @@
 group=io.netifi.proteus
-version=0.9.1
+version=0.9.2

gradle/wrapper/gradle-wrapper.jar

@@ -26,6 +26,4 @@ message TracesRequest {
 service ProteusTracingService {
 
     rpc StreamSpans (stream zipkin.proto3.Span) returns (Ack) {}
-
-    rpc StreamTraces (TracesRequest) returns (stream Trace) {}
 }

proteus-tracing-idl/src/main/proto/proteus/tracing.proto

@@ -27,18 +27,15 @@ public class ProteusZipkinHttpBridge implements ProteusTracingService {
   private final int port;
   private final String zipkinSpansUrl;
   private HttpClient httpClient;
-  private TracesStreamer tracesStreamer;
 
-  public ProteusZipkinHttpBridge(
-      String host, int port, String zipkinSpansUrl, String zipkinTracesUrl) {
+  public ProteusZipkinHttpBridge(String host, int port, String zipkinSpansUrl) {
     this.host = host;
     this.port = port;
     this.zipkinSpansUrl = zipkinSpansUrl;
-    this.tracesStreamer = new TracesStreamer(zipkinTracesUrl, Mono.fromCallable(this::getClient));
   }
 
   public ProteusZipkinHttpBridge(String host, int port) {
-    this(host, port, DEFAULT_ZIPKIN_SPANS_URL, DEFAULT_ZIPKIN_TRACES_URL);
+    this(host, port, DEFAULT_ZIPKIN_SPANS_URL);
   }
 
   public static void main(String... args) {
@@ -51,8 +48,6 @@ public static void main(String... args) {
     int zipkinPort = Integer.getInteger("netifi.proteus.zipkinPort", 9411);
     String zipkinSpansUrl =
         System.getProperty("netifi.proteus.zipkinSpansUrl", DEFAULT_ZIPKIN_SPANS_URL);
-    String zipkinTracesUrl =
-        System.getProperty("netifi.proteus.zipkinTracesUrl", DEFAULT_ZIPKIN_TRACES_URL);
     long accessKey = Long.getLong("netifi.proteus.accessKey", 3855261330795754807L);
     String accessToken =
         System.getProperty("netifi.authentication.accessToken", "kTBDVtfRBO4tHOnZzSyY5ym2kfY");
@@ -63,7 +58,6 @@ public static void main(String... args) {
     logger.info("zipkin host - {}", zipkinHost);
     logger.info("zipkin port - {}", zipkinPort);
     logger.info("zipkin spans url - {}", zipkinSpansUrl);
-    logger.info("zipkin traces url - {}", zipkinTracesUrl);
     logger.info("access key - {}", accessKey);
 
     Proteus proteus =
@@ -78,7 +72,7 @@ public static void main(String... args) {
 
     proteus.addService(
         new ProteusTracingServiceServer(
-            new ProteusZipkinHttpBridge(zipkinHost, zipkinPort, zipkinSpansUrl, zipkinTracesUrl),
+            new ProteusZipkinHttpBridge(zipkinHost, zipkinPort, zipkinSpansUrl),
             Optional.empty(),
             Optional.empty()));
 
@@ -148,9 +142,4 @@ public Mono<Ack> streamSpans(Publisher<Span> messages, ByteBuf metadata) {
                     "error sending data to tracing data to url " + zipkinSpansUrl, throwable))
         .then(Mono.never());
   }
-
-  @Override
-  public Flux<Trace> streamTraces(TracesRequest message, ByteBuf metadata) {
-    return tracesStreamer.streamTraces(message.getLookbackSeconds());
-  }
 }

proteus-tracing-openzipkin/src/main/java/io/netifi/proteus/tracing/ProteusTraceStreamsSupplier.java

@@ -41,12 +41,7 @@ message Node {
     repeated string metadata = 10;
 }
 
-message VisualisationRequest {
-    int32 dataLookbackSeconds = 1;
-    string rootNode = 2;
-}
-
 service VizceralService {
 
-    rpc Visualisations (VisualisationRequest) returns (stream Node) {}
+    rpc Visualisations (google.protobuf.Empty) returns (stream Node) {}
 }