Skip to content

Commit 466c497

Browse files
authored
Revert "[exporter][queuebatcher] set feature gate UsePullingBasedExporterQueueBatcher to beta" (#12246)
Reverts #12122 During the revamp of the pull batching work, couple bugs were found: 1. #12244 2. #12247
1 parent 7b878cf commit 466c497

File tree

3 files changed

+1
-34
lines changed

3 files changed

+1
-34
lines changed

.chloggen/set-new-queue-batching-to-beta.yaml

Lines changed: 0 additions & 25 deletions
This file was deleted.

exporter/exporterhelper/internal/base_exporter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
var usePullingBasedExporterQueueBatcher = featuregate.GlobalRegistry().MustRegister(
2929
"exporter.UsePullingBasedExporterQueueBatcher",
30-
featuregate.StageBeta,
30+
featuregate.StageAlpha,
3131
featuregate.WithRegisterFromVersion("v0.115.0"),
3232
featuregate.WithRegisterDescription("if set to true, turns on the pulling-based exporter queue bathcer"),
3333
)

exporter/exporterhelper/internal/batch_sender_test.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -374,14 +374,6 @@ func TestBatchSender_ConcurrencyLimitReached(t *testing.T) {
374374
expectedItems: 51,
375375
},
376376
}
377-
378-
// Why do we not expect the same behavior when usePullingBasedExporterQueueBatcher is true?
379-
// This test checks that when concurrency limit of batch_sender is reached, the batch_sender will flush immediately.
380-
// To avoid blocking, the concurrency limit is set to the number of concurrent goroutines that are in charge of
381-
// reading from the queue and adding to batch. With the new model, we are pulling instead of pushing so we don't
382-
// block the reading goroutine anymore.
383-
defer setFeatureGateForTest(t, usePullingBasedExporterQueueBatcher, false)()
384-
385377
for _, tt := range tests {
386378
t.Run(tt.name, func(t *testing.T) {
387379
qCfg := exporterqueue.NewDefaultConfig()

0 commit comments

Comments
 (0)