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>
63 lines
2 KiB
Go
63 lines
2 KiB
Go
// Copyright 2020 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.
|
|
|
|
package tsdb
|
|
|
|
import (
|
|
"context"
|
|
"math"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/prometheus/common/promslog"
|
|
|
|
"github.com/prometheus/prometheus/model/labels"
|
|
"github.com/prometheus/prometheus/tsdb/chunks"
|
|
)
|
|
|
|
func TestBlockWriter(t *testing.T) {
|
|
ctx := context.Background()
|
|
outputDir := t.TempDir()
|
|
w, err := NewBlockWriter(promslog.NewNopLogger(), outputDir, DefaultBlockDuration)
|
|
require.NoError(t, err)
|
|
|
|
// Add some series.
|
|
app := w.Appender(ctx)
|
|
ts1, v1 := int64(44), float64(7)
|
|
_, err = app.Append(0, labels.FromStrings("a", "b"), ts1, v1)
|
|
require.NoError(t, err)
|
|
ts2, v2 := int64(55), float64(12)
|
|
_, err = app.Append(0, labels.FromStrings("c", "d"), ts2, v2)
|
|
require.NoError(t, err)
|
|
require.NoError(t, app.Commit())
|
|
id, err := w.Flush(ctx)
|
|
require.NoError(t, err)
|
|
|
|
// Confirm the block has the correct data.
|
|
blockpath := filepath.Join(outputDir, id.String())
|
|
b, err := OpenBlock(nil, blockpath, nil)
|
|
require.NoError(t, err)
|
|
defer func() { require.NoError(t, b.Close()) }()
|
|
q, err := NewBlockQuerier(b, math.MinInt64, math.MaxInt64)
|
|
require.NoError(t, err)
|
|
series := query(t, q, labels.MustNewMatcher(labels.MatchRegexp, "", ".*"))
|
|
sample1 := []chunks.Sample{sample{t: ts1, f: v1}}
|
|
sample2 := []chunks.Sample{sample{t: ts2, f: v2}}
|
|
expectedSeries := map[string][]chunks.Sample{"{a=\"b\"}": sample1, "{c=\"d\"}": sample2}
|
|
require.Equal(t, expectedSeries, series)
|
|
|
|
require.NoError(t, w.Close())
|
|
}
|