-
Notifications
You must be signed in to change notification settings - Fork 63
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
Fix access log parsing for custom log format #346
Merged
Merged
Conversation
This file contains 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
✅ Deploy Preview for agent-public-docs canceled.
|
nkashiv
changed the title
Access log parsing
Fix access log parsing for custom log format
Jun 12, 2023
nkashiv
force-pushed
the
access-log-parsing
branch
from
June 12, 2023 23:58
8d06ffd
to
a6c86b5
Compare
achawla2012
reviewed
Jun 13, 2023
achawla2012
approved these changes
Jun 13, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
ryepup
approved these changes
Jun 13, 2023
aphralG
approved these changes
Jun 19, 2023
oliveromahony
approved these changes
Jun 20, 2023
Dean-Coakley
approved these changes
Jun 20, 2023
craigell
approved these changes
Jun 27, 2023
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.
Proposed changes
This PR aims to fix the bug where if a user has an access log format with a variable that is not present in the
logVarMap
https://github.com/nkashiv/agent/blob/main/src/core/metrics/sources/nginx_access_log.go#L33 then the access log parsing fails and no access log metric is collected.For example, the following log format will cause an error because it contains
$upstream_addr
which is not present in the map. A user can also have a custom variable defined which will break the parsing.Added a unit test in
nginx_access_log_test.go
to demonstrate this fix.Checklist
Before creating a PR, run through this checklist and mark each as complete.
CONTRIBUTING
documentmake install-tools
and have attached any dependency changes to this pull requestREADME.md
)