Skip to content

Commit

Permalink
feat: prometheusIngester sends user-agent header (#95)
Browse files Browse the repository at this point in the history
* feat: prometheusIngester sends user-agent header

Co-authored-by: Vlk, Ondrej <[email protected]>
  • Loading branch information
FuFikCZ and Vlk, Ondrej authored Oct 14, 2022
1 parent 19ef646 commit 529e79b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased

## [v6.12.1] 2022-10-14
### Added
- [#95](https://github.com/seznam/slo-exporter/pull/95) prometheusIngester sends user-agent header

### Fixed
- [#96](https://github.com/seznam/slo-exporter/pull/96) prometheusIngester headers from environment value now works

Expand Down
2 changes: 1 addition & 1 deletion cmd/slo_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func moduleFactory(moduleName string, logger logrus.FieldLogger, conf *viper.Vip
case "tailer":
return tailer.NewFromViper(conf, logger)
case "prometheusIngester":
return prometheus_ingester.NewFromViper(conf, logger)
return prometheus_ingester.NewFromViper(conf, logger, version)
case "kafkaIngester":
return kafka_ingester.NewFromViper(conf, logger)
case "envoyAccessLogServer":
Expand Down
10 changes: 9 additions & 1 deletion pkg/prometheus_ingester/prometheus_ingester.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,19 @@ func (i *PrometheusIngester) OutputChannel() chan *event.Raw {
return i.outputChannel
}

func NewFromViper(viperAppConfig *viper.Viper, logger logrus.FieldLogger) (*PrometheusIngester, error) {
func NewFromViper(viperAppConfig *viper.Viper, logger logrus.FieldLogger, appVersion string) (*PrometheusIngester, error) {
config := PrometheusIngesterConfig{}

if err := viperAppConfig.UnmarshalExact(&config); err != nil {
return nil, fmt.Errorf("failed to load configuration: %w", err)
}

userAgent := "slo-exporter/" + appVersion
config.HttpHeaders = append(config.HttpHeaders, httpHeader{
Name: "user-agent",
Value: &userAgent,
})

if config.Staleness == time.Duration(0) {
config.Staleness = defaultStaleness
}
Expand Down

0 comments on commit 529e79b

Please sign in to comment.