fix basemap usage for IntoMap as well

Signed-off-by: Callum Styan <[email protected]>
grafana · Jan 5, 2024 · 6a63bf8 · 6a63bf8
1 parent ffb171a
commit 6a63bf8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/pkg/logql/log/fmt.go b/pkg/logql/log/fmt.go
@@ -221,8 +221,8 @@ func (lf *LineFormatter) Process(ts int64, line []byte, lbs *LabelsBuilder) ([]b
 	lf.currentLine = line
 	lf.currentTs = ts
 
-	// map now is taking from a pool
-	m := lbs.Map()
+	m := smp.Get()
+	lbs.IntoMap(m)
 	defer smp.Put(m)
 	if err := lf.Template.Execute(lf.buf, m); err != nil {
 		lbs.SetErr(errTemplateFormat)

diff --git a/pkg/logql/log/fmt_test.go b/pkg/logql/log/fmt_test.go
@@ -948,8 +948,4 @@ func TestMapPool(t *testing.T) {
 	}
 	wg.Done()
 	time.Sleep(2 * time.Second)
-
-	//require.Equal(t, tt.want, newMustLineFormatter(tt.fmt).RequiredLabelNames())
-	//})
-	//}
 }
diff --git a/pkg/logql/log/labels.go b/pkg/logql/log/labels.go
@@ -480,11 +480,17 @@ var smp = newStringMapPool()
 // properly clear the map if it is going to be reused
 func (b *LabelsBuilder) IntoMap(m map[string]string) {
 	if !b.hasDel() && !b.hasAdd() && !b.HasErr() {
+		b.mapLock.RLock()
 		if b.baseMap == nil {
+			b.mapLock.RUnlock()
+			b.mapLock.Lock()
 			b.baseMap = b.base.Map()
+			b.mapLock.Unlock()
 			for k, v := range b.baseMap {
 				m[k] = v
 			}
+		} else {
+			b.mapLock.RUnlock()
 		}
 		return
 	}