Skip to content

Commit

Permalink
[exporterhelper]: reduce default queue size to 1000
Browse files Browse the repository at this point in the history
  • Loading branch information
Mikołaj Świątek committed May 4, 2023
1 parent 2c132fa commit 1e82eb7
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 11 deletions.
18 changes: 18 additions & 0 deletions .chloggen/exporterhelper_default-queue-size.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: breaking

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: exporterhelper

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Reduce the default queue size to 1000 from 5000

# One or more tracking issues or pull requests related to the change
issues: [7359]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: |
Affects any exporter which enables the queue by default and doesn't set its own default size.
For example: otlphttp.
4 changes: 2 additions & 2 deletions exporter/exporterhelper/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The following configuration options can be modified:
- `sending_queue`
- `enabled` (default = true)
- `num_consumers` (default = 10): Number of consumers that dequeue batches; ignored if `enabled` is `false`
- `queue_size` (default = 5000): Maximum number of batches kept in memory before dropping; ignored if `enabled` is `false`
- `queue_size` (default = 1000): Maximum number of batches kept in memory before dropping; ignored if `enabled` is `false`
User should calculate this as `num_seconds * requests_per_second / requests_per_batch` where:
- `num_seconds` is the number of seconds to buffer in case of a backend outage
- `requests_per_second` is the average number of requests per seconds
Expand All @@ -37,7 +37,7 @@ To use the persistent queue, the following setting needs to be set:
- `storage` (default = none): When set, enables persistence and uses the component specified as a storage extension for the persistent queue

The maximum number of batches stored to disk can be controlled using `sending_queue.queue_size` parameter (which,
similarly as for in-memory buffering, defaults to 5000 batches).
similarly as for in-memory buffering, defaults to 1000 batches).

When persistent queue is enabled, the batches are being buffered using the provided storage extension - [filestorage] is a popular and safe choice. If the collector instance is killed while having some items in the persistent queue, on restart the items will be be picked and the exporting is continued.

Expand Down
2 changes: 1 addition & 1 deletion exporter/exporterhelper/internal/persistent_queue_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ func TestPersistentQueue_ConsumersProducers(t *testing.T) {
req := newFakeTracesRequest(traces)

ext := createStorageExtension(path)
tq := createTestQueue(ext, 5000)
tq := createTestQueue(ext, 1000)

defer tq.Stop()
t.Cleanup(func() { assert.NoError(t, ext.Shutdown(context.Background())) })
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ func TestPersistentStorage_RepeatPutCloseReadClose(t *testing.T) {

// No more items
ext := createStorageExtension(path)
wq := createTestQueue(ext, 5000)
wq := createTestQueue(ext, 1000)
require.Equal(t, 0, wq.Size())
require.NoError(t, ext.Shutdown(context.Background()))
}
Expand Down
11 changes: 6 additions & 5 deletions exporter/exporterhelper/queued_retry.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ import (
"go.opentelemetry.io/collector/internal/obsreportconfig/obsmetrics"
)

const DefaultQueueSize = 1000

var (
errSendingQueueIsFull = errors.New("sending_queue is full")
errNoStorageClient = errors.New("no storage client extension found")
Expand All @@ -58,11 +60,10 @@ func NewDefaultQueueSettings() QueueSettings {
return QueueSettings{
Enabled: true,
NumConsumers: 10,
// For 5000 queue elements at 100 requests/sec gives about 50 sec of survival of destination outage.
// This is a pretty decent value for production.
// User should calculate this from the perspective of how many seconds to buffer in case of a backend outage,
// multiply that by the number of requests per seconds.
QueueSize: 5000,
// By default, batches are 8192 spans, for a total of up to 8 million spans in the queue
// This can be estimated at 1-4 GB worth of maximum memory usage
// This default is probably still too high, and may be adjusted further down in a future release
QueueSize: DefaultQueueSize,
}
}

Expand Down
2 changes: 1 addition & 1 deletion exporter/exporterhelper/queued_retry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ func TestQueuedRetry_QueueMetricsReported(t *testing.T) {
require.NoError(t, err)
require.NoError(t, be.Start(context.Background(), componenttest.NewNopHost()))

checkValueForGlobalManager(t, defaultExporterTags, int64(5000), "exporter/queue_capacity")
checkValueForGlobalManager(t, defaultExporterTags, int64(DefaultQueueSize), "exporter/queue_capacity")
for i := 0; i < 7; i++ {
require.NoError(t, be.sender.send(newErrorRequest(context.Background())))
}
Expand Down
2 changes: 1 addition & 1 deletion exporter/otlpexporter/cfg-schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ fields:
NumConsumers is the number of consumers from the queue.
- name: queue_size
kind: int
default: 5000
default: 1000
doc: |
QueueSize is the maximum number of batches allowed in queue at a given time.
- name: retry_on_failure
Expand Down

0 comments on commit 1e82eb7

Please sign in to comment.