Skip to content

Commit 2011f89

Browse files
committed
Try make the linter happy
1 parent bee7f25 commit 2011f89

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

exporter/exporterhelper/internal/queuebatch/partition_batcher.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ func (qb *partitionBatcher) Consume(ctx context.Context, req request.Request, do
151151
qb.currentBatch.req = reqList[0]
152152
qb.currentBatch.done = append(qb.currentBatch.done, done)
153153

154-
mergedCtx := context.Background()
154+
mergedCtx := context.Background() //nolint:contextcheck
155155
if qb.mergeCtx != nil {
156156
mergedCtx = qb.mergeCtx(qb.currentBatch.ctx, ctx)
157157
}
@@ -185,7 +185,7 @@ func (qb *partitionBatcher) Consume(ctx context.Context, req request.Request, do
185185

186186
qb.currentBatchMu.Unlock()
187187
if firstBatch != nil {
188-
qb.flush(firstBatch.ctx, firstBatch.req, firstBatch.done) //nolint:contextcheck //context already handled
188+
qb.flush(firstBatch.ctx, firstBatch.req, firstBatch.done)
189189
}
190190
for i := 0; i < len(reqList); i++ {
191191
qb.flush(ctx, reqList[i], done)

exporter/exporterhelper/internal/queuebatch/partition_batcher_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -521,17 +521,17 @@ func TestShardBatcher_EmptyRequestList(t *testing.T) {
521521
func TestPartitionBatcher_ContextMerging(t *testing.T) {
522522
tests := []struct {
523523
name string
524-
mergeCtxFunc func(ctx1 context.Context, ctx2 context.Context) context.Context
524+
mergeCtxFunc func(ctx1, ctx2 context.Context) context.Context
525525
}{
526526
{
527527
name: "merge_context_with_timestamp",
528-
mergeCtxFunc: func(ctx1 context.Context, _ context.Context) context.Context {
528+
mergeCtxFunc: func(ctx1, _ context.Context) context.Context {
529529
return context.WithValue(ctx1, timestampKey, 1234)
530530
},
531531
},
532532
{
533533
name: "merge_context_returns_background",
534-
mergeCtxFunc: func(context.Context, context.Context) context.Context {
534+
mergeCtxFunc: func(_, _ context.Context) context.Context {
535535
return context.Background()
536536
},
537537
},

0 commit comments

Comments
 (0)