Skip to content

Commit e9e3384

Browse files
committed
remove reduntant addUpDownCount method
1 parent 4e97163 commit e9e3384

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

appender.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ func New(client elastictransport.Interface, cfg Config) (*Appender, error) {
126126
// Register the Appender ID in the pool.
127127
indexer.id = fmt.Sprintf("%p", indexer)
128128
indexer.pool.Register(indexer.id)
129-
indexer.addUpDownCount(int64(cfg.MaxRequests), ms.availableBulkRequests)
129+
attrs := metric.WithAttributeSet(indexer.config.MetricAttributes)
130+
indexer.metrics.availableBulkRequests.Add(context.Background(), int64(cfg.MaxRequests), attrs)
130131
// We create a cancellable context for the errgroup.Group for unblocking
131132
// flushes when Close returns. We intentionally do not use errgroup.WithContext,
132133
// because one flush failure should not cause the context to be cancelled.
@@ -226,20 +227,15 @@ func (a *Appender) Add(ctx context.Context, index string, document io.WriterTo)
226227
a.docsAdded.Add(1)
227228
attrs := metric.WithAttributeSet(a.config.MetricAttributes)
228229
a.metrics.docsAdded.Add(context.Background(), 1, attrs)
230+
a.metrics.docsActive.Add(context.Background(), 1, attrs)
229231

230-
a.addUpDownCount(1, a.metrics.docsActive)
231232
return nil
232233
}
233234

234235
func (a *Appender) IndexersActive() int64 {
235236
return a.scalingInformation().activeIndexers
236237
}
237238

238-
func (a *Appender) addUpDownCount(delta int64, m metric.Int64UpDownCounter, opts ...metric.AddOption) {
239-
attrs := metric.WithAttributeSet(a.config.MetricAttributes)
240-
m.Add(context.Background(), delta, append(opts, attrs)...)
241-
}
242-
243239
func (a *Appender) flush(ctx context.Context, bulkIndexer *BulkIndexer) error {
244240
n := bulkIndexer.Items()
245241
if n == 0 {
@@ -291,7 +287,8 @@ func (a *Appender) flush(ctx context.Context, bulkIndexer *BulkIndexer) error {
291287
a.metrics.bytesUncompressedTotal.Add(context.Background(), int64(flushed), attrs)
292288
}
293289
if err != nil {
294-
a.addUpDownCount(-int64(n), a.metrics.docsActive)
290+
attrs := metric.WithAttributeSet(a.config.MetricAttributes)
291+
a.metrics.docsActive.Add(context.Background(), -int64(n), attrs)
295292
logger.Error("bulk indexing request failed", zap.Error(err))
296293
if a.otelTracingEnabled() && span.IsRecording() {
297294
span.RecordError(err)
@@ -350,7 +347,8 @@ func (a *Appender) flush(ctx context.Context, bulkIndexer *BulkIndexer) error {
350347
}
351348
docsFailed = int64(len(resp.FailedDocs))
352349
totalFlushed := docsFailed + docsIndexed
353-
a.addUpDownCount(-totalFlushed, a.metrics.docsActive)
350+
attrs := metric.WithAttributeSet(a.config.MetricAttributes)
351+
a.metrics.docsActive.Add(context.Background(), -totalFlushed, attrs)
354352
for _, info := range resp.FailedDocs {
355353
if info.Status >= 400 && info.Status < 500 {
356354
if info.Status == http.StatusTooManyRequests {
@@ -498,8 +496,9 @@ func (a *Appender) runActiveIndexer() {
498496
// to reset it to ensure we're using the right client.
499497
active.SetClient(a.client)
500498

501-
a.addUpDownCount(-1, a.metrics.availableBulkRequests)
502-
a.addUpDownCount(1, a.metrics.inflightBulkrequests)
499+
attrs := metric.WithAttributeSet(a.config.MetricAttributes)
500+
a.metrics.availableBulkRequests.Add(context.Background(), -1, attrs)
501+
a.metrics.inflightBulkrequests.Add(context.Background(), 1, attrs)
503502
flushTimer.Reset(a.config.FlushInterval)
504503
}
505504
if err := active.Add(item); err != nil {
@@ -564,8 +563,9 @@ func (a *Appender) runActiveIndexer() {
564563
})
565564
indexer.Reset()
566565
a.pool.Put(a.id, indexer)
567-
a.addUpDownCount(1, a.metrics.availableBulkRequests)
568-
a.addUpDownCount(-1, a.metrics.inflightBulkrequests, attrs)
566+
attrs := metric.WithAttributeSet(a.config.MetricAttributes)
567+
a.metrics.availableBulkRequests.Add(context.Background(), 1, attrs)
568+
a.metrics.inflightBulkrequests.Add(context.Background(), -1, attrs)
569569
a.metrics.flushDuration.Record(context.Background(), took.Seconds(),
570570
attrs,
571571
)

0 commit comments

Comments
 (0)