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

bugfix: Decouple native histogram ingestions and protobuf parsing #13987

Merged
merged 1 commit into from
Apr 25, 2024

Conversation

ArthurSens
Copy link
Member

Up until this point, if a scrape was done with the protobuf format Prometheus would always try to ingest native histograms even with the feature flag disabled. This causes problems with other feature-flags that depend on the protobuf format, like 'created-timestamp-zero-ingestion'. This commit decouples native histogram parsing from ingestion, making sure ingestion only happens when the 'native-histogram' feature-flag is enabled.

Fix #13920

@krajorama
Copy link
Member

I've tested the fix locally, the error does disappear, now for the review.

Copy link
Member

@krajorama krajorama left a comment

Choose a reason for hiding this comment

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

Looks good, two nit comments

scrape/manager.go Outdated Show resolved Hide resolved
scrape/scrape.go Outdated Show resolved Hide resolved
Up until this point, if a scrape was done with the protobuf format Prometheus would always try to ingest native histograms even with the feature flag disabled. This causes problems with other feature-flags that depend on the protobuf format, like 'created-timestamp-zero-ingestion'. This commit decouples native histogram parsing from ingestion, making sure ingestion only happens when the 'native-histogram' feature-flag is enabled.

Signed-off-by: Arthur Silva Sens <[email protected]>
@ArthurSens
Copy link
Member Author

Thanks, fixed the two comments :)

I wonder if the base branch should be release-2.52 instead of main 🤔

@krajorama
Copy link
Member

Thanks, fixed the two comments :)

I wonder if the base branch should be release-2.52 instead of main 🤔

The bug concerns experimental features and has a workaround, so I'm personally ok with either. On the other hand 2.53 is pretty far away so it makes sense to do it on 2.52

Copy link
Member

@krajorama krajorama left a comment

Choose a reason for hiding this comment

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

LGTM

@ArthurSens
Copy link
Member Author

Thanks, fixed the two comments :)
I wonder if the base branch should be release-2.52 instead of main 🤔

The bug concerns experimental features and has a workaround, so I'm personally ok with either. On the other hand 2.53 is pretty far away so it makes sense to do it on 2.52

I'll leave it for 2.53 because the release process started a few days ago already 😬

@ArthurSens ArthurSens merged commit 0305490 into main Apr 25, 2024
40 checks passed
@ArthurSens ArthurSens deleted the nativeHis-flag-ingestion branch April 25, 2024 13:56
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.

Feature Flag "Created Timestamps Zero Injection" requires enabled "Native Histograms"
2 participants