-
Notifications
You must be signed in to change notification settings - Fork 174
[release-0.4] Add service metric and use ringbuf to report metrics #701
Copy link
Copy link
Closed
Description
Manual cherrypick required.
#688 failed to apply on top of branch "release-0.4":
Applying: Unified reporting of metrics/logs: remove metrics report
Using index info to reconstruct a base tree...
M bpf/kmesh/probes/metrics.h
M bpf/kmesh/probes/probe.h
Falling back to patching base and 3-way merge...
Auto-merging bpf/kmesh/probes/probe.h
CONFLICT (modify/delete): bpf/kmesh/probes/metrics.h deleted in Unified reporting of metrics/logs: remove metrics report and modified in HEAD. Version HEAD of bpf/kmesh/probes/metrics.h left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Unified reporting of metrics/logs: remove metrics report
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Reactions are currently unavailable
Metadata
Metadata
Assignees
Labels
No labels