Skip to content

perf: limit goroutine usage while unmarshaling prometheus and influx points/values #909

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
crandles merged 1 commit into from
Jan 10, 2026
Merged

perf: limit goroutine usage while unmarshaling prometheus and influx points/values #909

Show file tree
Hide file tree
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
15 changes: 9 additions & 6 deletions pkg/backends/influxdb/influxql/unmarshal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@ import (
"encoding/json"
"errors"
"io"
"runtime"
"sort"
"sync"
"sync/atomic"
"time"

"github.com/trickstercache/trickster/v2/pkg/timeseries"
"github.com/trickstercache/trickster/v2/pkg/timeseries/dataset"
"github.com/trickstercache/trickster/v2/pkg/timeseries/epoch"
"golang.org/x/sync/errgroup"
)

// Unmarshal performs a standard unmarshal of the bytes into the InfluxDB Wire Format Document,
Expand Down Expand Up @@ -97,17 +98,18 @@ func UnmarshalTimeseriesReader(reader io.Reader, trq *timeseries.TimeRangeQuery)
sh.CalculateSize()
pts := make(dataset.Points, len(wfd.Results[i].SeriesList[j].Values))
var sz int64
var wg sync.WaitGroup
var eg errgroup.Group
eg.SetLimit(runtime.GOMAXPROCS(0))
errs := make([]error, len(wfd.Results[i].SeriesList[j].Values))
for vi, v := range wfd.Results[i].SeriesList[j].Values {
wg.Go(func() {
eg.Go(func() error {
pt, cols, err := pointFromValues(v, sh.TimestampField.OutputPosition)
if err != nil {
errs[vi] = err
return
return err
}
if pt.Epoch == 0 {
return
return nil
}
if vi == 0 {
for x := range cols {
Expand All @@ -117,9 +119,10 @@ func UnmarshalTimeseriesReader(reader io.Reader, trq *timeseries.TimeRangeQuery)
pts[vi] = pt
atomic.AddInt64(&sz, int64(pt.Size))
wfd.Results[i].SeriesList[j].Values[vi] = nil
return nil
})
}
wg.Wait()
eg.Wait()
if err := errors.Join(errs...); err != nil {
return nil, err
}
Expand Down
11 changes: 7 additions & 4 deletions pkg/backends/prometheus/model/timeseries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,17 @@ import (
"encoding/json"
"fmt"
"io"
"runtime"
"sort"
"strconv"
"sync"
"sync/atomic"
"time"

"github.com/trickstercache/trickster/v2/pkg/errors"
"github.com/trickstercache/trickster/v2/pkg/timeseries"
"github.com/trickstercache/trickster/v2/pkg/timeseries/dataset"
"github.com/trickstercache/trickster/v2/pkg/timeseries/epoch"
"golang.org/x/sync/errgroup"
)

// WFMatrixDocument is the Wire Format Document for prometheus range / timeseries
Expand Down Expand Up @@ -239,17 +240,19 @@ func populateSeries(ds *dataset.DataSet, result []*WFResult,
var ps int64 = 16
if !isVector && l > 0 {
pts = make(dataset.Points, l)
var wg sync.WaitGroup
var eg errgroup.Group
eg.SetLimit(runtime.GOMAXPROCS(0))
for i, v := range pr.Values {
wg.Go(func() {
eg.Go(func() error {
pt, _ := pointFromValues(v)
if pt.Epoch > 0 {
atomic.AddInt64(&ps, int64(pt.Size))
pts[i] = pt
}
return nil
})
}
wg.Wait()
eg.Wait()
} else if isVector && len(pr.Value) == 2 {
pts = make(dataset.Points, 1)
pt, _ := pointFromValues(pr.Value)
Expand Down
Loading