[elastic-agent] initial instrumentation #29031
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,8 @@ package application | |
| import ( | ||
| "context" | ||
|
|
||
| "go.elastic.co/apm" | ||
|
|
||
| "github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/agent/program" | ||
| "github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/agent/transpiler" | ||
| "github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/sorted" | ||
|
|
@@ -51,6 +53,7 @@ func newFleetServerBootstrap( | |
| rawConfig *config.Config, | ||
| statusCtrl status.Controller, | ||
| agentInfo *info.AgentInfo, | ||
| tracer *apm.Tracer, | ||
| ) (*FleetServerBootstrap, error) { | ||
| cfg, err := configuration.NewFromConfig(rawConfig) | ||
| if err != nil { | ||
|
|
@@ -79,7 +82,7 @@ func newFleetServerBootstrap( | |
| } | ||
|
|
||
| bootstrapApp.bgContext, bootstrapApp.cancelCtxFn = context.WithCancel(ctx) | ||
| bootstrapApp.srv, err = server.NewFromConfig(log, cfg.Settings.GRPC, &operation.ApplicationStatusHandler{}, tracer) | ||
| if err != nil { | ||
| return nil, errors.New(err, "initialize GRPC listener") | ||
| } | ||
|
|
@@ -133,6 +136,7 @@ func (b *FleetServerBootstrap) Start() error { | |
| if err := b.srv.Start(); err != nil { | ||
| return err | ||
| } | ||
| // TODO: Does it make sense to pass in a ctx here? | ||
|
There was a problem hiding this comment. Can you either clarify the TODOs and remove them or add a bit more detail, your github handle and/or a link to a follow up task? There was a problem hiding this comment. 👍 i should start writing "QUESTION" since that's what they really are, they just get highlighed when I use |
||
| if err := b.source.Start(); err != nil { | ||
| return err | ||
| } | ||
|
|
@@ -166,20 +170,22 @@ func bootstrapEmitter(ctx context.Context, log *logger.Logger, agentInfo transpi | |
| case c = <-ch: | ||
| } | ||
|
|
||
| err := emit(ctx, log, agentInfo, router, modifiers, c) | ||
| if err != nil { | ||
| log.Error(err) | ||
| } | ||
| } | ||
| }() | ||
|
|
||
| return func(ctx context.Context, c *config.Config) error { | ||
| span, _ := apm.StartSpan(ctx, "emit", "app.internal") | ||
| defer span.End() | ||
| ch <- c | ||
| return nil | ||
| }, nil | ||
| } | ||
|
|
||
| func emit(ctx context.Context, log *logger.Logger, agentInfo transpiler.AgentInfo, router pipeline.Router, modifiers *pipeline.ConfigModifiers, c *config.Config) error { | ||
| if err := info.InjectAgentConfig(c); err != nil { | ||
| return err | ||
| } | ||
|
|
@@ -218,7 +224,7 @@ func emit(log *logger.Logger, agentInfo transpiler.AgentInfo, router pipeline.Ro | |
| return errors.New("bootstrap configuration is incorrect causing fleet-server to not be started") | ||
| } | ||
|
|
||
| return router.Route(ctx, ast.HashStr(), map[pipeline.RoutingKey][]program.Program{ | ||
| pipeline.DefaultRK: { | ||
| { | ||
| Spec: spec, | ||
|
|
||
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
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Interesting I didn't know about go.elastic.co, when the restructuring of the repository is complete we should take a look a it. @kvch @cmacknz @ruflin
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TBH, I am not a huge fan of vanity imports. It looks great, but it is just vanity... :)