refactor: Remove unnecessary spanlogger usage #13255
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
slim-bean
reviewed
Jun 21, 2024
pkg/logql/engine.go
Outdated
| @@ -265,7 +263,7 @@ func (q *query) Exec(ctx context.Context) (logqlmodel.Result, error) { | |||
| queueTime, _ := ctx.Value(httpreq.QueryQueueTimeHTTPHeader).(time.Duration) | |||
|
|
|||
| statResult := statsCtx.Result(time.Since(start), queueTime, q.resultLength(data)) | |||
| statResult.Log(level.Debug(spLogger)) | |||
| statResult.LogWithSpan(sp) | |||
There was a problem hiding this comment.
I wonder about a little bit different approach where we leave the original stats.Log() method and use that to print the stats in metrics.go.
But here do: sp.LogKV(statResult.KVList()...)
There was a problem hiding this comment.
i like your style more but fyi we use LogWithSpan at other places. I'll try using LogKV there too then.
There was a problem hiding this comment.
pushed 0c9570a addressing it
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.
What this PR does / why we need it:
Historically, we've been using
spanloggerto enrich our spans. That isn't the right usage for it (as of now), as they'll be emitting log lines. Our current usage is causing:With this PR I'm moving away from
spanloggerall places where the log message is too bad or nonexistent. That's because these cases are indicating we don't care about that log line at all, and only about the data injected in the span.Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Checklist
CONTRIBUTING.mdguide (required)featPRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.docs/sources/setup/upgrade/_index.mdproduction/helm/loki/Chart.yamland updateproduction/helm/loki/CHANGELOG.mdandproduction/helm/loki/README.md. Example PRdeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR