-
Notifications
You must be signed in to change notification settings - Fork 523
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
monitoring: enable tracing self instrumentation in APM Server #14231
Conversation
This pull request does not have a backport label. Could you fix it @1pkg? 🙏
|
|
0c20c25
to
b5fc9c5
Compare
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.
I think this change needs a changelog entry
cc8e20d
to
473977a
Compare
While testing the changes manually, I discovered a bug in EA tracing sampling changes where |
Raised an issue in the agent repo elastic/elastic-agent#5711 |
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.
Thanks @1pkg!
Can't be merged yet due to the Cloud configuration missing sensible default for |
This pull request is now in conflicts. Could you fix it @1pkg? 🙏
|
ae082fb
to
e9040da
Compare
e9040da
to
b4ba6d1
Compare
(cherry picked from commit 56228ce)
(cherry picked from commit 56228ce)
#14424) (cherry picked from commit 56228ce) Co-authored-by: Kostiantyn Masliuk <[email protected]>
#14425) (cherry picked from commit 56228ce) Co-authored-by: Kostiantyn Masliuk <[email protected]>
Testing on ESSTesting on StandaloneTested successfully with commit SHA ae423f0Ran the elastic-agent locally with the following docker-compose and elastic-agent.yml: version: '3.9'
services:
elastic-agent:
image: elastic-agent-systemtest:8.16.0-0e756d08-SNAPSHOT
networks:
- network1
ports:
- 8220:8220
- 8200:8200
user: root
environment:
FLEET_SERVER_ENABLE: 'true'
FLEET_SERVER_ELASTICSEARCH_HOST: http://elasticsearch:9200
FLEET_SERVER_SERVICE_TOKEN: AAEAAWVsYXN0aWMvZmxlZXQtc2VydmVyL3Rva2VuLTE3MzAyNDE5NTk0OTA6bFo5TnNWMlFST3VPQmp1Q1MxVC1kQQ
FLEET_SERVER_POLICY_ID: fleet-server-policy
FLEET_SERVER_PORT: 8220
networks:
network1:
name: apm-server_default
external: true fleet:
enabled: true
agent.monitoring:
# enabled turns on monitoring of running processes
enabled: true
traces: true
apm:
environment: "816bctesting"
global_labels:
foo: localbctesting
hosts:
- https://88e3f5<REDACTED>.elastic-cloud.com:443 # this is a personal ESS cluster where I am sending monitoring data
secret_token: <REDACTED>
sampling_rate: 1
outputs:
default:
type: elasticsearch
hosts:
- 'http://elasticsearch:9200'
username: admin
password: changeme Observed traces on |
Motivation/summary
This PR addresses the issue #14230 and enables self instrumentation in APM Server.
Checklist
For functional changes, consider:
How to test these changes
Test that self-instrumentation is enabled by default in the Cloud.
Additionally verify that instrumentation config outlined in #13514 (comment) are handled correctly when orchestrated by the standalone agent.
Related issues
#14230