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

Support standard annotations for OTEL generic resource attributes #1569

Merged
merged 4 commits into from
Jan 24, 2025

Conversation

mariomac
Copy link
Contributor

@mariomac mariomac commented Jan 23, 2025

This enables setting resource attributes in an OTEL-operator compliant manner, by letting the user to define resource.opentelemetry.io/ annotations.

This will also allow extending the default values to use *.kubernetes.io/annotations.

@mariomac mariomac requested a review from a team as a code owner January 23, 2025 15:18
Copy link
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!

Copy link

codecov bot commented Jan 23, 2025

Codecov Report

Attention: Patch coverage is 90.90909% with 6 lines in your changes missing coverage. Please review.

Project coverage is 71.25%. Comparing base (cbb6303) to head (fc489ac).
Report is 5 commits behind head on main.

Files with missing lines Patch % Lines
pkg/internal/kube/store.go 89.36% 2 Missing and 3 partials ⚠️
pkg/transform/k8s.go 92.85% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1569      +/-   ##
==========================================
+ Coverage   67.65%   71.25%   +3.60%     
==========================================
  Files         197      197              
  Lines       19689    19756      +67     
==========================================
+ Hits        13320    14077     +757     
+ Misses       5681     5000     -681     
+ Partials      688      679       -9     
Flag Coverage Δ
integration-test 53.05% <0.00%> (-0.24%) ⬇️
k8s-integration-test 53.67% <86.36%> (?)
oats-test 32.58% <0.00%> (-1.82%) ⬇️
unittests 47.36% <81.81%> (+0.06%) ⬆️

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.

@grcevski
Copy link
Contributor

Looks like the integration tests failed because of config error:

autoinstrumenter-1  | time=2025-01-23T16:18:59.801Z level=ERROR msg="wrong configuration" error="parsing YAML configuration: yaml: unmarshal errors:\n  line 16: cannot unmarshal !!str `deploym...` into []string"

@mariomac mariomac merged commit cda3539 into grafana:main Jan 24, 2025
13 checks passed
@mariomac mariomac deleted the res-metadata-attrs branch January 24, 2025 09:24
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.

2 participants