mirror of
https://github.com/prometheus/prometheus.git
synced 2024-12-27 06:29:42 -08:00
3e24e84172
Resolves: #15433 When I converted prometheus to use slog in #14906, I update both the `QueryLogger` interface, as well as how the log calls to the `QueryLogger` were built up in `promql.Engine.exec()`. The backing logger for the `QueryLogger` in the engine is a `util/logging.JSONFileLogger`, and it's implementation of the `With()` method updates the logger the logger in place with the new keyvals added onto the underlying slog.Logger, which means they get inherited onto everything after. All subsequent calls to `With()`, even in later queries, would continue to then append on more and more keyvals for the various params and fields built up in the logger. In turn, this causes unbounded growth of the logger, leading to increased memory usage, and in at least one report was the likely cause of an OOM kill. More information can be found in the issue and the linked slack thread. This commit does a few things: - It was referenced in feedback in #14906 that it would've been better to not change the `QueryLogger` interface if possible, this PR proposes changes that bring it closer to alignment with the pre-3.0 `QueryLogger` interface contract - reverts `promql.Engine.exec()`'s usage of the query logger to the pattern of building up an array of args to pass at once to the end log call. Avoiding the repetitious calls to `.With()` are what resolve the issue with the logger growth/memory usage. - updates the scrape failure logger to use the update `QueryLogger` methods in the contract. - updates tests accordingly - cleans up unused methods Builds and passes tests successfully. Tested locally and confirmed I could no longer reproduce the issue/it resolved the issue. Signed-off-by: TJ Hoplock <t.hoplock@gmail.com>
93 lines
2.5 KiB
Go
93 lines
2.5 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 (
|
|
"context"
|
|
"log/slog"
|
|
"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.Log(context.Background(), slog.LevelInfo, "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":"file.go:\d+","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.Log(context.Background(), slog.LevelInfo, "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.Log(context.Background(), slog.LevelInfo, "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")
|
|
}
|