Merge 11 upstream commits (up to codeql-action v4.34.1)#255
Merged
Conversation
…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
|
|
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.
Summary
go test -run ^$ ./...+make test)Upstream commits included
4c9ae93efix(ruby): regex match 3.3.10 (fix(ruby): regex match 3.3.10 open-telemetry/opentelemetry-ebpf-profiler#1256)fa7b0ccdUpgrade collector to v1.54.0 (Upgrade collector to v1.54.0 open-telemetry/opentelemetry-ebpf-profiler#1266)c7e873a1ruby: support EC offset extraction for statically-linked Ruby (ruby: support EC offset extraction for statically-linked Ruby open-telemetry/opentelemetry-ebpf-profiler#1227)18242e47fix(deps): update module google.golang.org/grpc to v1.79.3 [security] (fix(deps): update module google.golang.org/grpc to v1.79.3 [security] open-telemetry/opentelemetry-ebpf-profiler#1268)41302aadchore(deps): update github actions (chore(deps): update github actions open-telemetry/opentelemetry-ebpf-profiler#1269)2dcbb754chore(deps): lock file maintenance (chore(deps): lock file maintenance open-telemetry/opentelemetry-ebpf-profiler#1272)2670586afix(deps): update go dependencies (fix(deps): update go dependencies open-telemetry/opentelemetry-ebpf-profiler#1271)fbc3686achore(deps): update ocb (manifest) dependencies (chore(deps): update ocb (manifest) dependencies open-telemetry/opentelemetry-ebpf-profiler#1270)6ff0091cPass non-zero mapID into UpdateStackDeltaPages to fix cleanups (Pass non-zero mapID into UpdateStackDeltaPages to fix cleanups open-telemetry/opentelemetry-ebpf-profiler#1274)2e47991dfix(deps): update go dependencies (fix(deps): update go dependencies open-telemetry/opentelemetry-ebpf-profiler#1276)4e8bd96achore(deps): update github/codeql-action action to v4.34.1 (chore(deps): update github/codeql-action action to v4.34.1 open-telemetry/opentelemetry-ebpf-profiler#1277)Stopped before
4ea09404Switch 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
Generated by
tools/upstream-merge.sh