fix(bug): memory leak in tracing client

cxdy · cxdy · commit 84f13fa8a4c2 · 2025-12-26T17:57:09.000-05:00
Signed-off-by: Cody Kaczynski &lt;ckaczyns@akamai.com&gt;
diff --git a/notify/discord/discord.go b/notify/discord/discord.go
@@ -64,6 +64,7 @@ func New(c *config.DiscordConfig, t *template.Template, l *slog.Logger, httpOpts
 	if err != nil {
 		return nil, err
 	}
+	notify.WrapWithTracing(client)
 	n := &Notifier{
 		conf:       c,
 		tmpl:       t,
diff --git a/notify/incidentio/incidentio.go b/notify/incidentio/incidentio.go
@@ -77,6 +77,7 @@ func New(conf *config.IncidentioConfig, t *template.Template, l *slog.Logger, ht
 	if err != nil {
 		return nil, err
 	}
+	notify.WrapWithTracing(client)
 
 	return &Notifier{
 		conf:   conf,
diff --git a/notify/jira/jira.go b/notify/jira/jira.go
@@ -53,6 +53,7 @@ func New(c *config.JiraConfig, t *template.Template, l *slog.Logger, httpOpts ..
 	if err != nil {
 		return nil, err
 	}
+	notify.WrapWithTracing(client)
 
 	return &Notifier{
 		conf:    c,
diff --git a/notify/mattermost/mattermost.go b/notify/mattermost/mattermost.go
@@ -54,6 +54,7 @@ func New(c *config.MattermostConfig, t *template.Template, l *slog.Logger, httpO
 	if err != nil {
 		return nil, err
 	}
+	notify.WrapWithTracing(client)
 
 	return &Notifier{
 		conf:         c,
diff --git a/notify/msteams/msteams.go b/notify/msteams/msteams.go
@@ -65,6 +65,7 @@ func New(c *config.MSTeamsConfig, t *template.Template, l *slog.Logger, httpOpts
 	if err != nil {
 		return nil, err
 	}
+	notify.WrapWithTracing(client)
 
 	n := &Notifier{
 		conf:         c,
diff --git a/notify/msteamsv2/msteamsv2.go b/notify/msteamsv2/msteamsv2.go
@@ -89,6 +89,7 @@ func New(c *config.MSTeamsV2Config, t *template.Template, l *slog.Logger, httpOp
 	if err != nil {
 		return nil, err
 	}
+	notify.WrapWithTracing(client)
 
 	n := &Notifier{
 		conf:         c,
diff --git a/notify/opsgenie/opsgenie.go b/notify/opsgenie/opsgenie.go
@@ -51,6 +51,7 @@ func New(c *config.OpsGenieConfig, t *template.Template, l *slog.Logger, httpOpt
 	if err != nil {
 		return nil, err
 	}
+	notify.WrapWithTracing(client)
 	return &Notifier{
 		conf:    c,
 		tmpl:    t,
diff --git a/notify/pagerduty/pagerduty.go b/notify/pagerduty/pagerduty.go
@@ -59,6 +59,7 @@ func New(c *config.PagerdutyConfig, t *template.Template, l *slog.Logger, httpOp
 	if err != nil {
 		return nil, err
 	}
+	notify.WrapWithTracing(client)
 	n := &Notifier{conf: c, tmpl: t, logger: l, client: client}
 	if c.ServiceKey != "" || c.ServiceKeyFile != "" {
 		n.apiV1 = "https://events.pagerduty.com/generic/2010-04-15/create_event.json"
diff --git a/notify/pushover/pushover.go b/notify/pushover/pushover.go
@@ -56,6 +56,7 @@ func New(c *config.PushoverConfig, t *template.Template, l *slog.Logger, httpOpt
 	if err != nil {
 		return nil, err
 	}
+	notify.WrapWithTracing(client)
 	return &Notifier{
 		conf:    c,
 		tmpl:    t,
diff --git a/notify/rocketchat/rocketchat.go b/notify/rocketchat/rocketchat.go
@@ -92,6 +92,7 @@ func New(c *config.RocketchatConfig, t *template.Template, l *slog.Logger, httpO
 	if err != nil {
 		return nil, err
 	}
+	notify.WrapWithTracing(client)
 	token, err := getToken(c)
 	if err != nil {
 		return nil, err
diff --git a/notify/slack/slack.go b/notify/slack/slack.go
@@ -52,6 +52,7 @@ func New(c *config.SlackConfig, t *template.Template, l *slog.Logger, httpOpts .
 	if err != nil {
 		return nil, err
 	}
+	notify.WrapWithTracing(client)
 
 	return &Notifier{
 		conf:         c,
diff --git a/notify/sns/sns.go b/notify/sns/sns.go
@@ -55,6 +55,7 @@ func New(c *config.SNSConfig, t *template.Template, l *slog.Logger, httpOpts ...
 	if err != nil {
 		return nil, err
 	}
+	notify.WrapWithTracing(client)
 	return &Notifier{
 		conf:    c,
 		tmpl:    t,
diff --git a/notify/telegram/telegram.go b/notify/telegram/telegram.go
@@ -48,6 +48,7 @@ func New(conf *config.TelegramConfig, t *template.Template, l *slog.Logger, http
 	if err != nil {
 		return nil, err
 	}
+	notify.WrapWithTracing(httpclient)
 
 	client, err := createTelegramClient(conf.APIUrl.String(), conf.ParseMode, httpclient)
 	if err != nil {
diff --git a/notify/util.go b/notify/util.go
@@ -38,6 +38,15 @@ const truncationMarker = "…"
 // UserAgentHeader is the default User-Agent for notification requests.
 var UserAgentHeader = version.ComponentUserAgent("Alertmanager")
 
+// WrapWithTracing wraps an HTTP client's transport with tracing instrumentation.
+// This should be called once when creating the client, not on every request.
+func WrapWithTracing(client *http.Client) {
+	if client == nil {
+		return
+	}
+	client.Transport = tracing.Transport(client.Transport)
+}
+
 // RedactURL removes the URL part from an error of *url.Error type.
 func RedactURL(err error) error {
 	var e *url.Error
@@ -77,9 +86,6 @@ func request(ctx context.Context, client *http.Client, method, url, bodyType str
 		req.Header.Set("Content-Type", bodyType)
 	}
 
-	// Inject trancing transport
-	client.Transport = tracing.Transport(client.Transport)
-
 	return client.Do(req.WithContext(ctx))
 }
 
diff --git a/notify/victorops/victorops.go b/notify/victorops/victorops.go
@@ -50,6 +50,7 @@ func New(c *config.VictorOpsConfig, t *template.Template, l *slog.Logger, httpOp
 	if err != nil {
 		return nil, err
 	}
+	notify.WrapWithTracing(client)
 	return &Notifier{
 		conf:   c,
 		tmpl:   t,
diff --git a/notify/webex/webex.go b/notify/webex/webex.go
@@ -48,6 +48,7 @@ func New(c *config.WebexConfig, t *template.Template, l *slog.Logger, httpOpts .
 	if err != nil {
 		return nil, err
 	}
+	notify.WrapWithTracing(client)
 
 	n := &Notifier{
 		conf:    c,
diff --git a/notify/webhook/webhook.go b/notify/webhook/webhook.go
@@ -46,6 +46,7 @@ func New(conf *config.WebhookConfig, t *template.Template, l *slog.Logger, httpO
 	if err != nil {
 		return nil, err
 	}
+	notify.WrapWithTracing(client)
 	return &Notifier{
 		conf:   conf,
 		tmpl:   t,
diff --git a/notify/wechat/wechat.go b/notify/wechat/wechat.go
@@ -75,6 +75,7 @@ func New(c *config.WechatConfig, t *template.Template, l *slog.Logger, httpOpts
 	if err != nil {
 		return nil, err
 	}
+	notify.WrapWithTracing(client)
 
 	return &Notifier{conf: c, tmpl: t, logger: l, client: client}, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ func New(c config.DiscordConfig, t template.Template, l *slog.Logger, httpOpts`
`64`	`64`	`if err != nil {`
`65`	`65`	`return nil, err`
`66`	`66`	`}`
	`67`	`+ notify.WrapWithTracing(client)`
`67`	`68`	`n := &Notifier{`
`68`	`69`	`conf: c,`
`69`	`70`	`tmpl: t,`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ func New(conf config.IncidentioConfig, t template.Template, l *slog.Logger, ht`
`77`	`77`	`if err != nil {`
`78`	`78`	`return nil, err`
`79`	`79`	`}`
	`80`	`+ notify.WrapWithTracing(client)`
`80`	`81`
`81`	`82`	`return &Notifier{`
`82`	`83`	`conf: conf,`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ func New(c config.JiraConfig, t template.Template, l *slog.Logger, httpOpts ..`
`53`	`53`	`if err != nil {`
`54`	`54`	`return nil, err`
`55`	`55`	`}`
	`56`	`+ notify.WrapWithTracing(client)`
`56`	`57`
`57`	`58`	`return &Notifier{`
`58`	`59`	`conf: c,`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ func New(c config.MattermostConfig, t template.Template, l *slog.Logger, httpO`
`54`	`54`	`if err != nil {`
`55`	`55`	`return nil, err`
`56`	`56`	`}`
	`57`	`+ notify.WrapWithTracing(client)`
`57`	`58`
`58`	`59`	`return &Notifier{`
`59`	`60`	`conf: c,`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ func New(c config.MSTeamsConfig, t template.Template, l *slog.Logger, httpOpts`
`65`	`65`	`if err != nil {`
`66`	`66`	`return nil, err`
`67`	`67`	`}`
	`68`	`+ notify.WrapWithTracing(client)`
`68`	`69`
`69`	`70`	`n := &Notifier{`
`70`	`71`	`conf: c,`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ func New(c config.MSTeamsV2Config, t template.Template, l *slog.Logger, httpOp`
`89`	`89`	`if err != nil {`
`90`	`90`	`return nil, err`
`91`	`91`	`}`
	`92`	`+ notify.WrapWithTracing(client)`
`92`	`93`
`93`	`94`	`n := &Notifier{`
`94`	`95`	`conf: c,`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ func New(c config.OpsGenieConfig, t template.Template, l *slog.Logger, httpOpt`
`51`	`51`	`if err != nil {`
`52`	`52`	`return nil, err`
`53`	`53`	`}`
	`54`	`+ notify.WrapWithTracing(client)`
`54`	`55`	`return &Notifier{`
`55`	`56`	`conf: c,`
`56`	`57`	`tmpl: t,`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ func New(c config.PagerdutyConfig, t template.Template, l *slog.Logger, httpOp`
`59`	`59`	`if err != nil {`
`60`	`60`	`return nil, err`
`61`	`61`	`}`
	`62`	`+ notify.WrapWithTracing(client)`
`62`	`63`	`n := &Notifier{conf: c, tmpl: t, logger: l, client: client}`
`63`	`64`	`if c.ServiceKey != "" \|\| c.ServiceKeyFile != "" {`
`64`	`65`	`n.apiV1 = "https://events.pagerduty.com/generic/2010-04-15/create_event.json"`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ func New(c config.PushoverConfig, t template.Template, l *slog.Logger, httpOpt`
`56`	`56`	`if err != nil {`
`57`	`57`	`return nil, err`
`58`	`58`	`}`
	`59`	`+ notify.WrapWithTracing(client)`
`59`	`60`	`return &Notifier{`
`60`	`61`	`conf: c,`
`61`	`62`	`tmpl: t,`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ func New(c config.RocketchatConfig, t template.Template, l *slog.Logger, httpO`
`92`	`92`	`if err != nil {`
`93`	`93`	`return nil, err`
`94`	`94`	`}`
	`95`	`+ notify.WrapWithTracing(client)`
`95`	`96`	`token, err := getToken(c)`
`96`	`97`	`if err != nil {`
`97`	`98`	`return nil, err`