RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor (package config): move from github.com/pkg/errors to 'errors' and 'fmt' packages (#10724) 

Signed-off-by: Matthieu MOREL <mmorel-35@users.noreply.github.com>
This commit is contained in:
Matthieu MOREL 2022-05-23 09:54:32 +02:00 committed by GitHub
parent af5ea213f7
commit 8a01943abc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
config/config.go
View File

@ -14,6 +14,7 @@
package config package config
import ( import (
"errors"
"fmt" "fmt"
"net/url" "net/url"
"os" "os"
@ -25,7 +26,6 @@ import (
"github.com/go-kit/log" "github.com/go-kit/log"
"github.com/go-kit/log/level" "github.com/go-kit/log/level"
"github.com/grafana/regexp" "github.com/grafana/regexp"
"github.com/pkg/errors"
"github.com/prometheus/common/config" "github.com/prometheus/common/config"
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/prometheus/common/sigv4" "github.com/prometheus/common/sigv4"
@ -108,7 +108,7 @@ func LoadFile(filename string, agentMode, expandExternalLabels bool, logger log.
} }
cfg, err := Load(string(content), expandExternalLabels, logger) cfg, err := Load(string(content), expandExternalLabels, logger)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "parsing YAML file %s", filename) return nil, fmt.Errorf("parsing YAML file %s: %w", filename, err)
} }
if agentMode { if agentMode {
@ -276,7 +276,7 @@ func (c *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
for _, rf := range c.RuleFiles { for _, rf := range c.RuleFiles {
if !patRulePath.MatchString(rf) { if !patRulePath.MatchString(rf) {
return errors.Errorf("invalid rule file path %q", rf) return fmt.Errorf("invalid rule file path %q", rf)
} }
} }
// Do global overrides and validate unique names. // Do global overrides and validate unique names.
@ -291,7 +291,7 @@ func (c *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
scfg.ScrapeInterval = c.GlobalConfig.ScrapeInterval scfg.ScrapeInterval = c.GlobalConfig.ScrapeInterval
} }
if scfg.ScrapeTimeout > scfg.ScrapeInterval { if scfg.ScrapeTimeout > scfg.ScrapeInterval {
return errors.Errorf("scrape timeout greater than scrape interval for scrape config with job name %q", scfg.JobName) return fmt.Errorf("scrape timeout greater than scrape interval for scrape config with job name %q", scfg.JobName)
} }
if scfg.ScrapeTimeout == 0 { if scfg.ScrapeTimeout == 0 {
if c.GlobalConfig.ScrapeTimeout > scfg.ScrapeInterval { if c.GlobalConfig.ScrapeTimeout > scfg.ScrapeInterval {
@ -302,7 +302,7 @@ func (c *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
} }
if _, ok := jobNames[scfg.JobName]; ok { if _, ok := jobNames[scfg.JobName]; ok {
return errors.Errorf("found multiple scrape configs with job name %q", scfg.JobName) return fmt.Errorf("found multiple scrape configs with job name %q", scfg.JobName)
} }
jobNames[scfg.JobName] = struct{}{} jobNames[scfg.JobName] = struct{}{}
} }
@ -313,7 +313,7 @@ func (c *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
} }
// Skip empty names, we fill their name with their config hash in remote write code. // Skip empty names, we fill their name with their config hash in remote write code.
if _, ok := rwNames[rwcfg.Name]; ok && rwcfg.Name != "" { if _, ok := rwNames[rwcfg.Name]; ok && rwcfg.Name != "" {
return errors.Errorf("found multiple remote write configs with job name %q", rwcfg.Name) return fmt.Errorf("found multiple remote write configs with job name %q", rwcfg.Name)
} }
rwNames[rwcfg.Name] = struct{}{} rwNames[rwcfg.Name] = struct{}{}
} }
@ -324,7 +324,7 @@ func (c *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
} }
// Skip empty names, we fill their name with their config hash in remote read code. // Skip empty names, we fill their name with their config hash in remote read code.
if _, ok := rrNames[rrcfg.Name]; ok && rrcfg.Name != "" { if _, ok := rrNames[rrcfg.Name]; ok && rrcfg.Name != "" {
return errors.Errorf("found multiple remote read configs with job name %q", rrcfg.Name) return fmt.Errorf("found multiple remote read configs with job name %q", rrcfg.Name)
} }
rrNames[rrcfg.Name] = struct{}{} rrNames[rrcfg.Name] = struct{}{}
} }
@ -363,10 +363,10 @@ func (c *GlobalConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
for _, l := range gc.ExternalLabels { for _, l := range gc.ExternalLabels {
if !model.LabelName(l.Name).IsValid() { if !model.LabelName(l.Name).IsValid() {
return errors.Errorf("%q is not a valid label name", l.Name) return fmt.Errorf("%q is not a valid label name", l.Name)
} }
if !model.LabelValue(l.Value).IsValid() { if !model.LabelValue(l.Value).IsValid() {
return errors.Errorf("%q is not a valid label value", l.Value) return fmt.Errorf("%q is not a valid label value", l.Value)
} }
} }
@ -741,7 +741,7 @@ func checkStaticTargets(configs discovery.Configs) error {
func CheckTargetAddress(address model.LabelValue) error { func CheckTargetAddress(address model.LabelValue) error {
// For now check for a URL, we may want to expand this later. // For now check for a URL, we may want to expand this later.
if strings.Contains(string(address), "/") { if strings.Contains(string(address), "/") {
return errors.Errorf("%q is not a valid hostname", address) return fmt.Errorf("%q is not a valid hostname", address)
} }
return nil return nil
} }
@ -810,7 +810,7 @@ func validateHeadersForTracing(headers map[string]string) error {
return errors.New("custom authorization header configuration is not yet supported") return errors.New("custom authorization header configuration is not yet supported")
} }
if _, ok := reservedHeaders[strings.ToLower(header)]; ok { if _, ok := reservedHeaders[strings.ToLower(header)]; ok {
return errors.Errorf("%s is a reserved header. It must not be changed", header) return fmt.Errorf("%s is a reserved header. It must not be changed", header)
} }
} }
return nil return nil
@ -822,7 +822,7 @@ func validateHeaders(headers map[string]string) error {
return errors.New("authorization header must be changed via the basic_auth, authorization, oauth2, or sigv4 parameter") return errors.New("authorization header must be changed via the basic_auth, authorization, oauth2, or sigv4 parameter")
} }
if _, ok := reservedHeaders[strings.ToLower(header)]; ok { if _, ok := reservedHeaders[strings.ToLower(header)]; ok {
return errors.Errorf("%s is a reserved header. It must not be changed", header) return fmt.Errorf("%s is a reserved header. It must not be changed", header)
} }
} }
return nil return nil