kubernetes-sigs/prometheus-adapter
1
0
Fork 1
mirror of https://github.com/kubernetes-sigs/prometheus-adapter.git synced 2026-04-06 01:38:10 +00:00
Code Issues Projects Releases Packages Activity Actions

Fix segfault when using --prometheus-token-file

Browse source
This commit is contained in:
Olivier Lemasle 2022-11-07 00:03:55 +01:00
parent 268b2a8ec2
commit e740fee947
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/adapter/adapter.go
View file

@ -119,7 +119,11 @@ func (cmd *PrometheusAdapter) makePromClient() (prom.Client, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to read prometheus-token-file: %v", err) return nil, fmt.Errorf("failed to read prometheus-token-file: %v", err)
} }
httpClient.Transport = transport.NewBearerAuthRoundTripper(string(data), httpClient.Transport) wrappedTransport := http.DefaultTransport
if httpClient.Transport != nil {
wrappedTransport = httpClient.Transport
}
httpClient.Transport = transport.NewBearerAuthRoundTripper(string(data), wrappedTransport)
} }
genericPromClient := prom.NewGenericAPIClient(httpClient, baseURL, parseHeaderArgs(cmd.PrometheusHeaders)) genericPromClient := prom.NewGenericAPIClient(httpClient, baseURL, parseHeaderArgs(cmd.PrometheusHeaders))
instrumentedGenericPromClient := mprom.InstrumentGenericAPIClient(genericPromClient, baseURL.String()) instrumentedGenericPromClient := mprom.InstrumentGenericAPIClient(genericPromClient, baseURL.String())