fix: apply global otlp config to tenant config only when it is updated in the overrides - #19213
Merged
Conversation
This was referenced Jun 23, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
When
default_resource_attributes_as_index_labelsis set, we add the list of attributes to promote as labels to the default and per-tenantotlp_configin the limits. However, while loading per-tenant overrides, we inherit the default limits configuration and apply the overrides on top of it to apply only the changes from the overrides. It causes us to copy thedefault_resource_attributes_as_index_labelstwice for the tenants who have an override but do not have any changes to theotlp_config.This PR fixes the issue by applying the global otlp config only to the tenants with an update in their
otlp_config.The
otlp_configwould be inherited from the default config without any change for others.Checklist