From 90ed95d7c7be88d789d8c78be6078ab98889cafe Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 5 Apr 2022 17:44:56 +0300 Subject: [PATCH] log.WithUserID: log user ID in `user` label instead of `org_id` Signed-off-by: Dimitar Dimitrov --- CHANGELOG.md | 2 + .../dashboards/mimir-slow-queries.json | 6 +- .../dashboards/slow-queries.libsonnet | 4 +- pkg/compactor/compactor_test.go | 98 +++++++++---------- pkg/util/log/wrappers.go | 2 +- 5 files changed, 57 insertions(+), 55 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48c06c9a538..2db9c2a67fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ * [CHANGE] Query-frontend: results cache keys are now versioned, this will cause cache to be re-filled when rolling out this version. #1631 * [CHANGE] Store-gateway: enabled attributes in-memory cache by default. New default configuration is `-blocks-storage.bucket-store.chunks-cache.attributes-in-memory-max-items=50000`. #1727 * [CHANGE] Compactor: Removed the metric `cortex_compactor_garbage_collected_blocks_total` since it duplicates `cortex_compactor_blocks_marked_for_deletion_total`. #1728 +* [CHANGE] All: Logs that used the`org_id` label now use `user` label. #1634 * [FEATURE] Ruler: Allow setting `evaluation_delay` for each rule group via rules group configuration file. #1474 * [FEATURE] Ruler: Added support for expression remote evaluation. #1536 * The following CLI flags (and their respective YAML config options) have been added: @@ -50,6 +51,7 @@ * [CHANGE] Dashboards: Remove per-user series legends from Tenants dashboard. #1605 * [CHANGE] Dashboards: Show in-memory series and the per-user series limit on Tenants dashboard. #1613 +* [CHANGE] Dashboards: Slow-queries dashboard now uses `user` label from logs instead of `org_id`. #1634 * [FEATURE] Alerts: added the following alerts on `mimir-continuous-test` tool: #1676 - `MimirContinuousTestNotRunningOnWrites` - `MimirContinuousTestNotRunningOnReads` diff --git a/operations/mimir-mixin-compiled/dashboards/mimir-slow-queries.json b/operations/mimir-mixin-compiled/dashboards/mimir-slow-queries.json index 3ec7bf49386..9581418d094 100644 --- a/operations/mimir-mixin-compiled/dashboards/mimir-slow-queries.json +++ b/operations/mimir-mixin-compiled/dashboards/mimir-slow-queries.json @@ -73,7 +73,7 @@ "span": 12, "targets": [ { - "expr": "{cluster=~\"$cluster\",namespace=~\"$namespace\",name=~\"query-frontend.*\"} |= \"query stats\" != \"/api/v1/read\" | logfmt | org_id=~\"${tenant_id}\" | response_time > ${min_duration}", + "expr": "{cluster=~\"$cluster\",namespace=~\"$namespace\",name=~\"query-frontend.*\"} |= \"query stats\" != \"/api/v1/read\" | logfmt | user=~\"${tenant_id}\" | response_time > ${min_duration}", "instant": false, "legendFormat": "", "range": true, @@ -132,11 +132,11 @@ }, "indexByName": { "Time range": 3, - "org_id": 1, "param_query": 2, "param_step": 4, "response_time": 5, - "ts": 0 + "ts": 0, + "user": 1 }, "renameByName": { "org_id": "Tenant ID", diff --git a/operations/mimir-mixin/dashboards/slow-queries.libsonnet b/operations/mimir-mixin/dashboards/slow-queries.libsonnet index f11cdd8f4d0..3bdeb7a096f 100644 --- a/operations/mimir-mixin/dashboards/slow-queries.libsonnet +++ b/operations/mimir-mixin/dashboards/slow-queries.libsonnet @@ -16,7 +16,7 @@ local utils = import 'mixin-utils/utils.libsonnet'; targets: [ { // Filter out the remote read endpoint. - expr: '{%s=~"$cluster",namespace=~"$namespace",name=~"query-frontend.*"} |= "query stats" != "/api/v1/read" | logfmt | org_id=~"${tenant_id}" | response_time > ${min_duration}' % $._config.per_cluster_label, + expr: '{%s=~"$cluster",namespace=~"$namespace",name=~"query-frontend.*"} |= "query stats" != "/api/v1/read" | logfmt | user=~"${tenant_id}" | response_time > ${min_duration}' % $._config.per_cluster_label, instant: false, legendFormat: '', range: true, @@ -59,7 +59,7 @@ local utils = import 'mixin-utils/utils.libsonnet'; }, // Order fields. - local orderedFields = ['ts', 'org_id', 'param_query', 'Time range', 'param_step', 'response_time'], + local orderedFields = ['ts', 'user', 'param_query', 'Time range', 'param_step', 'response_time'], indexByName: { [orderedFields[i]]: i diff --git a/pkg/compactor/compactor_test.go b/pkg/compactor/compactor_test.go index 85829e6eefd..d46da33f813 100644 --- a/pkg/compactor/compactor_test.go +++ b/pkg/compactor/compactor_test.go @@ -533,20 +533,20 @@ func TestMultitenantCompactor_ShouldIterateOverUsersAndRunCompaction(t *testing. `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`, - `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=debug component=compactor org_id=user-1 msg="grouper found a compactable blocks group" groupKey=0@17241709254077376921-merge--1574776800000-1574784000000 job="stage: merge, range start: 1574776800000, range end: 1574784000000, shard: , blocks: 01DTVP434PA9VFXSW2JKB3392D (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC),01FS51A7GQ1RQWV35DBVYQM4KF (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC)"`, - `level=info component=compactor org_id=user-1 msg="start of compactions"`, - `level=info component=compactor org_id=user-1 groupKey=0@17241709254077376921-merge--1574776800000-1574784000000 msg="compaction job finished" success=true`, - `level=info component=compactor org_id=user-1 msg="compaction iterations done"`, + `level=info component=compactor user=user-1 msg="start sync of metas"`, + `level=info component=compactor user=user-1 msg="start of GC"`, + `level=debug component=compactor user=user-1 msg="grouper found a compactable blocks group" groupKey=0@17241709254077376921-merge--1574776800000-1574784000000 job="stage: merge, range start: 1574776800000, range end: 1574784000000, shard: , blocks: 01DTVP434PA9VFXSW2JKB3392D (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC),01FS51A7GQ1RQWV35DBVYQM4KF (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC)"`, + `level=info component=compactor user=user-1 msg="start of compactions"`, + `level=info component=compactor user=user-1 groupKey=0@17241709254077376921-merge--1574776800000-1574784000000 msg="compaction job finished" success=true`, + `level=info component=compactor user=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`, - `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=debug component=compactor org_id=user-2 msg="grouper found a compactable blocks group" groupKey=0@17241709254077376921-merge--1574776800000-1574784000000 job="stage: merge, range start: 1574776800000, range end: 1574784000000, shard: , blocks: 01DTW0ZCPDDNV4BV83Q2SV4QAZ (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC),01FRSF035J26D6CGX7STCSD1KG (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC)"`, - `level=info component=compactor org_id=user-2 msg="start of compactions"`, - `level=info component=compactor org_id=user-2 groupKey=0@17241709254077376921-merge--1574776800000-1574784000000 msg="compaction job finished" success=true`, - `level=info component=compactor org_id=user-2 msg="compaction iterations done"`, + `level=info component=compactor user=user-2 msg="start sync of metas"`, + `level=info component=compactor user=user-2 msg="start of GC"`, + `level=debug component=compactor user=user-2 msg="grouper found a compactable blocks group" groupKey=0@17241709254077376921-merge--1574776800000-1574784000000 job="stage: merge, range start: 1574776800000, range end: 1574784000000, shard: , blocks: 01DTW0ZCPDDNV4BV83Q2SV4QAZ (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC),01FRSF035J26D6CGX7STCSD1KG (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC)"`, + `level=info component=compactor user=user-2 msg="start of compactions"`, + `level=info component=compactor user=user-2 groupKey=0@17241709254077376921-merge--1574776800000-1574784000000 msg="compaction job finished" success=true`, + `level=info component=compactor user=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"))) @@ -671,14 +671,14 @@ func TestMultitenantCompactor_ShouldStopCompactingTenantOnReachingMaxCompactionT `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`, - `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=debug component=compactor org_id=user-1 msg="grouper found a compactable blocks group" groupKey=0@12695595599644216241-merge--1574776800000-1574784000000 job="stage: merge, range start: 1574776800000, range end: 1574784000000, shard: , blocks: 01FN3VCQV5X342W2ZKMQQXAZRX (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC),01FRQGQB7RWQ2TS0VWA82QTPXE (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC)"`, - `level=debug component=compactor org_id=user-1 msg="grouper found a compactable blocks group" groupKey=0@414047632870839233-merge--1574776800000-1574784000000 job="stage: merge, range start: 1574776800000, range end: 1574784000000, shard: , blocks: 01DTVP434PA9VFXSW2JKB3392D (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC),01FS51A7GQ1RQWV35DBVYQM4KF (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC)"`, - `level=info component=compactor org_id=user-1 msg="start of compactions"`, - `level=info component=compactor org_id=user-1 msg="max compaction time reached, no more compactions will be started"`, - `level=info component=compactor org_id=user-1 groupKey=0@12695595599644216241-merge--1574776800000-1574784000000 msg="compaction job finished" success=true`, - `level=info component=compactor org_id=user-1 msg="compaction iterations done"`, + `level=info component=compactor user=user-1 msg="start sync of metas"`, + `level=info component=compactor user=user-1 msg="start of GC"`, + `level=debug component=compactor user=user-1 msg="grouper found a compactable blocks group" groupKey=0@12695595599644216241-merge--1574776800000-1574784000000 job="stage: merge, range start: 1574776800000, range end: 1574784000000, shard: , blocks: 01FN3VCQV5X342W2ZKMQQXAZRX (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC),01FRQGQB7RWQ2TS0VWA82QTPXE (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC)"`, + `level=debug component=compactor user=user-1 msg="grouper found a compactable blocks group" groupKey=0@414047632870839233-merge--1574776800000-1574784000000 job="stage: merge, range start: 1574776800000, range end: 1574784000000, shard: , blocks: 01DTVP434PA9VFXSW2JKB3392D (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC),01FS51A7GQ1RQWV35DBVYQM4KF (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC)"`, + `level=info component=compactor user=user-1 msg="start of compactions"`, + `level=info component=compactor user=user-1 msg="max compaction time reached, no more compactions will be started"`, + `level=info component=compactor user=user-1 groupKey=0@12695595599644216241-merge--1574776800000-1574784000000 msg="compaction job finished" success=true`, + `level=info component=compactor user=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"))) } @@ -745,10 +745,10 @@ func TestMultitenantCompactor_ShouldNotCompactBlocksMarkedForDeletion(t *testing `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`, - `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 user=user-1 msg="start sync of metas"`, + `level=info component=compactor user=user-1 msg="start of GC"`, + `level=info component=compactor user=user-1 msg="start of compactions"`, + `level=info component=compactor user=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"))) @@ -844,10 +844,10 @@ func TestMultitenantCompactor_ShouldNotCompactBlocksMarkedForNoCompaction(t *tes `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`, - `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 user=user-1 msg="start sync of metas"`, + `level=info component=compactor user=user-1 msg="start of GC"`, + `level=info component=compactor user=user-1 msg="start of compactions"`, + `level=info component=compactor user=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"))) } @@ -1020,20 +1020,20 @@ func TestMultitenantCompactor_ShouldCompactAllUsersOnShardingEnabledButOnlyOneIn `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`, - `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=debug component=compactor org_id=user-1 msg="grouper found a compactable blocks group" groupKey=0@17241709254077376921-merge--1574776800000-1574784000000 job="stage: merge, range start: 1574776800000, range end: 1574784000000, shard: , blocks: 01DTVP434PA9VFXSW2JKB3392D (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC),01FSTQ95C8FS0ZAGTQS2EF1NEG (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC)"`, - `level=info component=compactor org_id=user-1 msg="start of compactions"`, - `level=info component=compactor org_id=user-1 groupKey=0@17241709254077376921-merge--1574776800000-1574784000000 msg="compaction job finished" success=true`, - `level=info component=compactor org_id=user-1 msg="compaction iterations done"`, + `level=info component=compactor user=user-1 msg="start sync of metas"`, + `level=info component=compactor user=user-1 msg="start of GC"`, + `level=debug component=compactor user=user-1 msg="grouper found a compactable blocks group" groupKey=0@17241709254077376921-merge--1574776800000-1574784000000 job="stage: merge, range start: 1574776800000, range end: 1574784000000, shard: , blocks: 01DTVP434PA9VFXSW2JKB3392D (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC),01FSTQ95C8FS0ZAGTQS2EF1NEG (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC)"`, + `level=info component=compactor user=user-1 msg="start of compactions"`, + `level=info component=compactor user=user-1 groupKey=0@17241709254077376921-merge--1574776800000-1574784000000 msg="compaction job finished" success=true`, + `level=info component=compactor user=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`, - `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=debug component=compactor org_id=user-2 msg="grouper found a compactable blocks group" groupKey=0@17241709254077376921-merge--1574776800000-1574784000000 job="stage: merge, range start: 1574776800000, range end: 1574784000000, shard: , blocks: 01DTW0ZCPDDNV4BV83Q2SV4QAZ (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC),01FSV54G6QFQH1G9QE93G3B9TB (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC)"`, - `level=info component=compactor org_id=user-2 msg="start of compactions"`, - `level=info component=compactor org_id=user-2 groupKey=0@17241709254077376921-merge--1574776800000-1574784000000 msg="compaction job finished" success=true`, - `level=info component=compactor org_id=user-2 msg="compaction iterations done"`, + `level=info component=compactor user=user-2 msg="start sync of metas"`, + `level=info component=compactor user=user-2 msg="start of GC"`, + `level=debug component=compactor user=user-2 msg="grouper found a compactable blocks group" groupKey=0@17241709254077376921-merge--1574776800000-1574784000000 job="stage: merge, range start: 1574776800000, range end: 1574784000000, shard: , blocks: 01DTW0ZCPDDNV4BV83Q2SV4QAZ (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC),01FSV54G6QFQH1G9QE93G3B9TB (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC)"`, + `level=info component=compactor user=user-2 msg="start of compactions"`, + `level=info component=compactor user=user-2 groupKey=0@17241709254077376921-merge--1574776800000-1574784000000 msg="compaction job finished" success=true`, + `level=info component=compactor user=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"))) @@ -1234,16 +1234,16 @@ func TestMultitenantCompactor_ShouldSkipCompactionForJobsNoMoreOwnedAfterPlannin `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`, - `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=debug component=compactor org_id=user-1 msg="grouper found a compactable blocks group" groupKey=0@17241709254077376921-split-4_of_4-1574776800000-1574784000000 job="stage: split, range start: 1574776800000, range end: 1574784000000, shard: 4_of_4, blocks: 01DTVP434PA9VFXSW2JK000001 (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC)"`, - `level=debug component=compactor org_id=user-1 msg="grouper found a compactable blocks group" groupKey=0@17241709254077376921-split-1_of_4-1574863200000-1574870400000 job="stage: split, range start: 1574863200000, range end: 1574870400000, shard: 1_of_4, blocks: 01DTVP434PA9VFXSW2JK000002 (min time: 2019-11-27 14:00:00 +0000 UTC, max time: 2019-11-27 16:00:00 +0000 UTC)"`, + `level=info component=compactor user=user-1 msg="start sync of metas"`, + `level=info component=compactor user=user-1 msg="start of GC"`, + `level=info component=compactor user=user-1 msg="start of compactions"`, + `level=debug component=compactor user=user-1 msg="grouper found a compactable blocks group" groupKey=0@17241709254077376921-split-4_of_4-1574776800000-1574784000000 job="stage: split, range start: 1574776800000, range end: 1574784000000, shard: 4_of_4, blocks: 01DTVP434PA9VFXSW2JK000001 (min time: 2019-11-26 14:00:00 +0000 UTC, max time: 2019-11-26 16:00:00 +0000 UTC)"`, + `level=debug component=compactor user=user-1 msg="grouper found a compactable blocks group" groupKey=0@17241709254077376921-split-1_of_4-1574863200000-1574870400000 job="stage: split, range start: 1574863200000, range end: 1574870400000, shard: 1_of_4, blocks: 01DTVP434PA9VFXSW2JK000002 (min time: 2019-11-27 14:00:00 +0000 UTC, max time: 2019-11-27 16:00:00 +0000 UTC)"`, // The ownership check is failing because, to keep this test simple, we've just switched // the instance state to LEAVING and there are no other instances in the ring. - `level=info component=compactor org_id=user-1 groupKey=0@17241709254077376921-split-4_of_4-1574776800000-1574784000000 msg="compaction job finished" success=true`, - `level=info component=compactor org_id=user-1 msg="skipped compaction because unable to check whether the job is owned by the compactor instance" groupKey=0@17241709254077376921-split-1_of_4-1574863200000-1574870400000 err="at least 1 live replicas required, could only find 0 - unhealthy instances: 1.2.3.4:0"`, - `level=info component=compactor org_id=user-1 msg="compaction iterations done"`, + `level=info component=compactor user=user-1 groupKey=0@17241709254077376921-split-4_of_4-1574776800000-1574784000000 msg="compaction job finished" success=true`, + `level=info component=compactor user=user-1 msg="skipped compaction because unable to check whether the job is owned by the compactor instance" groupKey=0@17241709254077376921-split-1_of_4-1574863200000-1574870400000 err="at least 1 live replicas required, could only find 0 - unhealthy instances: 1.2.3.4:0"`, + `level=info component=compactor user=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"))) @@ -1947,7 +1947,7 @@ func TestMultitenantCompactor_OutOfOrderCompaction(t *testing.T) { require.NoError(t, services.StopAndAwaitTerminated(context.Background(), c)) // Verify that compactor has found block with out of order chunks, and this block is now marked for no-compaction. - r := regexp.MustCompile("level=info component=compactor org_id=user msg=\"block has been marked for no compaction\" block=([0-9A-Z]+)") + r := regexp.MustCompile("level=info component=compactor user=user msg=\"block has been marked for no compaction\" block=([0-9A-Z]+)") matches := r.FindStringSubmatch(logs.String()) require.Len(t, matches, 2) // Entire string match + single group match. diff --git a/pkg/util/log/wrappers.go b/pkg/util/log/wrappers.go index 4ccb6c88d66..97852dfaef7 100644 --- a/pkg/util/log/wrappers.go +++ b/pkg/util/log/wrappers.go @@ -18,7 +18,7 @@ import ( // its details. func WithUserID(userID string, l log.Logger) log.Logger { // See note in WithContext. - return log.With(l, "org_id", userID) + return log.With(l, "user", userID) } // WithTraceID returns a Logger that has information about the traceID in