From e740fee9474a5101dcf24de6783c1e98a9ec9b5a Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Mon, 7 Nov 2022 00:03:55 +0100 Subject: [PATCH] Fix segfault when using --prometheus-token-file --- cmd/adapter/adapter.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/adapter/adapter.go b/cmd/adapter/adapter.go index 40182a03..bc85a56c 100644 --- a/cmd/adapter/adapter.go +++ b/cmd/adapter/adapter.go @@ -119,7 +119,11 @@ func (cmd *PrometheusAdapter) makePromClient() (prom.Client, error) { if err != nil { 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)) instrumentedGenericPromClient := mprom.InstrumentGenericAPIClient(genericPromClient, baseURL.String())