-
Notifications
You must be signed in to change notification settings - Fork 527
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Relocate libbeat output & instrumentation (#9247)
* Move GOMAXPROCS adjustment to beatcmd This is something that should run just once for the lifetime of the process. I'm intending to move the reload logic out of beater and into beatcmd (or a subpackage). * Move libbeat output and instrumentation to beater Move initialisation of libbeat output (publisher/pipeline) and instrumentation (APM tracer) to package beater. Some of the complexity around reloading is reduced as now have full control over creating the libbeat output. Similarly, we can reduce complexity related to the "tracer server" by running it per reloaded server.
- Loading branch information
Showing
14 changed files
with
662 additions
and
830 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| // 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 beatcmd | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "strconv" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| "golang.org/x/sync/errgroup" | ||
|
|
||
| "github.com/elastic/beats/v7/libbeat/beat" | ||
| "github.com/elastic/beats/v7/libbeat/common/reload" | ||
| "github.com/elastic/elastic-agent-libs/config" | ||
| "github.com/elastic/elastic-agent-libs/logp" | ||
| "github.com/elastic/elastic-agent-libs/monitoring" | ||
| ) | ||
|
|
||
| // TestRunMaxProcs ensures Beat.Run calls the GOMAXPROCS adjustment code by looking for log messages. | ||
| func TestRunMaxProcs(t *testing.T) { | ||
| for _, n := range []int{1, 2, 4} { | ||
| t.Run(fmt.Sprintf("%d_GOMAXPROCS", n), func(t *testing.T) { | ||
| t.Setenv("GOMAXPROCS", strconv.Itoa(n)) | ||
| beat, _ := newNopBeat(t, "output.console.enabled: true") | ||
|
|
||
| // Capture logs for testing. | ||
| logp.DevelopmentSetup(logp.ToObserverOutput()) | ||
| logs := logp.ObserverLogs() | ||
|
|
||
| ctx, cancel := context.WithCancel(context.Background()) | ||
| defer cancel() | ||
| g, ctx := errgroup.WithContext(ctx) | ||
| defer g.Wait() | ||
| g.Go(func() error { return beat.Run(ctx) }) | ||
|
|
||
| timeout := time.NewTimer(10 * time.Second) | ||
| defer timeout.Stop() | ||
| for { | ||
| select { | ||
| case <-timeout.C: | ||
| t.Error("timed out waiting for log message, total logs observed:", logs.Len()) | ||
| for _, log := range logs.All() { | ||
| t.Log(log.LoggerName, log.Message) | ||
| } | ||
| return | ||
| case <-time.After(10 * time.Millisecond): | ||
| } | ||
|
|
||
| logs := logs.FilterMessageSnippet(fmt.Sprintf( | ||
| `maxprocs: Honoring GOMAXPROCS="%d" as set in environment`, n, | ||
| )) | ||
| if logs.Len() > 0 { | ||
| break | ||
| } | ||
| } | ||
|
|
||
| cancel() | ||
| assert.NoError(t, g.Wait()) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func newNopBeat(t testing.TB, configYAML string) (*Beat, *nopBeater) { | ||
| resetGlobals() | ||
| initCfgfile(t, configYAML) | ||
| nopBeater := newNopBeater() | ||
| beat, err := NewBeat(BeatParams{ | ||
| Create: func(b *beat.Beat, cfg *config.C) (beat.Beater, error) { | ||
| return nopBeater, nil | ||
| }, | ||
| }) | ||
| require.NoError(t, err) | ||
| return beat, nopBeater | ||
| } | ||
|
|
||
| func resetGlobals() { | ||
| // Clear monitoring registries to allow the new Beat to populate them. | ||
| monitoring.GetNamespace("info").SetRegistry(nil) | ||
| monitoring.GetNamespace("state").SetRegistry(nil) | ||
| for _, name := range []string{"system", "beat", "libbeat"} { | ||
| registry := monitoring.Default.GetRegistry(name) | ||
| if registry != nil { | ||
| registry.Clear() | ||
| } | ||
| } | ||
|
|
||
| // Create a new reload registry, as the Beat.Run method will register with it. | ||
| reload.Register = reload.NewRegistry() | ||
| } | ||
|
|
||
| type nopBeater struct { | ||
| running chan struct{} | ||
| done chan struct{} | ||
| } | ||
|
|
||
| func newNopBeater() *nopBeater { | ||
| return &nopBeater{ | ||
| running: make(chan struct{}), | ||
| done: make(chan struct{}), | ||
| } | ||
| } | ||
|
|
||
| func (b *nopBeater) Run(*beat.Beat) error { | ||
| close(b.running) | ||
| <-b.done | ||
| return nil | ||
| } | ||
|
|
||
| func (b *nopBeater) Stop() { | ||
| close(b.done) | ||
| } |
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
Oops, something went wrong.