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>
140 lines
3.5 KiB
Go
140 lines
3.5 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 ovhcloud
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/prometheus/client_golang/prometheus"
|
|
"github.com/prometheus/common/config"
|
|
"github.com/prometheus/common/promslog"
|
|
"github.com/stretchr/testify/require"
|
|
"gopkg.in/yaml.v2"
|
|
|
|
"github.com/prometheus/prometheus/discovery"
|
|
)
|
|
|
|
var (
|
|
ovhcloudApplicationKeyTest = "TDPKJdwZwAQPwKX2"
|
|
ovhcloudApplicationSecretTest = config.Secret("9ufkBmLaTQ9nz5yMUlg79taH0GNnzDjk")
|
|
ovhcloudConsumerKeyTest = config.Secret("5mBuy6SUQcRw2ZUxg0cG68BoDKpED4KY")
|
|
)
|
|
|
|
const (
|
|
mockURL = "https://localhost:1234"
|
|
)
|
|
|
|
func getMockConf(service string) (SDConfig, error) {
|
|
confString := fmt.Sprintf(`
|
|
endpoint: %s
|
|
application_key: %s
|
|
application_secret: %s
|
|
consumer_key: %s
|
|
refresh_interval: 1m
|
|
service: %s
|
|
`, mockURL, ovhcloudApplicationKeyTest, ovhcloudApplicationSecretTest, ovhcloudConsumerKeyTest, service)
|
|
|
|
return getMockConfFromString(confString)
|
|
}
|
|
|
|
func getMockConfFromString(confString string) (SDConfig, error) {
|
|
var conf SDConfig
|
|
err := yaml.UnmarshalStrict([]byte(confString), &conf)
|
|
return conf, err
|
|
}
|
|
|
|
func TestErrorInitClient(t *testing.T) {
|
|
confString := fmt.Sprintf(`
|
|
endpoint: %s
|
|
|
|
`, mockURL)
|
|
|
|
conf, _ := getMockConfFromString(confString)
|
|
|
|
_, err := createClient(&conf)
|
|
|
|
require.ErrorContains(t, err, "missing authentication information")
|
|
}
|
|
|
|
func TestParseIPs(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
input []string
|
|
want error
|
|
}{
|
|
{
|
|
name: "Parse IPv4 failed.",
|
|
input: []string{"A.b"},
|
|
want: errors.New("could not parse IP addresses from list"),
|
|
},
|
|
{
|
|
name: "Parse unspecified failed.",
|
|
input: []string{"0.0.0.0"},
|
|
want: errors.New("could not parse IP addresses from list"),
|
|
},
|
|
{
|
|
name: "Parse void IP failed.",
|
|
input: []string{""},
|
|
want: errors.New("could not parse IP addresses from list"),
|
|
},
|
|
{
|
|
name: "Parse IPv6 ok.",
|
|
input: []string{"2001:0db8:0000:0000:0000:0000:0000:0001"},
|
|
want: nil,
|
|
},
|
|
{
|
|
name: "Parse IPv6 failed.",
|
|
input: []string{"bbb:cccc:1111"},
|
|
want: errors.New("could not parse IP addresses from list"),
|
|
},
|
|
{
|
|
name: "Parse IPv4 bad mask.",
|
|
input: []string{"192.0.2.1/23"},
|
|
want: errors.New("could not parse IP addresses from list"),
|
|
},
|
|
{
|
|
name: "Parse IPv4 ok.",
|
|
input: []string{"192.0.2.1/32"},
|
|
want: nil,
|
|
},
|
|
}
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
_, err := parseIPList(tc.input)
|
|
require.Equal(t, tc.want, err)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestDiscoverer(t *testing.T) {
|
|
conf, _ := getMockConf("vps")
|
|
logger := promslog.NewNopLogger()
|
|
|
|
reg := prometheus.NewRegistry()
|
|
refreshMetrics := discovery.NewRefreshMetrics(reg)
|
|
metrics := conf.NewDiscovererMetrics(reg, refreshMetrics)
|
|
require.NoError(t, metrics.Register())
|
|
defer metrics.Unregister()
|
|
defer refreshMetrics.Unregister()
|
|
|
|
_, err := conf.NewDiscoverer(discovery.DiscovererOptions{
|
|
Logger: logger,
|
|
Metrics: metrics,
|
|
})
|
|
|
|
require.NoError(t, err)
|
|
}
|