Skip to content

chore: backport #5019#5082

Merged
jharvey10 merged 1 commit intorelease/v1.12from
jdh/backport-beyla
Dec 12, 2025
Merged

chore: backport #5019#5082
jharvey10 merged 1 commit intorelease/v1.12from
jdh/backport-beyla

Conversation

@jharvey10
Copy link
Contributor

@jharvey10 jharvey10 commented Dec 12, 2025

Backport of #5019

This PR backports #5019 to release/v1.12.

Original PR

Description

PR Description

Update Alloy to latest Beyla 2.7

Which issue(s) this PR fixes


This backport was created automatically.

(cherry picked from commit 615bb61)
@jharvey10 jharvey10 requested a review from a team as a code owner December 12, 2025 21:49
@github-actions
Copy link
Contributor

🔍 Dependency Review

github.com/grafana/beyla/v2 v2.7.8 → v2.7.10 — ✅ Safe

Summary:

  • Reviewed changes across v2.7.9 and v2.7.10. No public Go API changes were introduced that require code changes. Updates were limited to bug fixes, performance improvements, and dependency bumps.
  • Typical areas touched included internal eBPF logic and exporters; no changes in exported Go symbols that consumers import from github.com/grafana/beyla/v2.

Evidence:

  • No breaking changes or removals in exported packages between v2.7.8 and v2.7.10 in the release notes/changelog.
  • Patch-level update within the same major/minor (v2.7.x).

Action required:

  • No code changes required.

Suggested verification steps:

  • Run existing integration tests that exercise Beyla’s HTTP/TCP/GRPC tracing paths.
  • Validate that any optional config used by your project still produces identical spans/metrics.

Code changes:

  • None.
replace go.opentelemetry.io/obi ⇒ github.com/grafana/opentelemetry-ebpf-instrumentation v1.3.10 → v1.3.13 — ✅ Safe

Summary:

  • The project replaces go.opentelemetry.io/obi with Grafana’s fork github.com/grafana/opentelemetry-ebpf-instrumentation. This bumps the replacement from v1.3.10 to v1.3.13.
  • Checked v1.3.11, v1.3.12, and v1.3.13 notes and diffs. No public API changes in the go.opentelemetry.io/obi surface area used by consumers; changes focused on bug fixes (e.g., kernel/arch compatibility), minor performance improvements, and internal dependency updates.

Evidence:

  • No deprecations or breaking changes called out in those releases for the obi public API.

Action required:

  • No code changes required.

Suggested verification steps:

  • If you rely on specific kernel versions or containerized environments, re-run your eBPF-related tests to confirm probe/program load success.
  • Validate that any environment variables or config used by OBI are still honored (no changes reported).

Code changes:

  • None.

Notes

  • Only the above dependencies changed in go.mod/go.sum. No net-new direct dependencies were introduced.
  • The replace directive continues to map go.opentelemetry.io/obi to Grafana’s fork; import paths in your code remain unchanged.

Copy link
Contributor

@grcevski grcevski left a comment

Choose a reason for hiding this comment

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

LGTM! Thank you!

@jharvey10
Copy link
Contributor Author

jharvey10 commented Dec 12, 2025

Check generate-module-dependencies failing is fine here. this workflow only half-exists in the release/v1.12 branch due to the timing of PR merges.

@jharvey10 jharvey10 enabled auto-merge (squash) December 12, 2025 22:00
@jharvey10 jharvey10 merged commit c149393 into release/v1.12 Dec 12, 2025
43 of 45 checks passed
@jharvey10 jharvey10 deleted the jdh/backport-beyla branch December 12, 2025 22:20
@github-actions github-actions bot locked and limited conversation to collaborators Dec 12, 2025
@grafana grafana unlocked this conversation Dec 15, 2025
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 30, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants