Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update go-kit/kit to 0.12.0 to fix spurious debug logs #4544

Merged
merged 3 commits into from
Nov 4, 2021
Merged

Update go-kit/kit to 0.12.0 to fix spurious debug logs #4544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fdbbd9c
Update go-kit/kit to 0.12.0 to fix spurious debug logs
bboreham Nov 1, 2021
ec4a675
Pin aws-sdk to previous version
bboreham Nov 3, 2021
b2c48ec
compactor unit tests: make log messages consistent
bboreham Nov 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ require (
github.com/NYTimes/gziphandler v1.1.1
github.com/alecthomas/units v0.0.0-20210912230133-d1bdfacee922
github.com/alicebob/miniredis/v2 v2.14.3
github.com/aws/aws-sdk-go v1.40.37
github.com/aws/aws-sdk-go v1.40.45
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
github.com/cespare/xxhash v1.1.0
github.com/dustin/go-humanize v1.0.0
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb
github.com/felixge/fgprof v0.9.1
github.com/fsouza/fake-gcs-server v1.7.0
github.com/go-kit/log v0.1.0
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-kit/log v0.2.0
github.com/go-openapi/strfmt v0.20.2
github.com/go-openapi/swag v0.19.15
github.com/go-redis/redis/v8 v8.11.4
Expand All @@ -30,7 +31,7 @@ require (
github.com/golang/snappy v0.0.4
github.com/gorilla/mux v1.8.0
github.com/grafana/dskit v0.0.0-20211021180445-3bd016e9d7f1
github.com/json-iterator/go v1.1.11
github.com/json-iterator/go v1.1.12
github.com/lib/pq v1.3.0
github.com/minio/minio-go/v7 v7.0.10
github.com/mitchellh/go-wordwrap v1.0.0
Expand All @@ -54,7 +55,7 @@ require (
github.com/weaveworks/common v0.0.0-20210913144402-035033b78a78
go.etcd.io/bbolt v1.3.6
go.uber.org/atomic v1.9.0
golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
golang.org/x/net v0.0.0-20210917221730-978cfadd31cf
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
google.golang.org/api v0.56.0
Expand Down Expand Up @@ -85,3 +86,7 @@ replace google.golang.org/grpc => google.golang.org/grpc v1.38.0
// confused about which version is the latest one. v0.22.0 was released in July, but latest tag reachable from main
// is v0.19.1. We pin version from late september here. Feel free to remove when updating to later version.
replace github.com/thanos-io/thanos v0.22.0 => github.com/thanos-io/thanos v0.19.1-0.20210923155558-c15594a03c45

// Pin aws-sdk to version prior to go-kit update, to reduce the bulk of change.
// Un-pin once Cortex 1.11 is released.
replace github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.40.37
107 changes: 61 additions & 46 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions pkg/compactor/compactor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,16 +510,16 @@ func TestCompactor_ShouldIterateOverUsersAndRunCompaction(t *testing.T) {
`level=info component=compactor msg="discovering users from bucket"`,
`level=info component=compactor msg="discovered users from bucket" users=2`,
`level=info component=compactor msg="starting compaction of user blocks" user=user-1`,
`component=compactor org_id=user-1 level=info msg="start sync of metas"`,
`component=compactor org_id=user-1 level=info msg="start of GC"`,
`component=compactor org_id=user-1 level=info msg="start of compactions"`,
`component=compactor org_id=user-1 level=info msg="compaction iterations done"`,
`level=info component=compactor org_id=user-1 msg="start sync of metas"`,
`level=info component=compactor org_id=user-1 msg="start of GC"`,
`level=info component=compactor org_id=user-1 msg="start of compactions"`,
`level=info component=compactor org_id=user-1 msg="compaction iterations done"`,
`level=info component=compactor msg="successfully compacted user blocks" user=user-1`,
`level=info component=compactor msg="starting compaction of user blocks" user=user-2`,
`component=compactor org_id=user-2 level=info msg="start sync of metas"`,
`component=compactor org_id=user-2 level=info msg="start of GC"`,
`component=compactor org_id=user-2 level=info msg="start of compactions"`,
`component=compactor org_id=user-2 level=info msg="compaction iterations done"`,
`level=info component=compactor org_id=user-2 msg="start sync of metas"`,
`level=info component=compactor org_id=user-2 msg="start of GC"`,
`level=info component=compactor org_id=user-2 msg="start of compactions"`,
`level=info component=compactor org_id=user-2 msg="compaction iterations done"`,
`level=info component=compactor msg="successfully compacted user blocks" user=user-2`,
}, removeIgnoredLogs(strings.Split(strings.TrimSpace(logs.String()), "\n")))

Expand Down Expand Up @@ -626,18 +626,18 @@ func TestCompactor_ShouldNotCompactBlocksMarkedForDeletion(t *testing.T) {
assert.ElementsMatch(t, []string{
`level=info component=cleaner msg="started blocks cleanup and maintenance"`,
`level=info component=cleaner org_id=user-1 msg="started blocks cleanup and maintenance"`,
`component=cleaner org_id=user-1 level=debug msg="deleted file" file=01DTW0ZCPDDNV4BV83Q2SV4QAZ/meta.json bucket=mock`,
`component=cleaner org_id=user-1 level=debug msg="deleted file" file=01DTW0ZCPDDNV4BV83Q2SV4QAZ/deletion-mark.json bucket=mock`,
`level=debug component=cleaner org_id=user-1 msg="deleted file" file=01DTW0ZCPDDNV4BV83Q2SV4QAZ/meta.json bucket=mock`,
`level=debug component=cleaner org_id=user-1 msg="deleted file" file=01DTW0ZCPDDNV4BV83Q2SV4QAZ/deletion-mark.json bucket=mock`,
`level=info component=cleaner org_id=user-1 msg="deleted block marked for deletion" block=01DTW0ZCPDDNV4BV83Q2SV4QAZ`,
`level=info component=cleaner org_id=user-1 msg="completed blocks cleanup and maintenance"`,
`level=info component=cleaner msg="successfully completed blocks cleanup and maintenance"`,
`level=info component=compactor msg="discovering users from bucket"`,
`level=info component=compactor msg="discovered users from bucket" users=1`,
`level=info component=compactor msg="starting compaction of user blocks" user=user-1`,
`component=compactor org_id=user-1 level=info msg="start sync of metas"`,
`component=compactor org_id=user-1 level=info msg="start of GC"`,
`component=compactor org_id=user-1 level=info msg="start of compactions"`,
`component=compactor org_id=user-1 level=info msg="compaction iterations done"`,
`level=info component=compactor org_id=user-1 msg="start sync of metas"`,
`level=info component=compactor org_id=user-1 msg="start of GC"`,
`level=info component=compactor org_id=user-1 msg="start of compactions"`,
`level=info component=compactor org_id=user-1 msg="compaction iterations done"`,
`level=info component=compactor msg="successfully compacted user blocks" user=user-1`,
}, removeIgnoredLogs(strings.Split(strings.TrimSpace(logs.String()), "\n")))

Expand Down Expand Up @@ -734,8 +734,8 @@ func TestCompactor_ShouldNotCompactBlocksForUsersMarkedForDeletion(t *testing.T)
assert.ElementsMatch(t, []string{
`level=info component=cleaner msg="started blocks cleanup and maintenance"`,
`level=info component=cleaner org_id=user-1 msg="deleting blocks for tenant marked for deletion"`,
`component=cleaner org_id=user-1 level=debug msg="deleted file" file=01DTVP434PA9VFXSW2JKB3392D/meta.json bucket=mock`,
`component=cleaner org_id=user-1 level=debug msg="deleted file" file=01DTVP434PA9VFXSW2JKB3392D/index bucket=mock`,
`level=debug component=cleaner org_id=user-1 msg="deleted file" file=01DTVP434PA9VFXSW2JKB3392D/meta.json bucket=mock`,
`level=debug component=cleaner org_id=user-1 msg="deleted file" file=01DTVP434PA9VFXSW2JKB3392D/index bucket=mock`,
`level=info component=cleaner org_id=user-1 msg="deleted block" block=01DTVP434PA9VFXSW2JKB3392D`,
`level=info component=cleaner org_id=user-1 msg="deleted blocks for tenant marked for deletion" deletedBlocks=1`,
`level=info component=cleaner org_id=user-1 msg="updating finished time in tenant deletion mark"`,
Expand Down Expand Up @@ -855,16 +855,16 @@ func TestCompactor_ShouldCompactAllUsersOnShardingEnabledButOnlyOneInstanceRunni
`level=info component=compactor msg="discovering users from bucket"`,
`level=info component=compactor msg="discovered users from bucket" users=2`,
`level=info component=compactor msg="starting compaction of user blocks" user=user-1`,
`component=compactor org_id=user-1 level=info msg="start sync of metas"`,
`component=compactor org_id=user-1 level=info msg="start of GC"`,
`component=compactor org_id=user-1 level=info msg="start of compactions"`,
`component=compactor org_id=user-1 level=info msg="compaction iterations done"`,
`level=info component=compactor org_id=user-1 msg="start sync of metas"`,
`level=info component=compactor org_id=user-1 msg="start of GC"`,
`level=info component=compactor org_id=user-1 msg="start of compactions"`,
`level=info component=compactor org_id=user-1 msg="compaction iterations done"`,
`level=info component=compactor msg="successfully compacted user blocks" user=user-1`,
`level=info component=compactor msg="starting compaction of user blocks" user=user-2`,
`component=compactor org_id=user-2 level=info msg="start sync of metas"`,
`component=compactor org_id=user-2 level=info msg="start of GC"`,
`component=compactor org_id=user-2 level=info msg="start of compactions"`,
`component=compactor org_id=user-2 level=info msg="compaction iterations done"`,
`level=info component=compactor org_id=user-2 msg="start sync of metas"`,
`level=info component=compactor org_id=user-2 msg="start of GC"`,
`level=info component=compactor org_id=user-2 msg="start of compactions"`,
`level=info component=compactor org_id=user-2 msg="compaction iterations done"`,
`level=info component=compactor msg="successfully compacted user blocks" user=user-2`,
}, removeIgnoredLogs(strings.Split(strings.TrimSpace(logs.String()), "\n")))
}
Expand Down
44 changes: 24 additions & 20 deletions vendor/github.com/armon/go-metrics/inmem.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 32 additions & 1 deletion vendor/github.com/armon/go-metrics/inmem_endpoint.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 16 additions & 18 deletions vendor/github.com/armon/go-metrics/prometheus/prometheus.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading