mirror of
https://github.com/prometheus/prometheus.git
synced 2024-12-30 07:59:40 -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>
91 lines
2.4 KiB
Go
91 lines
2.4 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 logging
|
|
|
|
import (
|
|
"os"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/grafana/regexp"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestJSONFileLogger_basic(t *testing.T) {
|
|
f, err := os.CreateTemp("", "logging")
|
|
require.NoError(t, err)
|
|
defer func() {
|
|
require.NoError(t, f.Close())
|
|
require.NoError(t, os.Remove(f.Name()))
|
|
}()
|
|
|
|
l, err := NewJSONFileLogger(f.Name())
|
|
require.NoError(t, err)
|
|
require.NotNil(t, l, "logger can't be nil")
|
|
|
|
l.Info("test", "hello", "world")
|
|
require.NoError(t, err)
|
|
r := make([]byte, 1024)
|
|
_, err = f.Read(r)
|
|
require.NoError(t, err)
|
|
|
|
result, err := regexp.Match(`^{"time":"[^"]+","level":"INFO","source":\{.+\},"msg":"test","hello":"world"}\n`, r)
|
|
require.NoError(t, err)
|
|
require.True(t, result, "unexpected content: %s", r)
|
|
|
|
err = l.Close()
|
|
require.NoError(t, err)
|
|
|
|
err = l.file.Close()
|
|
require.Error(t, err)
|
|
require.True(t, strings.HasSuffix(err.Error(), os.ErrClosed.Error()), "file not closed")
|
|
}
|
|
|
|
func TestJSONFileLogger_parallel(t *testing.T) {
|
|
f, err := os.CreateTemp("", "logging")
|
|
require.NoError(t, err)
|
|
defer func() {
|
|
require.NoError(t, f.Close())
|
|
require.NoError(t, os.Remove(f.Name()))
|
|
}()
|
|
|
|
l, err := NewJSONFileLogger(f.Name())
|
|
require.NoError(t, err)
|
|
require.NotNil(t, l, "logger can't be nil")
|
|
|
|
l.Info("test", "hello", "world")
|
|
require.NoError(t, err)
|
|
|
|
l2, err := NewJSONFileLogger(f.Name())
|
|
require.NoError(t, err)
|
|
require.NotNil(t, l, "logger can't be nil")
|
|
|
|
l2.Info("test", "hello", "world")
|
|
require.NoError(t, err)
|
|
|
|
err = l.Close()
|
|
require.NoError(t, err)
|
|
|
|
err = l.file.Close()
|
|
require.Error(t, err)
|
|
require.True(t, strings.HasSuffix(err.Error(), os.ErrClosed.Error()), "file not closed")
|
|
|
|
err = l2.Close()
|
|
require.NoError(t, err)
|
|
|
|
err = l2.file.Close()
|
|
require.Error(t, err)
|
|
require.True(t, strings.HasSuffix(err.Error(), os.ErrClosed.Error()), "file not closed")
|
|
}
|