mirror of
https://github.com/prometheus/prometheus.git
synced 2024-11-15 01:54:06 -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>
82 lines
2 KiB
Go
82 lines
2 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.
|
|
|
|
package promql
|
|
|
|
import (
|
|
"bytes"
|
|
"errors"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/prometheus/common/promslog"
|
|
|
|
"github.com/prometheus/prometheus/promql/parser"
|
|
"github.com/prometheus/prometheus/util/annotations"
|
|
)
|
|
|
|
func TestRecoverEvaluatorRuntime(t *testing.T) {
|
|
var output bytes.Buffer
|
|
logger := promslog.New(&promslog.Config{Writer: &output})
|
|
ev := &evaluator{logger: logger}
|
|
|
|
expr, _ := parser.ParseExpr("sum(up)")
|
|
|
|
var err error
|
|
|
|
defer func() {
|
|
require.EqualError(t, err, "unexpected error: runtime error: index out of range [123] with length 0")
|
|
require.Contains(t, output.String(), "sum(up)")
|
|
}()
|
|
defer ev.recover(expr, nil, &err)
|
|
|
|
// Cause a runtime panic.
|
|
var a []int
|
|
a[123] = 1
|
|
}
|
|
|
|
func TestRecoverEvaluatorError(t *testing.T) {
|
|
ev := &evaluator{logger: promslog.NewNopLogger()}
|
|
var err error
|
|
|
|
e := errors.New("custom error")
|
|
|
|
defer func() {
|
|
require.EqualError(t, err, e.Error())
|
|
}()
|
|
defer ev.recover(nil, nil, &err)
|
|
|
|
panic(e)
|
|
}
|
|
|
|
func TestRecoverEvaluatorErrorWithWarnings(t *testing.T) {
|
|
ev := &evaluator{logger: promslog.NewNopLogger()}
|
|
var err error
|
|
var ws annotations.Annotations
|
|
|
|
warnings := annotations.New().Add(errors.New("custom warning"))
|
|
e := errWithWarnings{
|
|
err: errors.New("custom error"),
|
|
warnings: warnings,
|
|
}
|
|
|
|
defer func() {
|
|
require.EqualError(t, err, e.Error())
|
|
require.Equal(t, warnings, ws, "wrong warning message")
|
|
}()
|
|
defer ev.recover(nil, &ws, &err)
|
|
|
|
panic(e)
|
|
}
|