instrumentation: Add initial APM tracing #898

marclop · 2021-11-19T03:20:30Z

What is the problem this PR solves?

Adds support to enable instrumentation via the APM Go agent. New config
options have been added to the Server input which could be set up in
the fleet-server integration configuration.

The added instrumentation covers the fleet-server http server and the
go-elasticsearch client.

A sample of the configuration that's been added (instrumentation):

inputs:
  - type: fleet-server
    server:
      host: localhost
      port: 8220
      instrumentation:
        enabled: true
        hosts: ["localhost:8200"]
        environment: production
        secret_token: token
        api_key: apikey

How does this PR solve the problem?

By using the go.elastic.co/apm client.

How to test this PR locally

Build elastic-agent and patch it with a locally built version of fleet-server.
Run fleet server in agent mode.
Go to Kibana and install the APM Integration
Modify fleet server and add these custom settings:

server.instrumentation:
  enabled: true
  environment: test

Navigate to the APM App and verify that traces are shown and have the following metadata set:

Verify elasticsearch shows up as a dependency in the APM Service map

Checklist

I have commented my code, particularly in hard-to-understand areas
~~- [ ] I have made corresponding changes to the documentation~~
I have made corresponding change to the default configuration files
I have added tests that prove my fix is effective or that my feature works
~~- [ ] I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.~~

Related issues

Closes #850

Adds support to enable instrumentation via the APM Go agent. New config options have been added to the `Server` input which could be set up in the `fleet-server` integration configuration. The added instrumentation covers the `fleet-server` http server and the `go-elasticsearch` client. Signed-off-by: Marc Lopez Rubio <[email protected]>

elasticmachine · 2021-11-19T03:24:04Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Duration: 9 min 32 sec

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

/test : Re-trigger the build.

cmd/fleet/main.go

mergify · 2021-11-19T08:45:36Z

This pull request does not have a backport label. Could you fix it @marclop? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

backport-v/d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

Signed-off-by: Marc Lopez Rubio <[email protected]>

…-instrumentation-to-server

cmd/fleet/main.go

Signed-off-by: Marc Lopez Rubio <[email protected]>

scunningham · 2021-11-19T13:23:46Z

This seems like the right level of integration.

aleksmaus

LGTM

Signed-off-by: Marc Lopez Rubio <[email protected]>

axw

Looks good!

cmd/fleet/main.go

Signed-off-by: Marc Lopez Rubio <[email protected]>

aleksmaus

LGTM

Adds support to enable instrumentation via the APM Go agent. New config options have been added to the `Server` input which could be set up in the `fleet-server` integration configuration. The added instrumentation covers the `fleet-server` http server and the Adds support to enable instrumentation via the APM Go agent. New config options have been added to the `Server` input which could be set up in the `fleet-server` integration configuration. The added instrumentation covers the `fleet-server` http server and the `go-elasticsearch` client. A sample of the configuration that's been added (`instrumentation`): ```yaml inputs: - type: fleet-server server: instrumentation: enabled: true hosts: ["localhost:8200"] environment: production secret_token: token api_key: apikey ``` Signed-off-by: Marc Lopez Rubio <[email protected]> (cherry picked from commit ade74c7)

Adds support to enable instrumentation via the APM Go agent. New config options have been added to the `Server` input which could be set up in the `fleet-server` integration configuration. The added instrumentation covers the `fleet-server` http server and the Adds support to enable instrumentation via the APM Go agent. New config options have been added to the `Server` input which could be set up in the `fleet-server` integration configuration. The added instrumentation covers the `fleet-server` http server and the `go-elasticsearch` client. A sample of the configuration that's been added (`instrumentation`): ```yaml inputs: - type: fleet-server server: instrumentation: enabled: true hosts: ["localhost:8200"] environment: production secret_token: token api_key: apikey ``` Signed-off-by: Marc Lopez Rubio <[email protected]> (cherry picked from commit ade74c7) Co-authored-by: Marc Lopez Rubio <[email protected]>

heavily, heavily influenced by elastic/fleet-server#898

axw reviewed Nov 19, 2021

View reviewed changes

cmd/fleet/main.go Outdated Show resolved Hide resolved

cmd/fleet/main.go Outdated Show resolved Hide resolved

mergify bot added the backport-skip Skip notification from the automated backport with mergify label Nov 19, 2021

marclop added 2 commits November 19, 2021 19:27

Fix environment missing, address comments

cacefa5

Signed-off-by: Marc Lopez Rubio <[email protected]>

Merge remote-tracking branch 'upstream/master' into f/add-initial-apm…

5a0ab10

…-instrumentation-to-server

marclop marked this pull request as ready for review November 19, 2021 11:34

aleksmaus added backport-v8.0.0 Automated backport with mergify v8.0.0 labels Nov 19, 2021

mergify bot removed the backport-skip Skip notification from the automated backport with mergify label Nov 19, 2021

aleksmaus reviewed Nov 19, 2021

View reviewed changes

cmd/fleet/main.go Outdated Show resolved Hide resolved

cmd/fleet/main.go Outdated Show resolved Hide resolved

Address review comments

643ea3e

Signed-off-by: Marc Lopez Rubio <[email protected]>

aleksmaus approved these changes Nov 19, 2021

View reviewed changes

Fix Elasticsearch instrumentation

a2e655e

Signed-off-by: Marc Lopez Rubio <[email protected]>

marclop requested review from aleksmaus and axw November 22, 2021 01:49

make notice

85b1263

Signed-off-by: Marc Lopez Rubio <[email protected]>

axw approved these changes Nov 22, 2021

View reviewed changes

cmd/fleet/main.go Outdated Show resolved Hide resolved

cmd/fleet/main.go Outdated Show resolved Hide resolved

marclop added 2 commits November 22, 2021 12:51

Address review comments

e3e0a9c

Signed-off-by: Marc Lopez Rubio <[email protected]>

Check ctx.Done after it's been modified

6f4e735

Signed-off-by: Marc Lopez Rubio <[email protected]>

aleksmaus approved these changes Nov 22, 2021

View reviewed changes

marclop merged commit ade74c7 into elastic:master Nov 23, 2021

mergify bot mentioned this pull request Nov 23, 2021

[8.0](backport #898) instrumentation: Add initial APM tracing #907

Merged

stuartnelson3 added a commit to stuartnelson3/beats that referenced this pull request Dec 2, 2021

pass config values to tracer

c3fc48e

heavily, heavily influenced by elastic/fleet-server#898

stuartnelson3 mentioned this pull request Dec 3, 2021

[elastic-agent] initial instrumentation elastic/beats#29031

Merged

6 tasks

marclop mentioned this pull request Dec 6, 2021

instrumentation: Add "tls" configuration options #960

Merged

1 task

michel-laterman mentioned this pull request Apr 4, 2022

Instrument fleet-server with apm client #114

Closed

joshdover mentioned this pull request Jul 11, 2022

Add additional APM spans and global_labels config option #1649

Merged

5 tasks

joshdover mentioned this pull request Jul 21, 2022

Add support for setting APM transaction_sample_rate #1681

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

instrumentation: Add initial APM tracing #898

instrumentation: Add initial APM tracing #898

Uh oh!

marclop commented Nov 19, 2021 •

edited

Loading

Uh oh!

elasticmachine commented Nov 19, 2021 •

edited

Loading

Build stats

Uh oh!

Uh oh!

Uh oh!

mergify bot commented Nov 19, 2021

Uh oh!

Uh oh!

Uh oh!

scunningham commented Nov 19, 2021

Uh oh!

aleksmaus left a comment

Uh oh!

axw left a comment

Uh oh!

Uh oh!

Uh oh!

aleksmaus left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

instrumentation: Add initial APM tracing #898

instrumentation: Add initial APM tracing #898

Uh oh!

Conversation

marclop commented Nov 19, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What is the problem this PR solves?

How does this PR solve the problem?

How to test this PR locally

Checklist

Related issues

Uh oh!

elasticmachine commented Nov 19, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

💚 Build Succeeded

Build stats

🤖 GitHub comments

Uh oh!

Uh oh!

Uh oh!

mergify bot commented Nov 19, 2021

Uh oh!

Uh oh!

Uh oh!

scunningham commented Nov 19, 2021

Uh oh!

aleksmaus left a comment

Choose a reason for hiding this comment

Uh oh!

axw left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

aleksmaus left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

marclop commented Nov 19, 2021 •

edited

Loading

elasticmachine commented Nov 19, 2021 •

edited

Loading