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.

Sign up for GitHub

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

Jump to bottom

Enable APM tracing when --with-apm-server is used #103268

Merged
merged 3 commits into from
Dec 11, 2023
Merged

Enable APM tracing when --with-apm-server is used #103268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ddc4259
Enable APM tracing when --with-apm-server is used
pgomulka Dec 11, 2023
3dc6f25
decrease metric interval and increase sample rate
pgomulka Dec 11, 2023
1dfaabd
spotless
pgomulka Dec 11, 2023
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
12 changes: 9 additions & 3 deletions build-tools/src/main/java/org/elasticsearch/gradle/testclusters/RunTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,14 +201,20 @@ public void beforeStart() {
try {
mockServer.start();
node.setting("telemetry.metrics.enabled", "true");
node.setting("tracing.apm.agent.enabled", "true");
node.setting("tracing.apm.agent.transaction_sample_rate", "0.10");
node.setting("tracing.apm.agent.metrics_interval", "10s");
node.setting("tracing.apm.agent.server_url", "http://127.0.0.1:" + mockServer.getPort());
} catch (IOException e) {
logger.warn("Unable to start APM server", e);
}
} else if (node.getSettingKeys().contains("telemetry.metrics.enabled") == false) {
// in serverless metrics are enabled by default
// if metrics were not enabled explicitly for gradlew run we should disable them
}
// in serverless metrics are enabled by default
// if metrics were not enabled explicitly for gradlew run we should disable them
else if (node.getSettingKeys().contains("telemetry.metrics.enabled") == false) { // metrics
node.setting("telemetry.metrics.enabled", "false");
} else if (node.getSettingKeys().contains("tracing.apm.agent.enabled") == false) { // tracing
node.setting("tracing.apm.agent.enable", "false");
}

}
Expand Down
2 changes: 1 addition & 1 deletion modules/apm/src/main/java/org/elasticsearch/telemetry/apm/APM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public Collection<?> createComponents(PluginServices services) {
final APMMeterService apmMeter = new APMMeterService(settings);
apmAgentSettings.addClusterSettingsListeners(services.clusterService(), telemetryProvider.get(), apmMeter);
logger.info("Sending apm metrics is {}", APMAgentSettings.TELEMETRY_METRICS_ENABLED_SETTING.get(settings) ? "enabled" : "disabled");
logger.info("Sending apm traces is {}", APMAgentSettings.APM_ENABLED_SETTING.get(settings) ? "enabled" : "disabled");
logger.info("Sending apm tracing is {}", APMAgentSettings.APM_ENABLED_SETTING.get(settings) ? "enabled" : "disabled");

return List.of(apmTracer, apmMeter);
}
Expand Down