Advance upstream-merge through 927a75e8 (kernel 5.10 bump)#261
Draft
gnurizen wants to merge 37 commits into
Draft
Advance upstream-merge through 927a75e8 (kernel 5.10 bump)#261gnurizen wants to merge 37 commits into
gnurizen wants to merge 37 commits into
Conversation
|
|
071444c to
168a7f5
Compare
ff01447 to
0857010
Compare
…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>
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.
0857010 to
dc5e65d
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 at24fddb51 ruby: add DTV-based TLS access for ruby_current_ecwhich has metric-ID collisions with our fork that need manual coordination.Stack
25d622a1auto-merge batch (15 upstream commits, go.sum auto-tidied)efd37c61reporter: report Links — combined upstream'sSpanID/TraceIDwith ourOriginData(1-line resolution insamples.go)94a3c725auto-merge batch (8 upstream commits)aecc98c9Feat: filter unneeded mappings in SynchronizeProcess — accepted upstream'sprocess.Mapping→process.RawMappingrename; migrated fork-onlyinterpreter/luajitto the new type; preserved fork'sfileToDebugIDandpidfields onv8Instance2e22db57auto-merge batch (9 upstream commits)927a75e8kernel: bump minimal Linux kernel to 5.10 — accepted upstream's removal ofhasBatchOperationsruntime detection (always-on now); kept fork'straceBufferSizeMultiplierfield; kept fork'sbpf_probe_read_user_strandbpf_get_attach_cookieBPF helper definitions inbpfdefs.h. BPF blobs rebuilt.Test plan
go test -run ^$ ./...make test