Skip to content
This repository was archived by the owner on May 4, 2019. It is now read-only.

Commit 0d638fa

Browse files
committed
Fixed vizceral json returned from tracing
1 parent 91874a4 commit 0d638fa

File tree

3 files changed

+24
-22
lines changed

3 files changed

+24
-22
lines changed

admin-client/src/main/java/io/netifi/proteus/admin/tracing/DefaultAdminTraceService.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,37 @@
11
package io.netifi.proteus.admin.tracing;
22

33
import io.netifi.proteus.admin.connection.ConnectionManager;
4-
import io.netifi.proteus.frames.admin.AdminFrameHeaderFlyweight;
5-
import io.netifi.proteus.frames.admin.AdminFrameType;
6-
import io.netifi.proteus.frames.admin.AdminTraceMetadataFlyweight;
7-
import io.netifi.proteus.frames.admin.AdminTraceType;
84
import io.netifi.proteus.admin.om.Notice;
95
import io.netifi.proteus.admin.tracing.internal.Connection;
106
import io.netifi.proteus.admin.tracing.internal.Metrics;
117
import io.netifi.proteus.admin.tracing.internal.Node;
128
import io.netifi.proteus.frames.RouteDestinationFlyweight;
139
import io.netifi.proteus.frames.RouteType;
1410
import io.netifi.proteus.frames.RoutingFlyweight;
11+
import io.netifi.proteus.frames.admin.AdminFrameHeaderFlyweight;
12+
import io.netifi.proteus.frames.admin.AdminFrameType;
13+
import io.netifi.proteus.frames.admin.AdminTraceMetadataFlyweight;
14+
import io.netifi.proteus.frames.admin.AdminTraceType;
1515
import io.netifi.proteus.util.TimebasedIdGenerator;
1616
import io.netty.buffer.ByteBuf;
1717
import io.netty.buffer.ByteBufAllocator;
1818
import io.netty.buffer.Unpooled;
1919
import io.rsocket.Closeable;
2020
import io.rsocket.Payload;
2121
import io.rsocket.util.ByteBufPayload;
22-
import java.time.Duration;
23-
import java.util.ArrayList;
24-
import java.util.Collections;
25-
import java.util.List;
26-
import java.util.stream.Collectors;
2722
import org.slf4j.Logger;
2823
import org.slf4j.LoggerFactory;
2924
import reactor.core.publisher.Flux;
3025
import reactor.core.publisher.Mono;
3126
import reactor.core.publisher.MonoProcessor;
3227
import reactor.core.scheduler.Schedulers;
3328

29+
import java.time.Duration;
30+
import java.util.ArrayList;
31+
import java.util.Collections;
32+
import java.util.List;
33+
import java.util.stream.Collectors;
34+
3435
public class DefaultAdminTraceService implements AdminTraceService, Closeable {
3536
private static final Logger logger = LoggerFactory.getLogger(DefaultAdminTraceService.class);
3637
private final MonoProcessor<Void> onClose;
@@ -185,6 +186,7 @@ private Node createRootNode() {
185186
node.setConnections(new ArrayList<>());
186187
node.setName("edge");
187188
node.setRenderer("region");
189+
node.setMaxVolume(5000D);
188190
return node;
189191
}
190192

@@ -214,7 +216,7 @@ private io.netifi.proteus.admin.om.Node translateNode(Node node) {
214216
.setClass_(node.getClazz() == null ? "" : node.getClazz())
215217
.setUpdated(node.getUpdated() == null ? 0 : node.getUpdated())
216218
.addAllNodes(nodes)
217-
.addAllConnection(connections)
219+
.addAllConnections(connections)
218220
.setDisplayName(node.getDisplayName() == null ? "" : node.getDisplayName())
219221
.addAllMetadata(node.getMetadata() == null ? Collections.EMPTY_LIST : node.getMetadata())
220222
.setMetrics(metrics)

admin-client/src/main/proto/admin.proto

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ message Connections {
3131
}
3232

3333
message Node {
34-
string renderer = 1;
35-
string name = 2;
36-
string entryNode = 3;
37-
double maxVolume = 4;
38-
string class = 5;
39-
int64 updated = 6;
40-
repeated Node nodes = 7;
41-
repeated Connection connection = 8;
42-
string displayName = 9;
43-
repeated string metadata = 10;
44-
Metrics metrics = 11;
34+
string renderer = 1;
35+
string name = 2;
36+
string entryNode = 3;
37+
double maxVolume = 4;
38+
string class = 5;
39+
int64 updated = 6;
40+
repeated Node nodes = 7;
41+
repeated Connection connections = 8;
42+
string displayName = 9;
43+
repeated string metadata = 10;
44+
Metrics metrics = 11;
4545
}
4646

4747
message Metrics {

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
group=io.netifi.proteus
2-
version=0.4.1
2+
version=0.4.2

0 commit comments

Comments
 (0)