From 3b2c3972e44cc7ff473ef348d562f91942d2342f Mon Sep 17 00:00:00 2001 From: Vihas Makwana Date: Tue, 28 Jan 2025 23:43:10 +0530 Subject: [PATCH] lint --- pkg/stanza/fileconsumer/internal/tracker/tracker.go | 13 ++++++------- .../fileconsumer/internal/tracker/tracker_test.go | 8 +++----- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pkg/stanza/fileconsumer/internal/tracker/tracker.go b/pkg/stanza/fileconsumer/internal/tracker/tracker.go index 3df7697d8716..c7e6e897f0e3 100644 --- a/pkg/stanza/fileconsumer/internal/tracker/tracker.go +++ b/pkg/stanza/fileconsumer/internal/tracker/tracker.go @@ -7,7 +7,6 @@ import ( "bytes" "context" "encoding/json" - "errors" "fmt" "go.opentelemetry.io/collector/component" @@ -21,6 +20,11 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" ) +const ( + archiveIndexKey = "knownFilesArchiveIndex" + archivePollsToArchiveKey = "knonwFilesPollsToArchive" +) + // Interface for tracking files that are being consumed. type Tracker interface { Add(reader *reader.Reader) @@ -56,11 +60,6 @@ type fileTracker struct { archiveIndex int } -var errInvalidValue = errors.New("invalid value") - -var archiveIndexKey = "knownFilesArchiveIndex" -var archivePollsToArchiveKey = "knonwFilesPollsToArchive" - func NewFileTracker(ctx context.Context, set component.TelemetrySettings, maxBatchFiles int, pollsToArchive int, persister operator.Persister) Tracker { knownFiles := make([]*fileset.Fileset[*reader.Metadata], 3) for i := 0; i < len(knownFiles); i++ { @@ -196,7 +195,7 @@ func (t *fileTracker) restoreArchiveIndex(ctx context.Context) { } func (t *fileTracker) rewriteArchive(ctx context.Context, previousPollsToArchive int) { - // Function to swap data between two indices + // helper to rewrite data from oldIndex to newIndex rewrite := func(newIdx, oldIdex int) error { oldVal, err := t.persister.Get(ctx, archiveKey(oldIdex)) if err != nil { diff --git a/pkg/stanza/fileconsumer/internal/tracker/tracker_test.go b/pkg/stanza/fileconsumer/internal/tracker/tracker_test.go index 7362bfbc3fc0..96329055e588 100644 --- a/pkg/stanza/fileconsumer/internal/tracker/tracker_test.go +++ b/pkg/stanza/fileconsumer/internal/tracker/tracker_test.go @@ -93,7 +93,6 @@ func testArchiveRestoration(t *testing.T, pollsToArchive int, newPollsToArchive // 1.25 means archive is 125% filled (i.e it was rolled over once) pctFilled := []float32{0.25, 0.5, 0.75, 1, 1.25, 1.50, 1.75, 2.00} for _, pct := range pctFilled { - persister := testutil.NewUnscopedMockPersister() tracker := NewFileTracker(context.Background(), componenttest.NewNopTelemetrySettings(), 0, pollsToArchive, persister).(*fileTracker) iterations := int(pct * float32(pollsToArchive)) @@ -119,7 +118,7 @@ func testArchiveRestoration(t *testing.T, pollsToArchive int, newPollsToArchive val, err := persister.Get(context.Background(), archiveKey(i)) require.NoError(t, err) if val != nil { - count += 1 + count++ } } require.Equal(t, min(iterations, pollsToArchive), count) @@ -138,8 +137,8 @@ func testArchiveRestoration(t *testing.T, pollsToArchive int, newPollsToArchive foundIteration := int(element.Offset) require.Equal(t, mostRecentIteration, foundIteration) } - mostRecentIteration -= 1 - startIdx -= 1 + mostRecentIteration-- + startIdx-- } // make sure we've removed all extra keys @@ -150,7 +149,6 @@ func testArchiveRestoration(t *testing.T, pollsToArchive int, newPollsToArchive } } } - } func populatedPersisterData(persister operator.Persister, fps []*fingerprint.Fingerprint) []bool {