mirror of
https://github.com/prometheus/prometheus
synced 2024-12-24 23:42:32 +00: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>
136 lines
3.9 KiB
Go
136 lines
3.9 KiB
Go
// Copyright 2021 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 tracing
|
|
|
|
import (
|
|
"testing"
|
|
|
|
config_util "github.com/prometheus/common/config"
|
|
"github.com/prometheus/common/promslog"
|
|
"github.com/stretchr/testify/require"
|
|
"go.opentelemetry.io/otel"
|
|
"go.opentelemetry.io/otel/trace/noop"
|
|
|
|
"github.com/prometheus/prometheus/config"
|
|
)
|
|
|
|
func TestInstallingNewTracerProvider(t *testing.T) {
|
|
tpBefore := otel.GetTracerProvider()
|
|
|
|
m := NewManager(promslog.NewNopLogger())
|
|
cfg := config.Config{
|
|
TracingConfig: config.TracingConfig{
|
|
Endpoint: "localhost:1234",
|
|
ClientType: config.TracingClientGRPC,
|
|
},
|
|
}
|
|
|
|
require.NoError(t, m.ApplyConfig(&cfg))
|
|
require.NotEqual(t, tpBefore, otel.GetTracerProvider())
|
|
}
|
|
|
|
func TestReinstallingTracerProvider(t *testing.T) {
|
|
m := NewManager(promslog.NewNopLogger())
|
|
cfg := config.Config{
|
|
TracingConfig: config.TracingConfig{
|
|
Endpoint: "localhost:1234",
|
|
ClientType: config.TracingClientGRPC,
|
|
Headers: map[string]string{"foo": "bar"},
|
|
},
|
|
}
|
|
|
|
require.NoError(t, m.ApplyConfig(&cfg))
|
|
tpFirstConfig := otel.GetTracerProvider()
|
|
|
|
// Trying to apply the same config should not reinstall provider.
|
|
require.NoError(t, m.ApplyConfig(&cfg))
|
|
require.Equal(t, tpFirstConfig, otel.GetTracerProvider())
|
|
|
|
cfg2 := config.Config{
|
|
TracingConfig: config.TracingConfig{
|
|
Endpoint: "localhost:1234",
|
|
ClientType: config.TracingClientHTTP,
|
|
Headers: map[string]string{"bar": "foo"},
|
|
},
|
|
}
|
|
|
|
require.NoError(t, m.ApplyConfig(&cfg2))
|
|
require.NotEqual(t, tpFirstConfig, otel.GetTracerProvider())
|
|
tpSecondConfig := otel.GetTracerProvider()
|
|
|
|
// Setting previously unset option should reinstall provider.
|
|
cfg2.TracingConfig.Compression = "gzip"
|
|
require.NoError(t, m.ApplyConfig(&cfg2))
|
|
require.NotEqual(t, tpSecondConfig, otel.GetTracerProvider())
|
|
}
|
|
|
|
func TestReinstallingTracerProviderWithTLS(t *testing.T) {
|
|
m := NewManager(promslog.NewNopLogger())
|
|
cfg := config.Config{
|
|
TracingConfig: config.TracingConfig{
|
|
Endpoint: "localhost:1234",
|
|
ClientType: config.TracingClientGRPC,
|
|
TLSConfig: config_util.TLSConfig{
|
|
CAFile: "testdata/ca.cer",
|
|
},
|
|
},
|
|
}
|
|
|
|
require.NoError(t, m.ApplyConfig(&cfg))
|
|
tpFirstConfig := otel.GetTracerProvider()
|
|
|
|
// Trying to apply the same config with TLS should reinstall provider.
|
|
require.NoError(t, m.ApplyConfig(&cfg))
|
|
require.NotEqual(t, tpFirstConfig, otel.GetTracerProvider())
|
|
}
|
|
|
|
func TestUninstallingTracerProvider(t *testing.T) {
|
|
m := NewManager(promslog.NewNopLogger())
|
|
cfg := config.Config{
|
|
TracingConfig: config.TracingConfig{
|
|
Endpoint: "localhost:1234",
|
|
ClientType: config.TracingClientGRPC,
|
|
},
|
|
}
|
|
|
|
require.NoError(t, m.ApplyConfig(&cfg))
|
|
require.NotEqual(t, noop.NewTracerProvider(), otel.GetTracerProvider())
|
|
|
|
// Uninstall by passing empty config.
|
|
cfg2 := config.Config{
|
|
TracingConfig: config.TracingConfig{},
|
|
}
|
|
|
|
require.NoError(t, m.ApplyConfig(&cfg2))
|
|
// Make sure we get a no-op tracer provider after uninstallation.
|
|
require.Equal(t, noop.NewTracerProvider(), otel.GetTracerProvider())
|
|
}
|
|
|
|
func TestTracerProviderShutdown(t *testing.T) {
|
|
m := NewManager(promslog.NewNopLogger())
|
|
cfg := config.Config{
|
|
TracingConfig: config.TracingConfig{
|
|
Endpoint: "localhost:1234",
|
|
ClientType: config.TracingClientGRPC,
|
|
},
|
|
}
|
|
|
|
require.NoError(t, m.ApplyConfig(&cfg))
|
|
m.Stop()
|
|
|
|
// Check if we closed the done channel.
|
|
_, ok := <-m.done
|
|
require.False(t, ok)
|
|
}
|