Replace RoundTripper in favour of custom NewRequest method

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Replace Alertmanager RoundTripper with custom NewRequest.
+
 ## [0.12.0] - 2024-11-05
 
 ### Added

pkg/alertmanager/alertmanager.go

@@ -18,24 +18,20 @@ type Config struct {
 }
 
 type AlertManager struct {
-	address string
-	client  *http.Client
+	address  string
+	tenantId string
+	client   *http.Client
 }
 
 func New(config Config) (*AlertManager, error) {
 	if config.Address == "" {
 		return nil, microerror.Maskf(invalidConfigError, "%T.Address must not be empty", config)
 	}
 
-	client := http.Client{
-		Transport: &customTransport{
-			tenantId: config.TenantId,
-		},
-	}
-
 	return &AlertManager{
-		address: config.Address,
-		client:  &client,
+		address:  config.Address,
+		client:   http.DefaultClient,
+		tenantId: config.TenantId,
 	}, nil
 }
 
@@ -62,7 +58,13 @@ func (am *AlertManager) CreateSilence(s *Silence) error {
 		return microerror.Mask(err)
 	}
 
-	resp, err := am.client.Post(endpoint, "application/json", bytes.NewBuffer(jsonValues))
+	req, err := am.NewRequest(http.MethodPost, endpoint, bytes.NewBuffer(jsonValues))
+	if err != nil {
+		return microerror.Mask(err)
+	}
+	req.Header.Add("Content-Type", "application/json")
+
+	resp, err := am.client.Do(req)
 	if err != nil {
 		return microerror.Mask(err)
 	}
@@ -101,7 +103,12 @@ func (am *AlertManager) ListSilences() ([]Silence, error) {
 
 	var silences []Silence
 
-	resp, err := am.client.Get(endpoint)
+	req, err := am.NewRequest(http.MethodGet, endpoint, nil)
+	if err != nil {
+		return nil, microerror.Mask(err)
+	}
+
+	resp, err := am.client.Do(req)
 	if err != nil {
 		return nil, microerror.Mask(err)
 	}
@@ -132,7 +139,7 @@ func (am *AlertManager) ListSilences() ([]Silence, error) {
 func (am *AlertManager) DeleteSilenceByID(id string) error {
 	endpoint := fmt.Sprintf("%s/api/v2/silence/%s", am.address, id)
 
-	req, err := http.NewRequest("DELETE", endpoint, nil)
+	req, err := am.NewRequest(http.MethodDelete, endpoint, nil)
 	if err != nil {
 		return microerror.Mask(err)
 	}

pkg/alertmanager/http.go

@@ -0,0 +1,21 @@
+package alertmanager
+
+import (
+	"io"
+	"net/http"
+)
+
+// NewRequest creates a new http.Request with the given method, url and body.
+// It adds the tenantId as X-Scope-OrgID header to the request if it is set.
+func (am *AlertManager) NewRequest(method, url string, body io.Reader) (*http.Request, error) {
+	req, err := http.NewRequest(method, url, body)
+	if err != nil {
+		return nil, err
+	}
+
+	if am.tenantId != "" {
+		req.Header.Add("X-Scope-OrgID", am.tenantId)
+	}
+
+	return req, nil
+}