Skip to content

chore(deps): adopt fork template and tracing prerequisites - #717

Merged
yuri-tceretian merged 1 commit into
mainfrom
yuri-tseretyan/adopt-fork-prerequisites
Oct 14, 2026
Merged

yuri-tceretian merged 1 commit into
mainfrom
yuri-tseretyan/adopt-fork-prerequisites

Conversation

@yuri-tceretian

Copy link
Copy Markdown
Contributor

Updates the Alertmanager fork to 7daeb08a46. This fork version adopts upstream Alertmanager v0.34.0 code:

The webhook integration now calls the 1-argument tracing.Transport, which is what upstream notify.NewClientWithTracing does. Two tests pass the new route-labels and reason arguments.

Behavior changes

  • The template data and the webhook payload of v0 integrations contain notification_reason and routeLabels.
  • Webhook HTTP spans use the upstream names.

This PR depends on #696. Merge it after #696.

Part of #694
Related to #712

@yuri-tceretian
yuri-tceretian added this pull request to stack #718 October 9, 2026 17:42
Base automatically changed from yuri-tseretyan/slog-adapter to main October 14, 2026 14:45
@yuri-tceretian
yuri-tceretian force-pushed the yuri-tseretyan/adopt-fork-prerequisites branch from 2a87bfa to a6884b7 Compare October 14, 2026 14:45
@yuri-tceretian
yuri-tceretian marked this pull request as ready for review October 14, 2026 14:46
@yuri-tceretian
yuri-tceretian requested a review from a team as a code owner October 14, 2026 14:46
@yuri-tceretian
yuri-tceretian force-pushed the yuri-tseretyan/adopt-fork-prerequisites branch from a6884b7 to 49ccb1b Compare October 14, 2026 14:58

@moustafab moustafab left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One small question on the tracing change


// instrument for tracing
client.Transport = tracing.Transport(client.Transport, "webhook")
client.Transport = tracing.Transport(client.Transport)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we losing something with this?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

two side-effects:

  • span will not contain integration type, which is ok because only webhook has tracing for now.
  • the new tracing otelhttp produces more spans and more informative than the old one.

@yuri-tceretian
yuri-tceretian merged commit 7137417 into main Oct 14, 2026
18 checks passed
@yuri-tceretian
yuri-tceretian deleted the yuri-tseretyan/adopt-fork-prerequisites branch October 14, 2026 19:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants