mirror of
https://github.com/prometheus/prometheus.git
synced 2024-12-26 06:04:05 -08:00
6ebfbd2d54
For: #14355 This commit updates Prometheus to adopt stdlib's log/slog package in favor of go-kit/log. As part of converting to use slog, several other related changes are required to get prometheus working, including: - removed unused logging util func `RateLimit()` - forward ported the util/logging/Deduper logging by implementing a small custom slog.Handler that does the deduping before chaining log calls to the underlying real slog.Logger - move some of the json file logging functionality to use prom/common package functionality - refactored some of the new json file logging for scraping - changes to promql.QueryLogger interface to swap out logging methods for relevant slog sugar wrappers - updated lots of tests that used/replicated custom logging functionality, attempting to keep the logical goal of the tests consistent after the transition - added a healthy amount of `if logger == nil { $makeLogger }` type conditional checks amongst various functions where none were provided -- old code that used the go-kit/log.Logger interface had several places where there were nil references when trying to use functions like `With()` to add keyvals on the new *slog.Logger type Signed-off-by: TJ Hoplock <t.hoplock@gmail.com>
95 lines
2.5 KiB
Go
95 lines
2.5 KiB
Go
// Copyright 2024 The Prometheus Authors
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
//go:build dedupelabels
|
|
|
|
package tsdb
|
|
|
|
import (
|
|
"log/slog"
|
|
|
|
"github.com/prometheus/prometheus/model/labels"
|
|
)
|
|
|
|
// Helper method to access labels under lock.
|
|
func (s *memSeries) labels() labels.Labels {
|
|
s.Lock()
|
|
defer s.Unlock()
|
|
return s.lset
|
|
}
|
|
|
|
// RebuildSymbolTable goes through all the series in h, build a SymbolTable with all names and values,
|
|
// replace each series' Labels with one using that SymbolTable.
|
|
func (h *Head) RebuildSymbolTable(logger *slog.Logger) *labels.SymbolTable {
|
|
logger.Info("RebuildSymbolTable starting")
|
|
st := labels.NewSymbolTable()
|
|
builder := labels.NewScratchBuilderWithSymbolTable(st, 0)
|
|
rebuildLabels := func(lbls labels.Labels) labels.Labels {
|
|
builder.Reset()
|
|
lbls.Range(func(l labels.Label) {
|
|
builder.Add(l.Name, l.Value)
|
|
})
|
|
return builder.Labels()
|
|
}
|
|
|
|
for i := 0; i < h.series.size; i++ {
|
|
h.series.locks[i].Lock()
|
|
|
|
for _, s := range h.series.hashes[i].unique {
|
|
s.Lock()
|
|
s.lset = rebuildLabels(s.lset)
|
|
s.Unlock()
|
|
}
|
|
|
|
for _, all := range h.series.hashes[i].conflicts {
|
|
for _, s := range all {
|
|
s.Lock()
|
|
s.lset = rebuildLabels(s.lset)
|
|
s.Unlock()
|
|
}
|
|
}
|
|
|
|
h.series.locks[i].Unlock()
|
|
}
|
|
type withReset interface{ ResetSymbolTable(*labels.SymbolTable) }
|
|
if e, ok := h.exemplars.(withReset); ok {
|
|
e.ResetSymbolTable(st)
|
|
}
|
|
logger.Info("RebuildSymbolTable finished", "size", st.Len())
|
|
return st
|
|
}
|
|
|
|
func (ce *CircularExemplarStorage) ResetSymbolTable(st *labels.SymbolTable) {
|
|
builder := labels.NewScratchBuilderWithSymbolTable(st, 0)
|
|
rebuildLabels := func(lbls labels.Labels) labels.Labels {
|
|
builder.Reset()
|
|
lbls.Range(func(l labels.Label) {
|
|
builder.Add(l.Name, l.Value)
|
|
})
|
|
return builder.Labels()
|
|
}
|
|
|
|
ce.lock.RLock()
|
|
defer ce.lock.RUnlock()
|
|
|
|
for _, v := range ce.index {
|
|
v.seriesLabels = rebuildLabels(v.seriesLabels)
|
|
}
|
|
for i := range ce.exemplars {
|
|
if ce.exemplars[i].ref == nil {
|
|
continue
|
|
}
|
|
ce.exemplars[i].exemplar.Labels = rebuildLabels(ce.exemplars[i].exemplar.Labels)
|
|
}
|
|
}
|