Skip to content

Commit 6e32e74

Browse files
adriancoleadriancole
authored
Organizes v2 classes into corresponding internal packages (openzipkin#1702)
1 parent 8892aa3 commit 6e32e74

File tree

43 files changed

+609
-633
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+609
-633
lines changed

‎benchmarks/src/main/java/zipkin/benchmarks/CodecBenchmarks.java

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
import org.openjdk.jmh.runner.options.OptionsBuilder;
4242
import zipkin.Codec;
4343
import zipkin.Endpoint;
44-
import zipkin.Span;
45-
import zipkin.internal.Span2;
44+
import zipkin.internal.v2.Span;
4645
import zipkin.internal.v2.codec.MessageEncoder;
4746
import zipkin.internal.v2.codec.Decoder;
4847
import zipkin.internal.v2.codec.Encoder;
@@ -66,22 +65,22 @@ public class CodecBenchmarks {
6665
static final TBinaryProtocol.Factory TBINARY_PROTOCOL_FACTORY = new TBinaryProtocol.Factory();
6766

6867
static final byte[] localSpanJson = read("/span-local.json");
69-
static final Span localSpan = Codec.JSON.readSpan(localSpanJson);
68+
static final zipkin.Span localSpan = Codec.JSON.readSpan(localSpanJson);
7069
static final byte[] localSpanThrift = Codec.THRIFT.writeSpan(localSpan);
7170
static final com.twitter.zipkin.thriftjava.Span localSpanLibThrift = deserialize(localSpanThrift);
7271

7372
@Benchmark
74-
public Span readLocalSpan_json_zipkin() {
73+
public zipkin.Span readLocalSpan_json_zipkin() {
7574
return Codec.JSON.readSpan(localSpanJson);
7675
}
7776

7877
@Benchmark
79-
public Span readLocalSpan_thrift_zipkin() {
78+
public zipkin.Span readLocalSpan_thrift_zipkin() {
8079
return Codec.THRIFT.readSpan(localSpanThrift);
8180
}
8281

8382
@Benchmark
84-
public Span readLocalSpan_thrift_libthrift() {
83+
public zipkin.Span readLocalSpan_thrift_libthrift() {
8584
return toZipkinSpan(deserialize(localSpanThrift));
8685
}
8786

@@ -101,36 +100,36 @@ public byte[] writeLocalSpan_thrift_libthrift() throws TException {
101100
}
102101

103102
static final byte[] clientSpanJson = read("/span-client.json");
104-
static final Span clientSpan = Codec.JSON.readSpan(clientSpanJson);
103+
static final zipkin.Span clientSpan = Codec.JSON.readSpan(clientSpanJson);
105104
static final byte[] clientSpanThrift = Codec.THRIFT.writeSpan(clientSpan);
106105
static final com.twitter.zipkin.thriftjava.Span clientSpanLibThrift =
107106
deserialize(clientSpanThrift);
108-
static final List<Span> tenClientSpans = Collections.nCopies(10, clientSpan);
107+
static final List<zipkin.Span> tenClientSpans = Collections.nCopies(10, clientSpan);
109108
static final byte[] tenClientSpansJson = Codec.JSON.writeSpans(tenClientSpans);
110109
static final byte[] tenClientSpansThrift = Codec.THRIFT.writeSpans(tenClientSpans);
111110

112111
@Benchmark
113-
public Span readClientSpan_json_zipkin() {
112+
public zipkin.Span readClientSpan_json_zipkin() {
114113
return Codec.JSON.readSpan(clientSpanJson);
115114
}
116115

117116
@Benchmark
118-
public List<Span> readTenClientSpans_json_zipkin() {
117+
public List<zipkin.Span> readTenClientSpans_json_zipkin() {
119118
return Codec.JSON.readSpans(tenClientSpansJson);
120119
}
121120

122121
@Benchmark
123-
public Span readClientSpan_thrift_zipkin() {
122+
public zipkin.Span readClientSpan_thrift_zipkin() {
124123
return Codec.THRIFT.readSpan(clientSpanThrift);
125124
}
126125

127126
@Benchmark
128-
public List<Span> readTenClientSpans_thrift_zipkin() {
127+
public List<zipkin.Span> readTenClientSpans_thrift_zipkin() {
129128
return Codec.THRIFT.readSpans(tenClientSpansThrift);
130129
}
131130

132131
@Benchmark
133-
public Span readClientSpan_thrift_libthrift() {
132+
public zipkin.Span readClientSpan_thrift_libthrift() {
134133
return toZipkinSpan(deserialize(clientSpanThrift));
135134
}
136135

@@ -159,13 +158,13 @@ public byte[] writeClientSpan_thrift_libthrift() throws TException {
159158
return serialize(clientSpanLibThrift);
160159
}
161160

162-
static final Span2 span2 = Decoder.JSON.decodeList(read("/span2.json")).get(0);
161+
static final Span span2 = Decoder.JSON.decodeList(read("/span2.json")).get(0);
163162
static final byte[] tenClientSpan2sJson = MessageEncoder.JSON_BYTES.encode(
164163
Collections.nCopies(10, span2).stream().map(Encoder.JSON::encode).collect(Collectors.toList())
165164
);
166165

167166
@Benchmark
168-
public List<Span2> readTenClientSpans_json_span2() {
167+
public List<Span> readTenClientSpans_json_span2() {
169168
return Decoder.JSON.decodeList(tenClientSpan2sJson);
170169
}
171170

@@ -175,22 +174,22 @@ public byte[] writeClientSpan_json_span2() {
175174
}
176175

177176
static final byte[] rpcSpanJson = read("/span-rpc.json");
178-
static final Span rpcSpan = Codec.JSON.readSpan(rpcSpanJson);
177+
static final zipkin.Span rpcSpan = Codec.JSON.readSpan(rpcSpanJson);
179178
static final byte[] rpcSpanThrift = Codec.THRIFT.writeSpan(rpcSpan);
180179
static final com.twitter.zipkin.thriftjava.Span rpcSpanLibThrift = deserialize(rpcSpanThrift);
181180

182181
@Benchmark
183-
public Span readRpcSpan_json_zipkin() {
182+
public zipkin.Span readRpcSpan_json_zipkin() {
184183
return Codec.JSON.readSpan(rpcSpanJson);
185184
}
186185

187186
@Benchmark
188-
public Span readRpcSpan_thrift_zipkin() {
187+
public zipkin.Span readRpcSpan_thrift_zipkin() {
189188
return Codec.THRIFT.readSpan(rpcSpanThrift);
190189
}
191190

192191
@Benchmark
193-
public Span readRpcSpan_thrift_libthrift() {
192+
public zipkin.Span readRpcSpan_thrift_libthrift() {
194193
return toZipkinSpan(deserialize(rpcSpanThrift));
195194
}
196195

@@ -210,22 +209,22 @@ public byte[] writeRpcSpan_thrift_libthrift() throws TException {
210209
}
211210

212211
static final byte[] rpcV6SpanJson = read("/span-rpc-ipv6.json");
213-
static final Span rpcV6Span = Codec.JSON.readSpan(rpcV6SpanJson);
212+
static final zipkin.Span rpcV6Span = Codec.JSON.readSpan(rpcV6SpanJson);
214213
static final byte[] rpcV6SpanThrift = Codec.THRIFT.writeSpan(rpcV6Span);
215214
static final com.twitter.zipkin.thriftjava.Span rpcV6SpanLibThrift = deserialize(rpcV6SpanThrift);
216215

217216
@Benchmark
218-
public Span readRpcV6Span_json_zipkin() {
217+
public zipkin.Span readRpcV6Span_json_zipkin() {
219218
return Codec.JSON.readSpan(rpcV6SpanJson);
220219
}
221220

222221
@Benchmark
223-
public Span readRpcV6Span_thrift_zipkin() {
222+
public zipkin.Span readRpcV6Span_thrift_zipkin() {
224223
return Codec.THRIFT.readSpan(rpcV6SpanThrift);
225224
}
226225

227226
@Benchmark
228-
public Span readRpcV6Span_thrift_libthrift() {
227+
public zipkin.Span readRpcV6Span_thrift_libthrift() {
229228
return toZipkinSpan(deserialize(rpcV6SpanThrift));
230229
}
231230

@@ -282,8 +281,8 @@ private static com.twitter.zipkin.thriftjava.Span deserialize(byte[] serialized)
282281
* uses immutable collections, etc. When comparing codec, make sure you copy-out as structs like
283282
* libthrift do no validation, which is cheaper, but not usable in zipkin.
284283
*/
285-
private static Span toZipkinSpan(com.twitter.zipkin.thriftjava.Span libthriftSpan) {
286-
Span.Builder builder = Span.builder()
284+
private static zipkin.Span toZipkinSpan(com.twitter.zipkin.thriftjava.Span libthriftSpan) {
285+
zipkin.Span.Builder builder = zipkin.Span.builder()
287286
.traceId(libthriftSpan.trace_id)
288287
.id(libthriftSpan.id)
289288
.parentId(libthriftSpan.isSetParent_id() ? libthriftSpan.parent_id : null)

‎benchmarks/src/main/java/zipkin/benchmarks/Span2ConverterBenchmarks.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@
3333
import zipkin.BinaryAnnotation;
3434
import zipkin.Constants;
3535
import zipkin.Endpoint;
36-
import zipkin.Span;
3736
import zipkin.TraceKeys;
38-
import zipkin.internal.Span2;
39-
import zipkin.internal.Span2Converter;
37+
import zipkin.internal.v2.Span;
38+
import zipkin.internal.V2SpanConverter;
4039
import zipkin.internal.Util;
4140

4241
@Measurement(iterations = 5, time = 1)
@@ -54,7 +53,7 @@ public class Span2ConverterBenchmarks {
5453
.port(9000)
5554
.build();
5655

57-
Span shared = Span.builder()
56+
zipkin.Span shared = zipkin.Span.builder()
5857
.traceIdHigh(Util.lowerHexToUnsignedLong("7180c278b62e8f6a"))
5958
.traceId(Util.lowerHexToUnsignedLong("216a2aea45d08fc9"))
6059
.parentId(Util.lowerHexToUnsignedLong("6b221d5bc9e6496c"))
@@ -76,7 +75,7 @@ public class Span2ConverterBenchmarks {
7675
.addBinaryAnnotation(BinaryAnnotation.address(Constants.SERVER_ADDR, backend))
7776
.build();
7877

79-
Span server = Span.builder()
78+
zipkin.Span server = zipkin.Span.builder()
8079
.traceIdHigh(Util.lowerHexToUnsignedLong("7180c278b62e8f6a"))
8180
.traceId(Util.lowerHexToUnsignedLong("216a2aea45d08fc9"))
8281
.parentId(Util.lowerHexToUnsignedLong("6b221d5bc9e6496c"))
@@ -89,12 +88,12 @@ public class Span2ConverterBenchmarks {
8988
.addBinaryAnnotation(BinaryAnnotation.address(Constants.CLIENT_ADDR, frontend))
9089
.build();
9190

92-
Span2 server2 = Span2.builder()
91+
Span server2 = Span.builder()
9392
.traceId("7180c278b62e8f6a216a2aea45d08fc9")
9493
.parentId("6b221d5bc9e6496c")
9594
.id("5b4185666d50f68b")
9695
.name("get")
97-
.kind(Span2.Kind.SERVER)
96+
.kind(Span.Kind.SERVER)
9897
.shared(true)
9998
.localEndpoint(backend)
10099
.remoteEndpoint(frontend)
@@ -104,16 +103,16 @@ public class Span2ConverterBenchmarks {
104103
.putTag("srv/finagle.version", "6.44.0")
105104
.build();
106105

107-
@Benchmark public List<Span2> fromSpan_splitShared() {
108-
return Span2Converter.fromSpan(shared);
106+
@Benchmark public List<Span> fromSpan_splitShared() {
107+
return V2SpanConverter.fromSpan(shared);
109108
}
110109

111-
@Benchmark public List<Span2> fromSpan() {
112-
return Span2Converter.fromSpan(server);
110+
@Benchmark public List<Span> fromSpan() {
111+
return V2SpanConverter.fromSpan(server);
113112
}
114113

115-
@Benchmark public Span toSpan() {
116-
return Span2Converter.toSpan(server2);
114+
@Benchmark public zipkin.Span toSpan() {
115+
return V2SpanConverter.toSpan(server2);
117116
}
118117

119118
// Convenience main entry-point

‎benchmarks/src/main/java/zipkin/benchmarks/SpanBenchmarks.java

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@
3232
import zipkin.BinaryAnnotation;
3333
import zipkin.Constants;
3434
import zipkin.Endpoint;
35-
import zipkin.Span;
3635
import zipkin.TraceKeys;
37-
import zipkin.internal.Span2;
36+
import zipkin.internal.v2.Span;
3837
import zipkin.internal.Util;
3938

4039
@Measurement(iterations = 5, time = 1)
@@ -50,17 +49,17 @@ public class SpanBenchmarks {
5049
static final Endpoint app =
5150
Endpoint.builder().serviceName("app").ipv4(172 << 24 | 17 << 16 | 2).port(8080).build();
5251

53-
final Span.Builder sharedBuilder;
54-
final Span2.Builder shared2Builder;
52+
final zipkin.Span.Builder sharedBuilder;
53+
final Span.Builder shared2Builder;
5554

5655
public SpanBenchmarks() {
57-
sharedBuilder = buildClientOnlySpan(Span.builder()).toBuilder();
56+
sharedBuilder = buildClientOnlySpan(zipkin.Span.builder()).toBuilder();
5857
shared2Builder = buildClientOnlySpan2().toBuilder();
5958
}
6059

6160
@Benchmark
62-
public Span buildLocalSpan() {
63-
return Span.builder()
61+
public zipkin.Span buildLocalSpan() {
62+
return zipkin.Span.builder()
6463
.traceId(1L)
6564
.id(1L)
6665
.name("work")
@@ -80,11 +79,11 @@ public Span buildLocalSpan() {
8079
.build();
8180

8281
@Benchmark
83-
public Span buildClientOnlySpan() {
84-
return buildClientOnlySpan(Span.builder());
82+
public zipkin.Span buildClientOnlySpan() {
83+
return buildClientOnlySpan(zipkin.Span.builder());
8584
}
8685

87-
static Span buildClientOnlySpan(Span.Builder builder) {
86+
static zipkin.Span buildClientOnlySpan(zipkin.Span.Builder builder) {
8887
return builder
8988
.traceId(traceId)
9089
.parentId(traceId)
@@ -103,22 +102,22 @@ static Span buildClientOnlySpan(Span.Builder builder) {
103102
}
104103

105104
@Benchmark
106-
public Span buildClientOnlySpan_clear() {
105+
public zipkin.Span buildClientOnlySpan_clear() {
107106
return buildClientOnlySpan(sharedBuilder.clear());
108107
}
109108

110109
@Benchmark
111-
public Span2 buildClientOnlySpan2() {
112-
return buildClientOnlySpan2(Span2.builder());
110+
public Span buildClientOnlySpan2() {
111+
return buildClientOnlySpan2(Span.builder());
113112
}
114113

115-
static Span2 buildClientOnlySpan2(Span2.Builder builder) {
114+
static Span buildClientOnlySpan2(Span.Builder builder) {
116115
return builder
117116
.traceId(traceId)
118117
.parentId(traceId)
119118
.id(spanId)
120119
.name("get")
121-
.kind(Span2.Kind.CLIENT)
120+
.kind(Span.Kind.CLIENT)
122121
.localEndpoint(frontend)
123122
.remoteEndpoint(backend)
124123
.timestamp(1472470996199000L)
@@ -131,18 +130,18 @@ static Span2 buildClientOnlySpan2(Span2.Builder builder) {
131130
}
132131

133132
@Benchmark
134-
public Span2 buildClientOnlySpan2_clear() {
133+
public Span buildClientOnlySpan2_clear() {
135134
return buildClientOnlySpan2(shared2Builder.clear());
136135
}
137136

138137
@Benchmark
139-
public Span2 buildClientOnlySpan2_clone() {
138+
public Span buildClientOnlySpan2_clone() {
140139
return shared2Builder.clone().build();
141140
}
142141

143142
@Benchmark
144-
public Span buildRpcSpan() {
145-
return Span.builder() // web calls app
143+
public zipkin.Span buildRpcSpan() {
144+
return zipkin.Span.builder() // web calls app
146145
.traceId(1L)
147146
.id(2L)
148147
.parentId(1L)

‎zipkin-collector/kafka/src/test/java/zipkin/collector/kafka/KafkaCollectorTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import zipkin.collector.InMemoryCollectorMetrics;
3232
import zipkin.collector.kafka.KafkaCollector.Builder;
3333
import zipkin.internal.ApplyTimestampAndDuration;
34-
import zipkin.internal.Span2Converter;
34+
import zipkin.internal.V2SpanConverter;
3535
import zipkin.internal.v2.codec.MessageEncoder;
3636
import zipkin.internal.v2.codec.Encoder;
3737
import zipkin.storage.AsyncSpanConsumer;
@@ -148,8 +148,8 @@ public void messageWithMultipleSpans_json2() throws Exception {
148148
);
149149

150150
byte[] message = MessageEncoder.JSON_BYTES.encode(asList(
151-
Encoder.JSON.encode(Span2Converter.fromSpan(spans.get(0)).get(0)),
152-
Encoder.JSON.encode(Span2Converter.fromSpan(spans.get(1)).get(0))
151+
Encoder.JSON.encode(V2SpanConverter.fromSpan(spans.get(0)).get(0)),
152+
Encoder.JSON.encode(V2SpanConverter.fromSpan(spans.get(1)).get(0))
153153
));
154154

155155
producer.send(new KeyedMessage<>(builder.topic, message));

‎zipkin-collector/kafka10/src/test/java/zipkin/collector/kafka10/KafkaCollectorTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import zipkin.collector.InMemoryCollectorMetrics;
3939
import zipkin.collector.kafka10.KafkaCollector.Builder;
4040
import zipkin.internal.ApplyTimestampAndDuration;
41-
import zipkin.internal.Span2Converter;
41+
import zipkin.internal.V2SpanConverter;
4242
import zipkin.internal.v2.codec.MessageEncoder;
4343
import zipkin.internal.v2.codec.Encoder;
4444
import zipkin.storage.AsyncSpanConsumer;
@@ -202,8 +202,8 @@ public void messageWithMultipleSpans_json2() throws Exception {
202202
);
203203

204204
byte[] message = MessageEncoder.JSON_BYTES.encode(asList(
205-
Encoder.JSON.encode(Span2Converter.fromSpan(spans.get(0)).get(0)),
206-
Encoder.JSON.encode(Span2Converter.fromSpan(spans.get(1)).get(0))
205+
Encoder.JSON.encode(V2SpanConverter.fromSpan(spans.get(0)).get(0)),
206+
Encoder.JSON.encode(V2SpanConverter.fromSpan(spans.get(1)).get(0))
207207
));
208208

209209
produceSpans(message, builder.topic);

‎zipkin-junit/src/main/java/zipkin/junit/ZipkinDispatcher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import zipkin.SpanDecoder;
2929
import zipkin.collector.Collector;
3030
import zipkin.collector.CollectorMetrics;
31-
import zipkin.internal.Span2JsonSpanDecoder;
31+
import zipkin.internal.V2JsonSpanDecoder;
3232
import zipkin.storage.Callback;
3333
import zipkin.storage.QueryRequest;
3434
import zipkin.storage.SpanStore;
@@ -37,7 +37,7 @@
3737
import static zipkin.internal.Util.lowerHexToUnsignedLong;
3838

3939
final class ZipkinDispatcher extends Dispatcher {
40-
static final SpanDecoder JSON2_DECODER = new Span2JsonSpanDecoder();
40+
static final SpanDecoder JSON2_DECODER = new V2JsonSpanDecoder();
4141

4242
private final SpanStore store;
4343
private final Collector consumer;

0 commit comments

Comments
 (0)