Issue 3948: user cfg override fix - #4741
Merged
Merged
Conversation
ruslan-mikhailov
force-pushed
the
issue-3945_cfg-override-fix
branch
from
February 24, 2025 10:38
a278471 to
fa39e2f
Compare
ruslan-mikhailov
marked this pull request as ready for review
February 24, 2025 12:52
ruslan-mikhailov
requested review from
electron0zero,
ie-pham,
javiermolinar,
joe-elliott,
mapno,
mdisibio,
stoewer,
yvrhdn and
zalegrala
as code owners
February 24, 2025 12:52
ruslan-mikhailov
force-pushed
the
issue-3945_cfg-override-fix
branch
from
February 24, 2025 14:52
fa39e2f to
d184430
Compare
mapno
approved these changes
Feb 24, 2025
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
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: Allows to put "span-metrics-size", "span-metrics-count", "span-metrics-latency" into user configurations overrides via API
Which issue(s) this PR fixes:
Fixes #3945
How it has been tested
Step 1. Run docker compose (here I used example/docker-compose/otel-collector-multitenant) with the following tempo.yaml:
Step 2. Check current configurations:
Expected results: HTTP status code 200,
metrics_generator.processorshas value["local-blocks"]Actual results:
{"forwarders":null,"cost_attribution":{},"metrics_generator":{"processors":["local-blocks"],"disable_collection":false,"collection_interval":"0s","processor":{"service_graphs":{"dimensions":null,"enable_client_server_prefix":false,"peer_attributes":null,"histogram_buckets":null},"span_metrics":{"dimensions":null,"enable_target_info":false,"filter_policies":null,"histogram_buckets":null,"target_info_excluded_dimensions":null}}}}Step 3. Check metrics:
Step 4. Publish "local-blocks", "span-metrics-size", "span-metrics-count", "span-metrics-latency":
Expected results: HTTP status code 200, no errors in logs
Production image results: HTTP status code 400, body:
Step 5. Check resulted configurations:
Expected results:
metrics_generator.processorshas value["local-blocks", "span-metrics-size", "span-metrics-count", "span-metrics-latency"]Actual results:
{"forwarders":null,"cost_attribution":{},"metrics_generator":{"processors":["span-metrics-size","span-metrics-count","span-metrics-latency","local-blocks"],"disable_collection":false,"collection_interval":"0s","processor":{"service_graphs":{"dimensions":null,"enable_client_server_prefix":false,"peer_attributes":null,"histogram_buckets":null},"span_metrics":{"dimensions":null,"enable_target_info":false,"filter_policies":null,"histogram_buckets":null,"target_info_excluded_dimensions":null}}}}Step 6. Check metrics
Checklist
(Tested manually)
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]