-
Notifications
You must be signed in to change notification settings - Fork 524
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
…1536) * Handle queue.* config for libbeat outputs (#11534) We were ignoring queue.* config when using libbeat outputs, such as logstash and kafka. (cherry picked from commit 3771a5f) # Conflicts: # changelogs/8.10.asciidoc # systemtest/go.mod # systemtest/go.sum * Fix merge conflicts --------- Co-authored-by: Andrew Wilkins <axw@elastic.co>
- Loading branch information
1 parent
d2d8675
commit 07b7932
Showing
5 changed files
with
97 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package systemtest_test | ||
|
|
||
| import ( | ||
| "net" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/elastic/apm-server/systemtest/apmservertest" | ||
| lumberserver "github.com/elastic/go-lumber/server" | ||
| ) | ||
|
|
||
| func TestLogstashOutput(t *testing.T) { | ||
| listener, err := net.Listen("tcp", "127.0.0.1:0") | ||
| require.NoError(t, err) | ||
| t.Cleanup(func() { listener.Close() }) // ignore error; ls.Close closes it too | ||
|
|
||
| ls, err := lumberserver.NewWithListener(listener, lumberserver.V2(true)) | ||
| require.NoError(t, err) | ||
| t.Cleanup(func() { assert.NoError(t, ls.Close()) }) | ||
|
|
||
| srv := apmservertest.NewUnstartedServerTB(t, | ||
| "-E", "queue.mem.events=20000", | ||
| "-E", "queue.mem.flush.min_events=10000", | ||
| "-E", "queue.mem.flush.timeout=60s", | ||
| ) | ||
| srv.Config.Output = apmservertest.OutputConfig{ | ||
| Logstash: &apmservertest.LogstashOutputConfig{ | ||
| Enabled: true, | ||
| BulkMaxSize: 5000, | ||
| Hosts: []string{listener.Addr().String()}, | ||
| }, | ||
| } | ||
| require.NoError(t, srv.Start()) | ||
|
|
||
| // Send 20000 events. We should receive 4 batches of 5000. | ||
| tracer := srv.Tracer() | ||
| for i := 0; i < 20; i++ { | ||
| for i := 0; i < 1000; i++ { | ||
| tx := tracer.StartTransaction("name", "type") | ||
| tx.End() | ||
| } | ||
| tracer.Flush(nil) | ||
| } | ||
| for i := 0; i < 4; i++ { | ||
| select { | ||
| case batch := <-ls.ReceiveChan(): | ||
| batch.ACK() | ||
| assert.Len(t, batch.Events, 5000) | ||
| case <-time.After(10 * time.Second): | ||
| t.Fatal("timed out waiting for batch") | ||
| } | ||
| } | ||
| // Should be no more batches. | ||
| select { | ||
| case <-ls.ReceiveChan(): | ||
| t.Error("unexpected batch received") | ||
| case <-time.After(100 * time.Millisecond): | ||
| } | ||
| } |