Skip to content

refactor(cni): indent error flow in findOvnMp0IP#1062

Merged
MrAlias merged 2 commits intoopen-telemetry:mainfrom
pellared:ref-err-hand
Jan 12, 2026
Merged

refactor(cni): indent error flow in findOvnMp0IP#1062
MrAlias merged 2 commits intoopen-telemetry:mainfrom
pellared:ref-err-hand

Conversation

@pellared
Copy link
Copy Markdown
Member

@pellared pellared commented Jan 8, 2026

Follow https://go.dev/wiki/CodeReviewComments#indent-error-flow

  • Reduce nesting
  • Return early
  • Error checking first

@pellared pellared requested a review from a team as a code owner January 8, 2026 20:17
@codecov
Copy link
Copy Markdown

codecov Bot commented Jan 8, 2026

Codecov Report

❌ Patch coverage is 75.00000% with 7 lines in your changes missing coverage. Please review.
✅ Project coverage is 47.27%. Comparing base (70c388d) to head (d2df00a).
⚠️ Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
pkg/kube/kubecache/meta/cni/ovn_kubernetes.go 75.00% 6 Missing and 1 partial ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1062   +/-   ##
=======================================
  Coverage   47.26%   47.27%           
=======================================
  Files         261      261           
  Lines       27455    27458    +3     
=======================================
+ Hits        12977    12981    +4     
+ Misses      13612    13610    -2     
- Partials      866      867    +1     
Flag Coverage Δ
integration-test 22.82% <0.00%> (-0.01%) ⬇️
integration-test-arm 0.00% <0.00%> (ø)
k8s-integration-test 2.65% <13.04%> (+<0.01%) ⬆️
oats-test 0.00% <0.00%> (ø)
unittests 48.52% <91.30%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Copy link
Copy Markdown
Contributor

@grcevski grcevski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@grcevski
Copy link
Copy Markdown
Contributor

grcevski commented Jan 9, 2026

There seems to be a flaky test, it was recently added:

--- FAIL: TestServiceGraphConnectionType (20.00s)
    metrics_test.go:513: 
        	Error Trace:	/home/runner/work/opentelemetry-ebpf-instrumentation/opentelemetry-ebpf-instrumentation/pkg/export/otel/metrics_test.go:513
        	            				/home/runner/work/opentelemetry-ebpf-instrumentation/opentelemetry-ebpf-instrumentation/pkg/export/otel/metrics_svc_graph_test.go:115
        	Error:      	timeout while waiting for event in input channel
        	Test:       	TestServiceGraphConnectionType
        	Messages:   	timeout: 20s

If you'd like to, you can add test.Skip() on it, since it's unrelated.

@marctc it seems that the new connection type test for service graph that you added keeps on failing on this PR, I re-ran 3 times.

@pellared
Copy link
Copy Markdown
Member Author

@open-telemetry/ebpf-instrumentation-maintainers, is it good to merge? 😉

@grcevski
Copy link
Copy Markdown
Contributor

I'm good to merge, we just need to do something about the test. Do you want me to make a PR to disable it and you can sync with main then? I kicked off a re-run one more time to get a green CI.

@grcevski
Copy link
Copy Markdown
Contributor

I made a PR here: #1080, we'll merge as soon as we get green CI and then we can hopefully merge this.

@grcevski
Copy link
Copy Markdown
Contributor

The PR is merged, can you please merge main in so we can get green CI? #1080

@pellared
Copy link
Copy Markdown
Member Author

@grcevski, done

@MrAlias MrAlias merged commit 6f32682 into open-telemetry:main Jan 12, 2026
43 checks passed
@MrAlias MrAlias added this to the v0.5.0 milestone Feb 10, 2026
@MrAlias MrAlias mentioned this pull request Feb 10, 2026
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.

4 participants