Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup UID/InstanceID duplicity. Also remove override_instance_id config option #1125

Merged
merged 2 commits into from
Sep 3, 2024

Conversation

mariomac
Copy link
Contributor

@mariomac mariomac commented Sep 3, 2024

Having UID and Instance fields in the svc.ID allowed users to override the instance ID. This was created as a troubleshooting feature that would only work when the Beyla instance instrumented a single application instance (sidecar mode).

This feature adds some complexity to the code, but still has remained unused (both because we haven't required to troubleshoot instance IDs, and because Beyla usually instruments multiple instances, so using this feature would break the instrumentation).

Removing the duplicity, and the overriding feature, fixes one of the two described duplicities in the issue #1124

After this is merged, the simpler code would facilitate removing the other duplicity from the aforementioned issue.

@codecov-commenter
Copy link

codecov-commenter commented Sep 3, 2024

Codecov Report

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

Project coverage is 82.05%. Comparing base (9a20dda) to head (db24bed).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
pkg/internal/traces/read_decorator.go 85.71% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1125      +/-   ##
==========================================
+ Coverage   82.03%   82.05%   +0.01%     
==========================================
  Files         140      140              
  Lines       11574    11562      -12     
==========================================
- Hits         9495     9487       -8     
+ Misses       1557     1553       -4     
  Partials      522      522              
Flag Coverage Δ
integration-test 57.46% <90.90%> (+0.14%) ⬆️
k8s-integration-test 59.26% <90.90%> (-0.01%) ⬇️
oats-test 36.87% <63.63%> (-0.03%) ⬇️
unittests 52.27% <72.72%> (-0.09%) ⬇️

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.

Copy link
Contributor

@marctc marctc left a comment

Choose a reason for hiding this comment

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

🔪

@mariomac mariomac merged commit ecc9dc1 into grafana:main Sep 3, 2024
8 checks passed
@mariomac mariomac deleted the uid-cleanup branch September 3, 2024 12:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants