Skip to content

bugfix: Decouple native histogram ingestions and protobuf parsing#13987

Merged
ArthurSens merged 1 commit intomainfrom
nativeHis-flag-ingestion
Apr 25, 2024
Merged

bugfix: Decouple native histogram ingestions and protobuf parsing#13987
ArthurSens merged 1 commit intomainfrom
nativeHis-flag-ingestion

Conversation

@ArthurSens
Copy link
Copy Markdown
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

@ArthurSens ArthurSens requested a review from krajorama April 24, 2024 14:02
@krajorama
Copy link
Copy Markdown
Member

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

Copy link
Copy Markdown
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

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 ArthurSens force-pushed the nativeHis-flag-ingestion branch from 3d25789 to 7aacef9 Compare April 24, 2024 20:03
@ArthurSens
Copy link
Copy Markdown
Member Author

Thanks, fixed the two comments :)

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

@krajorama
Copy link
Copy Markdown
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
Copy Markdown
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
Copy Markdown
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
@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