Resolve comments

open-telemetry · Dec 10, 2020 · 273fa79 · 273fa79
1 parent 71cfcf8
commit 273fa79
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/exporter/prometheusremotewriteexporter/exporter.go b/exporter/prometheusremotewriteexporter/exporter.go
@@ -22,6 +22,7 @@ import (
  "errors"
  "fmt"
  "io"
+ "math"
  "net/http"
  "net/url"
  "sync"
@@ -275,11 +276,12 @@ func (prwe *PrwExporter) export(ctx context.Context, tsMap map[string]*prompb.Ti
  var mu sync.Mutex
  var wg sync.WaitGroup
 
- wg.Add(maxConcurrentRequests) // used to wait for workers to be finished
+ concurrencyLimit := int(math.Min(maxConcurrentRequests, float64(len(requests))))
+ wg.Add(concurrencyLimit) // used to wait for workers to be finished
 
  // Run concurrencyLimit of workers until there
  // is no more requests to execute in the input channel.
- for i := 0; i < maxConcurrentRequests; i++ {
+ for i := 0; i < concurrencyLimit; i++ {
  go func() {
  defer wg.Done()
 

diff --git a/exporter/prometheusremotewriteexporter/helper.go b/exporter/prometheusremotewriteexporter/helper.go
@@ -240,8 +240,10 @@ func batchTimeSeries(tsMap map[string]*prompb.TimeSeries, maxBatchByteSize int)
  sizeOfCurrentBatch += sizeOfSeries
  }
 
- wrapped := convertTimeseriesToRequest(tsArray)
- requests = append(requests, wrapped)
+ if len(tsArray) != 0 {
+ wrapped := convertTimeseriesToRequest(tsArray)
+ requests = append(requests, wrapped)
+ }
 
  return requests, nil
 }