Skip to content

fix: logging for clickhouse query summary (no header) #161

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

Merged
merged 1 commit into from
May 18, 2021
Merged

fix: logging for clickhouse query summary (no header) #161

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions helper/clickhouse/clickhouse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,15 +247,21 @@ func reader(ctx context.Context, dsn string, query string, postBody io.Reader, g
// chproxy overwrite our query id. So read it again
chQueryID = resp.Header.Get("X-ClickHouse-Query-Id")

summary := make(map[string]string)
err = json.Unmarshal([]byte(resp.Header.Get("X-Clickhouse-Summary")), &summary)
if err == nil {
// TODO: use in carbon metrics sender when it will be implemented
fields := make([]zapcore.Field, 0, len(summary))
for k, v := range summary {
fields = append(fields, zap.String(k, v))
summaryHeader := resp.Header.Get("X-Clickhouse-Summary")
if len(summaryHeader) > 0 {
summary := make(map[string]string)
err = json.Unmarshal([]byte(summaryHeader), &summary)
if err == nil {
// TODO: use in carbon metrics sender when it will be implemented
fields := make([]zapcore.Field, 0, len(summary))
for k, v := range summary {
fields = append(fields, zap.String(k, v))
}
logger = logger.With(fields...)
} else {
logger.Warn("query", zap.Error(err), zap.String("clickhouse-summary", summaryHeader))
err = nil
}
logger = logger.With(fields...)
}

// check for return 5xx error, may be 502 code if clickhouse accesed via reverse proxy
Expand Down