Skip to content

Commit 079f9c1

Browse files
author
Aleksey Grachev
committed
issue-826: use different struct for logging
1 parent 8301486 commit 079f9c1

File tree

3 files changed

+32
-19
lines changed

3 files changed

+32
-19
lines changed

internal/topic/topicreaderinternal/commit_range.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,11 @@ func (r *CommitRanges) len() int {
2424
return len(r.ranges)
2525
}
2626

27-
// GetCommitedInfo implements trace.TopicReaderStreamSendCommitMessageStartMessageInfo
28-
func (r *CommitRanges) GetCommitedInfo() []trace.TopicReaderCommitStartInfo {
29-
res := make([]trace.TopicReaderCommitStartInfo, len(r.ranges))
27+
// GetCommitsInfo implements trace.TopicReaderStreamSendCommitMessageStartMessageInfo
28+
func (r *CommitRanges) GetCommitsInfo() []trace.TopicReaderStreamCommitInfo {
29+
res := make([]trace.TopicReaderStreamCommitInfo, len(r.ranges))
3030
for i := range res {
31-
res[i] = trace.TopicReaderCommitStartInfo{
32-
RequestContext: r.ranges[i].partitionSession.ctx,
31+
res[i] = trace.TopicReaderStreamCommitInfo{
3332
Topic: r.ranges[i].partitionSession.Topic,
3433
PartitionID: r.ranges[i].partitionSession.PartitionID,
3534
PartitionSessionID: r.ranges[i].partitionSession.partitionSessionID.ToInt64(),

log/topic.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -163,24 +163,24 @@ func internalTopic(l *wrapper, d trace.Detailer) (t trace.Topic) { //nolint:gocy
163163
ctx := with(context.Background(), TRACE, "ydb", "topic", "reader", "send", "commit", "message")
164164
start := time.Now()
165165

166-
commitedInfo := info.CommitsInfo.GetCommitedInfo()
167-
for i := range commitedInfo {
166+
commitInfo := info.CommitsInfo.GetCommitsInfo()
167+
for i := range commitInfo {
168168
l.Log(ctx, "start",
169-
String("topic", commitedInfo[i].Topic),
170-
Int64("partitions_id", commitedInfo[i].PartitionID),
171-
Int64("partitions_session_id", commitedInfo[i].PartitionSessionID),
172-
Int64("commit_start_offset", commitedInfo[i].StartOffset),
173-
Int64("commit_end_offset", commitedInfo[i].EndOffset),
169+
String("topic", commitInfo[i].Topic),
170+
Int64("partitions_id", commitInfo[i].PartitionID),
171+
Int64("partitions_session_id", commitInfo[i].PartitionSessionID),
172+
Int64("commit_start_offset", commitInfo[i].StartOffset),
173+
Int64("commit_end_offset", commitInfo[i].EndOffset),
174174
)
175175
}
176176
return func(doneInfo trace.TopicReaderSendCommitMessageDoneInfo) {
177-
for i := range commitedInfo {
177+
for i := range commitInfo {
178178
fields := []Field{
179-
String("topic", commitedInfo[i].Topic),
180-
Int64("partitions_id", commitedInfo[i].PartitionID),
181-
Int64("partitions_session_id", commitedInfo[i].PartitionSessionID),
182-
Int64("commit_start_offset", commitedInfo[i].StartOffset),
183-
Int64("commit_end_offset", commitedInfo[i].EndOffset),
179+
String("topic", commitInfo[i].Topic),
180+
Int64("partitions_id", commitInfo[i].PartitionID),
181+
Int64("partitions_session_id", commitInfo[i].PartitionSessionID),
182+
Int64("commit_start_offset", commitInfo[i].StartOffset),
183+
Int64("commit_end_offset", commitInfo[i].EndOffset),
184184
latencyField(start),
185185
}
186186
if doneInfo.Error == nil {

trace/topic.go

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,28 @@ type (
137137
CommitsInfo TopicReaderStreamSendCommitMessageStartMessageInfo
138138
}
139139

140+
// TopicReaderStreamCommitInfo
141+
//
142+
// Experimental
143+
//
144+
// Notice: This API is EXPERIMENTAL and may be changed or removed in a
145+
// later release.
146+
TopicReaderStreamCommitInfo struct {
147+
Topic string
148+
PartitionID int64
149+
PartitionSessionID int64
150+
StartOffset int64
151+
EndOffset int64
152+
}
153+
140154
// TopicReaderStreamSendCommitMessageStartMessageInfo
141155
//
142156
// Experimental
143157
//
144158
// Notice: This API is EXPERIMENTAL and may be changed or removed in a
145159
// later release.
146160
TopicReaderStreamSendCommitMessageStartMessageInfo interface {
147-
GetCommitedInfo() []TopicReaderCommitStartInfo
161+
GetCommitsInfo() []TopicReaderStreamCommitInfo
148162
}
149163

150164
// TopicReaderSendCommitMessageDoneInfo

0 commit comments

Comments
 (0)