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

Calculate and add fetch size in gRPC render #508

Merged
merged 1 commit into from
Dec 12, 2022
Merged

Calculate and add fetch size in gRPC render #508

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 8 additions & 4 deletions carbonserver/render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,10 +598,12 @@ func (listener *CarbonserverListener) fetchData(metric, pathExpression string, f
return multi, nil
}

func (listener *CarbonserverListener) streamMetrics(stream grpcv2.CarbonV2_RenderServer, responseChan chan response, storeAndGetMetrics bool) (responses []response, metricsFetched, valuesFetched int, err error) {
func (listener *CarbonserverListener) streamMetrics(stream grpcv2.CarbonV2_RenderServer, responseChan chan response, storeAndGetMetrics bool) (responses []response, metricsFetched, valuesFetched, fetchSize int, err error) {
var metricAccessBatch []string
for renderResponse := range responseChan {
err = stream.Send(renderResponse.proto2())
protoRes := renderResponse.proto2()
fetchSize += protoRes.SizeVT()
err = stream.Send(protoRes)
if err != nil {
return
}
Expand Down Expand Up @@ -676,6 +678,7 @@ func (listener *CarbonserverListener) Render(req *protov2.MultiFetchRequest, str

metricsFetched := 0
valuesFetched := 0
fetchSize := 0
// TODO: should chan buffer size be configurable?
responseChan := make(chan response, 1000)
var fromCache bool
Expand All @@ -693,7 +696,7 @@ func (listener *CarbonserverListener) Render(req *protov2.MultiFetchRequest, str
metricGlobMap := getMetricGlobMapFromExpandedGlobs(expandedGlobs)
go listener.prepareDataStream(ctx, format, targets, metricGlobMap, responseChan)
var responses []response
responses, metricsFetched, valuesFetched, err = listener.streamMetrics(stream, responseChan, getMetrics)
responses, metricsFetched, valuesFetched, fetchSize, err = listener.streamMetrics(stream, responseChan, getMetrics)
return responses, err
}

Expand All @@ -715,7 +718,7 @@ func (listener *CarbonserverListener) Render(req *protov2.MultiFetchRequest, str
}
close(responseChan)
}()
_, metricsFetched, valuesFetched, err = listener.streamMetrics(stream, responseChan, false)
_, metricsFetched, valuesFetched, fetchSize, err = listener.streamMetrics(stream, responseChan, false)
} else {
atomic.AddUint64(&listener.metrics.QueryCacheMiss, 1)
}
Expand Down Expand Up @@ -747,6 +750,7 @@ func (listener *CarbonserverListener) Render(req *protov2.MultiFetchRequest, str
return status.New(codes.NotFound, "no metrics found").Err()
}

atomic.AddUint64(&listener.metrics.FetchSize, uint64(fetchSize))
logger.Info("fetch served",
zap.Duration("runtime_seconds", time.Since(t0)),
zap.Bool("query_cache_enabled", listener.streamingQueryCacheEnabled),
Expand Down