Skip to content

Commit d6d92ef

Browse files
authored
[libbeat] Delete proxy queue (#38570)
Delete the proxy queue, a prototype written to reduce memory use in the old shipper project. Recent improvements to the memory queue (#37795, #38166) added support for the same early-free mechanisms as the proxy queue, so it is now redundant. The proxy queue was never used or exposed in a public release, so there are no compatibility concerns. (This is pre-cleanup for adding early-encoding support, to avoid implementing new functionality in a queue that is no longer used.)
1 parent 65ca2de commit d6d92ef

File tree

9 files changed

+7
-1722
lines changed

9 files changed

+7
-1722
lines changed

libbeat/outputs/shipper/shipper.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/elastic/beats/v7/libbeat/beat"
2626
"github.com/elastic/beats/v7/libbeat/outputs"
2727
"github.com/elastic/beats/v7/libbeat/publisher"
28-
proxyqueue "github.com/elastic/beats/v7/libbeat/publisher/queue/proxy"
28+
"github.com/elastic/beats/v7/libbeat/publisher/queue/memqueue"
2929

3030
"github.com/elastic/elastic-agent-shipper-client/pkg/helpers"
3131
sc "github.com/elastic/elastic-agent-shipper-client/pkg/proto"
@@ -111,8 +111,12 @@ func makeShipper(
111111
return outputs.Group{
112112
Clients: []outputs.Client{swb},
113113
Retry: config.MaxRetries,
114-
QueueFactory: proxyqueue.FactoryForSettings(
115-
proxyqueue.Settings{BatchSize: config.BulkMaxSize}),
114+
QueueFactory: memqueue.FactoryForSettings(
115+
memqueue.Settings{
116+
Events: config.BulkMaxSize * 2,
117+
MaxGetRequest: config.BulkMaxSize,
118+
FlushTimeout: 0,
119+
}),
116120
}, nil
117121
}
118122

libbeat/publisher/queue/proxy/README.md

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

libbeat/publisher/queue/proxy/batch.go

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

0 commit comments

Comments
 (0)