Log warn for empty batch instead of error (#254)

exporter/clickhousemetricsexporter/exporter.go

@@ -37,7 +37,6 @@ import (
 	"github.com/SigNoz/signoz-otel-collector/usage"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/confighttp"
-	"go.opentelemetry.io/collector/consumer/consumererror"
 	"go.opentelemetry.io/collector/exporter"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/pmetric"
@@ -316,10 +315,10 @@ func (prwe *PrwExporter) export(ctx context.Context, tsMap map[string]*prompb.Ti
 	prwe.mux.Unlock()
 	var errs []error
 	// Calls the helper function to convert and batch the TsMap to the desired format
-	requests, err := batchTimeSeries(tsMap, maxBatchByteSize)
-	if err != nil {
-		errs = append(errs, consumererror.NewPermanent(err))
-		return errs
+	requests := batchTimeSeries(tsMap, maxBatchByteSize)
+	if requests == nil {
+		prwe.logger.Warn("empty batch, skipping")
+		return nil
 	}
 
 	input := make(chan *prompb.WriteRequest, len(requests))

exporter/clickhousemetricsexporter/helper.go

@@ -15,7 +15,6 @@
 package clickhousemetricsexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter"
 
 import (
-	"errors"
 	"log"
 	"math"
 	"sort"
@@ -249,9 +248,9 @@ func getPromMetricName(metric pmetric.Metric, ns string) string {
 }
 
 // batchTimeSeries splits series into multiple batch write requests.
-func batchTimeSeries(tsMap map[string]*prompb.TimeSeries, maxBatchByteSize int) ([]*prompb.WriteRequest, error) {
+func batchTimeSeries(tsMap map[string]*prompb.TimeSeries, maxBatchByteSize int) []*prompb.WriteRequest {
 	if len(tsMap) == 0 {
-		return nil, errors.New("invalid tsMap: cannot be empty map")
+		return nil
 	}
 
 	var requests []*prompb.WriteRequest
@@ -278,7 +277,7 @@ func batchTimeSeries(tsMap map[string]*prompb.TimeSeries, maxBatchByteSize int)
 		requests = append(requests, wrapped)
 	}
 
-	return requests, nil
+	return requests
 }
 
 // convertTimeStamp converts OTLP timestamp in ns to timestamp in ms

exporter/clickhousemetricsexporter/helper_test.go

@@ -340,39 +340,30 @@ func Test_batchTimeSeries(t *testing.T) {
 		tsMap               map[string]*prompb.TimeSeries
 		maxBatchByteSize    int
 		numExpectedRequests int
-		returnErr           bool
 	}{
 		{
 			"no_timeseries",
 			tsMap1,
 			100,
-			-1,
-			true,
+			0,
 		},
 		{
 			"normal_case",
 			tsMap2,
 			300,
 			1,
-			false,
 		},
 		{
 			"two_requests",
 			tsMap3,
 			300,
 			2,
-			false,
 		},
 	}
 	// run tests
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			requests, err := batchTimeSeries(tt.tsMap, tt.maxBatchByteSize)
-			if tt.returnErr {
-				assert.Error(t, err)
-				return
-			}
-			assert.NoError(t, err)
+			requests := batchTimeSeries(tt.tsMap, tt.maxBatchByteSize)
 			assert.Equal(t, tt.numExpectedRequests, len(requests))
 		})
 	}