Skip to content

Merge 11 upstream commits (up to codeql-action v4.34.1)#255

Merged
gnurizen merged 12 commits intomainfrom
upstream-merge
Apr 14, 2026
Merged

Merge 11 upstream commits (up to codeql-action v4.34.1)#255
gnurizen merged 12 commits intomainfrom
upstream-merge

Conversation

@gnurizen
Copy link
Copy Markdown
Collaborator

Summary

  • Merges 11 commits from upstream/main into our fork
  • go.mod/go.sum and BPF blob conflicts auto-resolved
  • All smoke tests pass (go test -run ^$ ./... + make test)

Upstream commits included

Stopped before

4ea09404 Switch from bpf_get_stackid() to bpf_get_stack() (open-telemetry#1264) — source conflicts in native_stack_trace.ebpf.c, tracer.go, and reporter/samples that need manual resolution.

Test plan

  • CI passes on this PR

Generated by tools/upstream-merge.sh

korniltsev-grafanista and others added 12 commits March 17, 2026 17:09
…open-telemetry#1268)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…metry#1277)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…-merge

# Conflicts:
#	go.mod
#	go.sum
#	support/ebpf/tracer.ebpf.amd64
#	support/ebpf/tracer.ebpf.arm64

Auto-resolved:
  - go.mod/go.sum: accepted upstream, ran go mod tidy
  - BPF blobs: rebuilt from merged C sources
@CLAassistant
Copy link
Copy Markdown

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 5 committers have signed the CLA.

✅ gnurizen
✅ bobrik
❌ korniltsev-grafanista
❌ dmathieu
❌ dalehamel
You have signed the CLA already but the status is still pending? Let us recheck it.

@gnurizen gnurizen merged commit 67c3b5d into main Apr 14, 2026
106 of 108 checks passed
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.

6 participants