Fix incorrect metrics when serving static files #1255
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
|
We need to be careful here. If we put file path for each file instead of a pattern while calculating the http related metrics, it will become very very large. |
ccoVeille
reviewed
Nov 29, 2024
Comment on lines
+33
to
+37
|
|
||
| if path == "/" || strings.HasPrefix(path, "/static") || staticFileRegex.MatchString(r.URL.Path) { | ||
| path = r.URL.Path | ||
| } | ||
|
|
There was a problem hiding this comment.
Please don't use regexp for this.
You can use filepath.Ext
Something like this could work
Suggested change
| if path == "/" || strings.HasPrefix(path, "/static") || staticFileRegex.MatchString(r.URL.Path) { | |
| path = r.URL.Path | |
| } | |
| switch strings.ToLower(filepath.Ext(r.URL.Path)) { | |
| case "css", "js", "png", "jpg","jpeg","gif","ico","svg","txt","html","json","woff","woff2","ttf","eot","pdf": | |
| path = r.URL.Path | |
| } | |
| if path == "/" || strings.HasPrefix(path, "/static") { | |
| path = r.URL.Path | |
| } |
ccoVeille
reviewed
Nov 29, 2024
| @@ -21,11 +22,19 @@ type metrics interface { | |||
| func Metrics(metrics metrics) func(inner http.Handler) http.Handler { | |||
| return func(inner http.Handler) http.Handler { | |||
| return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | |||
| // Compile regex for common file extensions | |||
| staticFileRegex := regexp.MustCompile(`\.(css|js|png|jpg|jpeg|gif|ico|svg|txt|html|json|woff|woff2|ttf|eot|pdf)$`) | |||
There was a problem hiding this comment.
also, if you want to keep a regex, move it away from the method to a var in package level
Otherwise, you will compute the regex on each metrics call
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.
Pull Request Template
Description:
Checklist:
goimportandgolangci-lint.Thank you for your contribution!