Skip to content

Commit 2a8dc5a

Browse files
committed
remove isValidValue() function
Signed-off-by: drumato <[email protected]>
1 parent a9919f1 commit 2a8dc5a

File tree

2 files changed

+21
-22
lines changed

2 files changed

+21
-22
lines changed

src/api/trace.zig

+2-10
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ pub const TraceID = struct {
1616
}
1717

1818
pub fn isValid(self: Self) bool {
19-
return Self.isValidValue(self.value);
20-
}
21-
22-
pub fn isValidValue(value: [16]u8) bool {
23-
for (value) |item| {
19+
for (self.value) |item| {
2420
if (item != 0) {
2521
return true;
2622
}
@@ -42,11 +38,7 @@ pub const SpanID = struct {
4238
}
4339

4440
pub fn isValid(self: Self) bool {
45-
return Self.isValidValue(self.value);
46-
}
47-
48-
pub fn isValidValue(value: [8]u8) bool {
49-
for (value) |item| {
41+
for (self.value) |item| {
5042
if (item != 0) {
5143
return true;
5244
}

src/sdk/trace/id_generator.zig

+19-12
Original file line numberDiff line numberDiff line change
@@ -54,42 +54,49 @@ pub const RandomIDGenerator = struct {
5454
pub fn newIDs(ctx: *anyopaque) TraceSpanID {
5555
const self: *Self = @ptrCast(@alignCast(ctx));
5656

57-
var raw_trace_id: [16]u8 = undefined;
57+
var trace_span_id = TraceSpanID{
58+
.trace_id = trace.TraceID.init(undefined),
59+
.span_id = trace.SpanID.init(undefined),
60+
};
5861
while (true) {
62+
var raw_trace_id: [16]u8 = undefined;
5963
self.random.bytes(raw_trace_id[0..raw_trace_id.len]);
6064

61-
if (trace.TraceID.isValidValue(raw_trace_id)) {
65+
const trace_id = trace.TraceID.init(raw_trace_id);
66+
if (trace_id.isValid()) {
67+
trace_span_id.trace_id = trace_id;
6268
break;
6369
}
6470
}
65-
var raw_span_id: [8]u8 = undefined;
71+
6672
while (true) {
73+
var raw_span_id: [8]u8 = undefined;
6774
self.random.bytes(raw_span_id[0..raw_span_id.len]);
6875

69-
if (trace.SpanID.isValidValue(raw_span_id)) {
76+
const span_id = trace.SpanID.init(raw_span_id);
77+
if (span_id.isValid()) {
78+
trace_span_id.span_id = span_id;
7079
break;
7180
}
7281
}
7382

74-
return .{
75-
.trace_id = trace.TraceID.init(raw_trace_id),
76-
.span_id = trace.SpanID.init(raw_span_id),
77-
};
83+
return trace_span_id;
7884
}
7985

8086
pub fn newSpanID(ctx: *anyopaque, _: trace.TraceID) trace.SpanID {
8187
const self: *Self = @ptrCast(@alignCast(ctx));
8288

83-
var raw_span_id: [8]u8 = undefined;
8489
while (true) {
90+
var raw_span_id: [8]u8 = undefined;
8591
self.random.bytes(raw_span_id[0..raw_span_id.len]);
92+
const span_id = trace.SpanID.init(raw_span_id);
8693

87-
if (trace.SpanID.isValidValue(raw_span_id)) {
88-
break;
94+
if (span_id.isValid()) {
95+
return span_id;
8996
}
9097
}
9198

92-
return trace.SpanID.init(raw_span_id);
99+
unreachable;
93100
}
94101
};
95102

0 commit comments

Comments
 (0)