Fix PR conflict

[grcevski]

Two PRs conflicted and we have failed integration tests related to NetO11y in main.

[codecov-commenter]

Codecov Report

Attention: Patch coverage is 50.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 80.29%. Comparing base (b3b01db) to head (563c9b8).

Files	Patch %	Lines
pkg/components/beyla.go	50.00%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##             main    #1018       +/-   ##
===========================================
+ Coverage   66.96%   80.29%   +13.33%     
===========================================
  Files         137      137               
  Lines       10963    10956        -7     
===========================================
+ Hits         7341     8797     +1456     
+ Misses       3130     1677     -1453     
+ Partials      492      482       -10     

Flag	Coverage Δ
integration-test	55.04% <50.00%> (?)
k8s-integration-test	57.64% <50.00%> (?)
oats-test	37.31% <0.00%> (+0.02%)	⬆️
unittests	50.76% <50.00%> (+0.35%)	⬆️

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.