Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick #8845 to 6.x: add_cloud_metadata asynchronous initialization #10495

Merged
merged 1 commit into from
Feb 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ https://github.com/elastic/beats/compare/v6.6.0...6.x[Check the HEAD diff]
*Affecting all Beats*

- Dissect syntax change, use * instead of ? when working with field reference. {issue}8054[8054]
- add_cloud_metadata initialization is performed asynchronously to avoid delays on startup. {pull}8845[8845]

*Auditbeat*

Expand Down
46 changes: 34 additions & 12 deletions libbeat/processors/add_cloud_metadata/add_cloud_metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"io/ioutil"
"net"
"net/http"
"sync"
"time"

"github.com/pkg/errors"
Expand Down Expand Up @@ -314,34 +315,55 @@ func newCloudMetadata(c *common.Config) (processors.Processor, error) {
return nil, err
}

result := fetchMetadata(fetchers, config.Timeout)
if result == nil {
logp.Info("add_cloud_metadata: hosting provider type not detected.")
return &addCloudMetadata{}, nil
p := &addCloudMetadata{
initData: &initData{fetchers, config.Timeout},
}

logp.Info("add_cloud_metadata: hosting provider type detected as %v, metadata=%v",
result.provider, result.metadata.String())
go p.initOnce.Do(p.init)
return p, nil
}

return &addCloudMetadata{metadata: result.metadata}, nil
type initData struct {
fetchers []*metadataFetcher
timeout time.Duration
}

type addCloudMetadata struct {
initOnce sync.Once
initData *initData
metadata common.MapStr
}

func (p addCloudMetadata) Run(event *beat.Event) (*beat.Event, error) {
if len(p.metadata) == 0 {
func (p *addCloudMetadata) init() {
result := fetchMetadata(p.initData.fetchers, p.initData.timeout)
if result == nil {
logp.Info("add_cloud_metadata: hosting provider type not detected.")
return
}
p.metadata = result.metadata
p.initData = nil
logp.Info("add_cloud_metadata: hosting provider type detected as %v, metadata=%v",
result.provider, result.metadata.String())
}

func (p *addCloudMetadata) getMeta() common.MapStr {
p.initOnce.Do(p.init)
return p.metadata
}

func (p *addCloudMetadata) Run(event *beat.Event) (*beat.Event, error) {
meta := p.getMeta()
if len(meta) == 0 {
return event, nil
}

// This overwrites the meta.cloud if it exists. But the cloud key should be
// reserved for this processor so this should happen.
_, err := event.PutValue("meta.cloud", p.metadata)
_, err := event.PutValue("meta.cloud", meta)

return event, err
}

func (p addCloudMetadata) String() string {
return "add_cloud_metadata=" + p.metadata.String()
func (p *addCloudMetadata) String() string {
return "add_cloud_metadata=" + p.getMeta().String()
}