Skip to content

Advance upstream-merge through 927a75e8 (kernel 5.10 bump)#261

Draft
gnurizen wants to merge 37 commits into
mainfrom
claude/upstream-merge-continued-20260429-094520
Draft

Advance upstream-merge through 927a75e8 (kernel 5.10 bump)#261
gnurizen wants to merge 37 commits into
mainfrom
claude/upstream-merge-continued-20260429-094520

Conversation

@gnurizen
Copy link
Copy Markdown
Collaborator

Continues the upstream merge from PR #260 through 927a75e8 (kernel: bump minimal Linux kernel to 5.10). 6 merge commits, 41 upstream commits brought in. Stops at 24fddb51 ruby: add DTV-based TLS access for ruby_current_ec which has metric-ID collisions with our fork that need manual coordination.

Stack

  • 25d622a1 auto-merge batch (15 upstream commits, go.sum auto-tidied)
  • efd37c61 reporter: report Links — combined upstream's SpanID/TraceID with our OriginData (1-line resolution in samples.go)
  • 94a3c725 auto-merge batch (8 upstream commits)
  • aecc98c9 Feat: filter unneeded mappings in SynchronizeProcess — accepted upstream's process.Mappingprocess.RawMapping rename; migrated fork-only interpreter/luajit to the new type; preserved fork's fileToDebugID and pid fields on v8Instance
  • 2e22db57 auto-merge batch (9 upstream commits)
  • 927a75e8 kernel: bump minimal Linux kernel to 5.10 — accepted upstream's removal of hasBatchOperations runtime detection (always-on now); kept fork's traceBufferSizeMultiplier field; kept fork's bpf_probe_read_user_str and bpf_get_attach_cookie BPF helper definitions in bpfdefs.h. BPF blobs rebuilt.

Test plan

  • go test -run ^$ ./...
  • make test
  • CI green

@CLAassistant
Copy link
Copy Markdown

CLAassistant commented Apr 29, 2026

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.
1 out of 10 committers have signed the CLA.

✅ gnurizen
❌ christos68k
❌ rushabh-exe
❌ rogercoll
❌ florianl
❌ AntoxaBarin
❌ wehzzz
❌ korniltsev-grafanista
❌ dmathieu
❌ dalehamel
You have signed the CLA already but the status is still pending? Let us recheck it.

@gnurizen gnurizen force-pushed the claude/upstream-merge-continued-20260429-094520 branch 8 times, most recently from 071444c to 168a7f5 Compare May 5, 2026 00:43
@gnurizen gnurizen marked this pull request as draft May 5, 2026 12:08
@gnurizen gnurizen force-pushed the claude/upstream-merge-continued-20260429-094520 branch 2 times, most recently from ff01447 to 0857010 Compare May 19, 2026 00:29
renovate Bot and others added 18 commits May 19, 2026 06:04
…202613 (open-telemetry#1283)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…2613 (open-telemetry#1284)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Timo Teräs <timo.teras@iki.fi>
Signed-off-by: Florian Lehner <florian.lehner@elastic.co>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Florian Lehner <florian.lehner@elastic.co>
…en-telemetry#1259)

Signed-off-by: Florian Lehner <florian.lehner@elastic.co>
Co-authored-by: Christos Kalkanis <christos.kalkanis@elastic.co>
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>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Signed-off-by: Florian Lehner <florian.lehner@elastic.co>
…Info (open-telemetry#1294)

Co-authored-by: Florian Lehner <florianl@users.noreply.github.com>
renovate Bot and others added 19 commits May 19, 2026 06:04
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>
…try#1306)

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

Co-authored-by: Timo Teräs <timo.teras@iki.fi>
Co-authored-by: Florian Lehner <florian.lehner@elastic.co>
Co-authored-by: Christos Kalkanis <christos.kalkanis@elastic.co>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Signed-off-by: Florian Lehner <florian.lehner@elastic.co>
Co-authored-by: Florian Lehner <florian.lehner@elastic.co>
Co-authored-by: Christos Kalkanis <christos.kalkanis@elastic.co>
…try#1321)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Signed-off-by: Florian Lehner <florian.lehner@elastic.co>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Florian Lehner <florian.lehner@elastic.co>
Signed-off-by: Florian Lehner <florian.lehner@elastic.co>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Signed-off-by: Florian Lehner <florian.lehner@elastic.co>
Upstream commit 927a75e bumped the minimum supported Linux kernel to
5.10. The 5.4 distro QEMU job exercises a kernel that's no longer
supported, so it fails on the new BPF code.
Tools.mod went stale relative to its dependency graph after the upstream
merges; CI's make test-junit run (which exercises gotestsum via -modfile=tools.mod)
fails the strict tidy check. Run go mod tidy -modfile=tools.mod to bring it
back in line.
@gnurizen gnurizen force-pushed the claude/upstream-merge-continued-20260429-094520 branch from 0857010 to dc5e65d Compare May 19, 2026 10:04
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.