H0llyW00dzZ/prometheus
H0llyW00dzZ/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-02-06 09:07:45 +00:00
Code Releases Wiki Activity

Merge pull request #15540 from mmorel-35/prometheus/common@v0.61.0

Browse Source 
chore(deps): use `version.PrometheusUserAgent`
This commit is contained in:
Jan Fajerski 2025-01-28 13:10:48 +01:00 committed by GitHub
commit 7f37a008c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 32 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/promtool/main.go
View File

@ -328,7 +328,7 @@ func main() {
kingpin.Fatalf("Failed to load HTTP config file: %v", err)
}
httpRoundTripper, err = promconfig.NewRoundTripperFromConfig(*httpConfig, "promtool", promconfig.WithUserAgent("promtool/"+version.Version))
httpRoundTripper, err = promconfig.NewRoundTripperFromConfig(*httpConfig, "promtool", promconfig.WithUserAgent(version.ComponentUserAgent("promtool")))
if err != nil {
kingpin.Fatalf("Failed to create a new HTTP round tripper: %v", err)
}

22
discovery/azure/azure.go
View File

@ -70,18 +70,14 @@ const (
authMethodManagedIdentity = "ManagedIdentity"
)
var (
userAgent = fmt.Sprintf("Prometheus/%s", version.Version)
// DefaultSDConfig is the default Azure SD configuration.
DefaultSDConfig = SDConfig{
Port: 80,
RefreshInterval: model.Duration(5 * time.Minute),
Environment: "AzurePublicCloud",
AuthenticationMethod: authMethodOAuth,
HTTPClientConfig: config_util.DefaultHTTPClientConfig,
}
)
// DefaultSDConfig is the default Azure SD configuration.
var DefaultSDConfig = SDConfig{
Port: 80,
RefreshInterval: model.Duration(5 * time.Minute),
Environment: "AzurePublicCloud",
AuthenticationMethod: authMethodOAuth,
HTTPClientConfig: config_util.DefaultHTTPClientConfig,
}
var environments = map[string]cloud.Configuration{
"AZURECHINACLOUD": cloud.AzureChina,
@ -244,7 +240,7 @@ func (d *Discovery) createAzureClient() (client, error) {
c.logger = d.logger
telemetry := policy.TelemetryOptions{
ApplicationID: userAgent,
ApplicationID: version.PrometheusUserAgent(),
}
credential, err := newCredential(*d.cfg, policy.ClientOptions{

2
discovery/digitalocean/digitalocean.go
View File

@ -132,7 +132,7 @@ func NewDiscovery(conf *SDConfig, logger *slog.Logger, metrics discovery.Discove
Transport: rt,
Timeout: time.Duration(conf.RefreshInterval),
},
godo.SetUserAgent(fmt.Sprintf("Prometheus/%s", version.Version)),
godo.SetUserAgent(version.PrometheusUserAgent()),
)
if err != nil {
return nil, fmt.Errorf("error setting up digital ocean agent: %w", err)

2
discovery/eureka/client.go
View File

@ -23,7 +23,7 @@ import (
"github.com/prometheus/common/version"
)
var userAgent = fmt.Sprintf("Prometheus/%s", version.Version)
var userAgent = version.PrometheusUserAgent()
type Applications struct {
VersionsDelta int `xml:"versions__delta"`

2
discovery/hetzner/robot.go
View File

@ -39,7 +39,7 @@ const (
hetznerLabelRobotCancelled = hetznerRobotLabelPrefix + "cancelled"
)
var userAgent = fmt.Sprintf("Prometheus/%s", version.Version)
var userAgent = version.PrometheusUserAgent()
// Discovery periodically performs Hetzner Robot requests. It implements
// the Discoverer interface.

2
discovery/http/http.go
View File

@ -44,7 +44,7 @@ var (
HTTPClientConfig: config.DefaultHTTPClientConfig,
RefreshInterval: model.Duration(60 * time.Second),
}
userAgent = fmt.Sprintf("Prometheus/%s", version.Version)
userAgent = version.PrometheusUserAgent()
matchContentType = regexp.MustCompile(`^(?i:application\/json(;\s*charset=("utf-8"|utf-8))?)$`)
)

3
discovery/ionos/server.go
View File

@ -15,7 +15,6 @@ package ionos
import (
"context"
"fmt"
"log/slog"
"net"
"net/http"
@ -77,7 +76,7 @@ func newServerDiscovery(conf *SDConfig, _ *slog.Logger) (*serverDiscovery, error
Transport: rt,
Timeout: time.Duration(conf.RefreshInterval),
}
cfg.UserAgent = fmt.Sprintf("Prometheus/%s", version.Version)
cfg.UserAgent = version.PrometheusUserAgent()
d.client = ionoscloud.NewAPIClient(cfg)

14
discovery/kubernetes/kubernetes.go
View File

@ -59,14 +59,10 @@ const (
presentValue = model.LabelValue("true")
)
var (
// Http header.
userAgent = fmt.Sprintf("Prometheus/%s", version.Version)
// DefaultSDConfig is the default Kubernetes SD configuration.
DefaultSDConfig = SDConfig{
HTTPClientConfig: config.DefaultHTTPClientConfig,
}
)
// DefaultSDConfig is the default Kubernetes SD configuration.
var DefaultSDConfig = SDConfig{
HTTPClientConfig: config.DefaultHTTPClientConfig,
}
func init() {
discovery.RegisterConfig(&SDConfig{})
@ -336,7 +332,7 @@ func New(l *slog.Logger, metrics discovery.DiscovererMetrics, conf *SDConfig) (*
}
}
kcfg.UserAgent = userAgent
kcfg.UserAgent = version.PrometheusUserAgent()
kcfg.ContentType = "application/vnd.kubernetes.protobuf"
c, err := kubernetes.NewForConfig(kcfg)

2
discovery/linode/linode.go
View File

@ -165,7 +165,7 @@ func NewDiscovery(conf *SDConfig, logger *slog.Logger, metrics discovery.Discove
Timeout: time.Duration(conf.RefreshInterval),
},
)
client.SetUserAgent(fmt.Sprintf("Prometheus/%s", version.Version))
client.SetUserAgent(version.PrometheusUserAgent())
d.client = &client
d.Discovery = refresh.NewDiscovery(

3
discovery/moby/docker.go
View File

@ -33,6 +33,7 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/config"
"github.com/prometheus/common/model"
"github.com/prometheus/common/version"
"github.com/prometheus/prometheus/discovery"
"github.com/prometheus/prometheus/discovery/refresh"
@ -173,7 +174,7 @@ func NewDockerDiscovery(conf *DockerSDConfig, logger *slog.Logger, metrics disco
}),
client.WithScheme(hostURL.Scheme),
client.WithHTTPHeaders(map[string]string{
"User-Agent": userAgent,
"User-Agent": version.PrometheusUserAgent(),
}),
)
}

4
discovery/moby/dockerswarm.go
View File

@ -38,8 +38,6 @@ const (
swarmLabel = model.MetaLabelPrefix + "dockerswarm_"
)
var userAgent = fmt.Sprintf("Prometheus/%s", version.Version)
// DefaultDockerSwarmSDConfig is the default Docker Swarm SD configuration.
var DefaultDockerSwarmSDConfig = DockerSwarmSDConfig{
RefreshInterval: model.Duration(60 * time.Second),
@ -169,7 +167,7 @@ func NewDiscovery(conf *DockerSwarmSDConfig, logger *slog.Logger, metrics discov
}),
client.WithScheme(hostURL.Scheme),
client.WithHTTPHeaders(map[string]string{
"User-Agent": userAgent,
"User-Agent": version.PrometheusUserAgent(),
}),
)
}

2
discovery/puppetdb/puppetdb.go
View File

@ -64,7 +64,7 @@ var (
HTTPClientConfig: config.DefaultHTTPClientConfig,
}
matchContentType = regexp.MustCompile(`^(?i:application\/json(;\s*charset=("utf-8"|utf-8))?)$`)
userAgent = fmt.Sprintf("Prometheus/%s", version.Version)
userAgent = version.PrometheusUserAgent()
)
func init() {

2
discovery/scaleway/baremetal.go
View File

@ -93,7 +93,7 @@ func newBaremetalDiscovery(conf *SDConfig) (*baremetalDiscovery, error) {
Transport: rt,
Timeout: time.Duration(conf.RefreshInterval),
}),
scw.WithUserAgent(fmt.Sprintf("Prometheus/%s", version.Version)),
scw.WithUserAgent(version.PrometheusUserAgent()),
scw.WithProfile(profile),
)
if err != nil {

2
discovery/scaleway/instance.go
View File

@ -104,7 +104,7 @@ func newInstanceDiscovery(conf *SDConfig) (*instanceDiscovery, error) {
Transport: rt,
Timeout: time.Duration(conf.RefreshInterval),
}),
scw.WithUserAgent(fmt.Sprintf("Prometheus/%s", version.Version)),
scw.WithUserAgent(version.PrometheusUserAgent()),
scw.WithProfile(profile),
)
if err != nil {

2
discovery/vultr/vultr.go
View File

@ -135,7 +135,7 @@ func NewDiscovery(conf *SDConfig, logger *slog.Logger, metrics discovery.Discove
Timeout: time.Duration(conf.RefreshInterval),
})
d.client.SetUserAgent(fmt.Sprintf("Prometheus/%s", version.Version))
d.client.SetUserAgent(version.PrometheusUserAgent())
if err != nil {
return nil, fmt.Errorf("error setting up vultr agent: %w", err)

2
discovery/xds/client.go
View File

@ -30,7 +30,7 @@ import (
"github.com/prometheus/common/version"
)
var userAgent = fmt.Sprintf("Prometheus/%s", version.Version)
var userAgent = version.PrometheusUserAgent()
// ResourceClient exposes the xDS protocol for a single resource type.
// See https://www.envoyproxy.io/docs/envoy/latest/api-docs/xds_protocol#rest-json-polling-subscriptions .

2
notifier/notifier.go
View File

@ -56,7 +56,7 @@ const (
alertmanagerLabel = "alertmanager"
)
var userAgent = fmt.Sprintf("Prometheus/%s", version.Version)
var userAgent = version.PrometheusUserAgent()
// Alert is a generic representation of an alert in the Prometheus eco-system.
type Alert struct {

2
scrape/scrape.go
View File

@ -801,7 +801,7 @@ func acceptEncodingHeader(enableCompression bool) string {
return "identity"
}
var UserAgent = fmt.Sprintf("Prometheus/%s", version.Version)
var UserAgent = version.PrometheusUserAgent()
func (s *targetScraper) scrape(ctx context.Context) (*http.Response, error) {
if s.req == nil {

2
storage/remote/client.go
View File

@ -66,7 +66,7 @@ const (
var (
// UserAgent represents Prometheus version to use for user agent header.
UserAgent = fmt.Sprintf("Prometheus/%s", version.Version)
UserAgent = version.PrometheusUserAgent()
remoteWriteContentTypeHeaders = map[config.RemoteWriteProtoMsg]string{
config.RemoteWriteProtoMsgV1: appProtoContentType, // Also application/x-protobuf;proto=prometheus.WriteRequest but simplified for compatibility with 1.x spec.