Skip to content

Commit

Permalink
[libbeat] Delete proxy queue (elastic#38570)
Browse files Browse the repository at this point in the history
Delete the proxy queue, a prototype written to reduce memory use in the old shipper project. Recent improvements to the memory queue (elastic#37795, elastic#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.)
  • Loading branch information
faec authored and zeynepyz committed Apr 7, 2024
1 parent e23fe97 commit 30d47be
Show file tree
Hide file tree
Showing 9 changed files with 7 additions and 1,722 deletions.
10 changes: 7 additions & 3 deletions libbeat/outputs/shipper/shipper.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/elastic/beats/v7/libbeat/beat"
"github.com/elastic/beats/v7/libbeat/outputs"
"github.com/elastic/beats/v7/libbeat/publisher"
proxyqueue "github.com/elastic/beats/v7/libbeat/publisher/queue/proxy"
"github.com/elastic/beats/v7/libbeat/publisher/queue/memqueue"

"github.com/elastic/elastic-agent-shipper-client/pkg/helpers"
sc "github.com/elastic/elastic-agent-shipper-client/pkg/proto"
Expand Down Expand Up @@ -111,8 +111,12 @@ func makeShipper(
return outputs.Group{
Clients: []outputs.Client{swb},
Retry: config.MaxRetries,
QueueFactory: proxyqueue.FactoryForSettings(
proxyqueue.Settings{BatchSize: config.BulkMaxSize}),
QueueFactory: memqueue.FactoryForSettings(
memqueue.Settings{
Events: config.BulkMaxSize * 2,
MaxGetRequest: config.BulkMaxSize,
FlushTimeout: 0,
}),
}, nil
}

Expand Down
68 changes: 0 additions & 68 deletions libbeat/publisher/queue/proxy/README.md

This file was deleted.

110 changes: 0 additions & 110 deletions libbeat/publisher/queue/proxy/batch.go

This file was deleted.

Loading

0 comments on commit 30d47be

Please sign in to comment.