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.

Sign up for GitHub

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

Jump to bottom

fix(inputs.phpfpm): Use logger without causing panic #14489

Merged
merged 3 commits into from
Jan 2, 2024
Merged

fix(inputs.phpfpm): Use logger without causing panic #14489

merged 3 commits into from
Jan 2, 2024

Conversation

elchenberg
Copy link
Contributor

Summary

Use logger without causing panic.

Checklist

  • No AI generated code was used in this PR

Related issues

Resolves #14485

@telegraf-tiger
Copy link
Contributor

Thanks so much for the pull request!
🤝 ✒️ Just a reminder that the CLA has not yet been signed, and we'll need it before merging. Please sign the CLA when you get a chance, then post a comment here saying !signed-cla

@telegraf-tiger telegraf-tiger bot added fix pr to fix corresponding bug plugin/input 1. Request for new input plugins 2. Issues/PRs that are related to input plugins labels Dec 21, 2023
@elchenberg elchenberg mentioned this pull request Dec 21, 2023
Closed
@elchenberg elchenberg force-pushed the inputs-phpfpm-fix-log-without-panic branch from cf4842b to a6e0207 Compare December 21, 2023 10:59
@elchenberg
Copy link
Contributor Author

!signed-cla

@elchenberg
fix: use logger without causing panic
f00de74 
Signed-off-by: elchenberg <elchenberg@users.noreply.github.com>
@elchenberg elchenberg force-pushed the inputs-phpfpm-fix-log-without-panic branch from a6e0207 to f00de74 Compare December 21, 2023 12:43
powersj
powersj reviewed Dec 21, 2023
View reviewed changes
Copy link
Contributor

@powersj powersj left a comment

Choose a reason for hiding this comment

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

Thanks for the PR - one comment inline

plugins/inputs/phpfpm/phpfpm_test.go Show resolved Hide resolved
@powersj powersj self-assigned this Dec 21, 2023
@telegraf-tiger
Copy link
Contributor

Download PR build artifacts for linux_amd64.tar.gz, darwin_arm64.tar.gz, and windows_amd64.zip.
Downloads for additional architectures and packages are available below.

👍 This pull request doesn't change the Telegraf binary size

📦 Click here to get additional PR build artifacts

Artifact URLs

DEB RPM TAR GZ ZIP
amd64.deb aarch64.rpm darwin_amd64.tar.gz windows_amd64.zip
arm64.deb armel.rpm darwin_arm64.tar.gz windows_arm64.zip
armel.deb armv6hl.rpm freebsd_amd64.tar.gz windows_i386.zip
armhf.deb i386.rpm freebsd_armv7.tar.gz
i386.deb ppc64le.rpm freebsd_i386.tar.gz
mips.deb riscv64.rpm linux_amd64.tar.gz
mipsel.deb s390x.rpm linux_arm64.tar.gz
ppc64el.deb x86_64.rpm linux_armel.tar.gz
riscv64.deb linux_armhf.tar.gz
s390x.deb linux_i386.tar.gz
linux_mips.tar.gz
linux_mipsel.tar.gz
linux_ppc64le.tar.gz
linux_riscv64.tar.gz
linux_s390x.tar.gz

powersj
powersj approved these changes Jan 2, 2024
View reviewed changes
Copy link
Contributor

@powersj powersj left a comment

Choose a reason for hiding this comment

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

Thank you!

@powersj powersj added the ready for final review This pull request has been reviewed and/or tested by multiple users and is ready for a final review. label Jan 2, 2024
@powersj powersj assigned srebhan and unassigned powersj Jan 2, 2024
srebhan
srebhan approved these changes Jan 2, 2024
View reviewed changes
Copy link
Member

@srebhan srebhan left a comment

Choose a reason for hiding this comment

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

Thanks for the fix @elchenberg!

@srebhan srebhan merged commit 1eb86dc into influxdata:master Jan 2, 2024
26 checks passed
@github-actions github-actions bot added this to the v1.29.2 milestone Jan 2, 2024
powersj pushed a commit that referenced this pull request Jan 8, 2024
@elchenberg @powersj
fix(inputs.phpfpm): Use logger without causing panic (#14489)
1e450a3 
Signed-off-by: elchenberg <elchenberg@users.noreply.github.com>
(cherry picked from commit 1eb86dc)
@Porkepix Porkepix mentioned this pull request Jan 8, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@srebhan srebhan srebhan approved these changes

@powersj powersj powersj approved these changes

Assignees

@srebhan srebhan

Labels
fix pr to fix corresponding bug plugin/input 1. Request for new input plugins 2. Issues/PRs that are related to input plugins ready for final review This pull request has been reviewed and/or tested by multiple users and is ready for a final review.
Projects
None yet
Milestone
v1.29.2
Development

Successfully merging this pull request may close these issues.

phpfpm input plugin panics in fcgi mode with json format
3 participants
@elchenberg @powersj @srebhan