Skip to content

Fix invalid FPM status page response content when using the OpenMetrics format - #7843

Closed
ste93cry wants to merge 1 commit into
php:PHP-8.1from
ste93cry:fix-fpm-openmetrics-response-invalid-format
Closed

ste93cry wants to merge 1 commit into
php:PHP-8.1from
ste93cry:fix-fpm-openmetrics-response-invalid-format

Conversation

@ste93cry

Copy link
Copy Markdown
Contributor

This little change fixes #7842 by adding the missing # EOF\n line required by the OpenMetrics format specs when using the openmetrics query parameter

@cmb69

cmb69 commented Dec 28, 2021

Copy link
Copy Markdown
Member

@WyriHaximus, since you did PR #5723, could you please check this?

@cmb69 cmb69 linked an issue Dec 28, 2021 that may be closed by this pull request
Comment thread sapi/fpm/fpm/fpm_status.c Resolved
@WyriHaximus

Copy link
Copy Markdown
Contributor

@cmb69 @ste93cry Looks perfect to me, a bit embarrassed I missed this when filing #5723 but glad this was discovered so early in 8.1 lifetime 👍 . You probably want to have @bukka review it as well as #5723 was my first PR to PHP :).

@bukka bukka closed this in 46bec6d Jan 4, 2022

@bukka bukka left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@ste93cry
ste93cry deleted the fix-fpm-openmetrics-response-invalid-format branch January 4, 2022 23:05
@ste93cry

Copy link
Copy Markdown
Contributor Author

According to the CHANGELOG of the 8.1 branch, this PR should have been released with version 8.1.2. However, it seems that it didn't and it doesn't appear under 8.1.3 either 🤔 Has this fix been lost in the release or will the CHANGELOG be amended before the next release?

@cmb69

cmb69 commented Jan 21, 2022

Copy link
Copy Markdown
Member

There was an overlap (the PR got merged just after 8.1.2RC1 had been tagged), so the fix will ship only for 8.1.3. I'm going to fix the changelog.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Invalid OpenMetrics response format returned by FPM status page

4 participants