Skip to content

Commit

Permalink
[journeys] re-enable APM instrumentation for Elasticsearch (#168198)
Browse files Browse the repository at this point in the history
## Summary

In #167810 I disabled APM for ES due to ES crash. The issue was fixed
and it is working for me locally.

perf journeys pipeline check
https://buildkite.com/elastic/kibana-single-user-performance/builds/11578

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
  • Loading branch information
dmlemeshko and kibanamachine authored Oct 6, 2023
1 parent ca6127e commit 96e785d
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 15 deletions.
30 changes: 15 additions & 15 deletions src/dev/performance/run_performance_cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { run } from '@kbn/dev-cli-runner';
import { REPO_ROOT } from '@kbn/repo-info';
import fs from 'fs';
import path from 'path';
import { JOURNEY_APM_CONFIG } from '@kbn/journeys';

const JOURNEY_BASE_PATH = 'x-pack/performance/journeys';

Expand Down Expand Up @@ -107,21 +108,20 @@ run(
'scripts/es',
'snapshot',
'--license=trial',
// Disabling APM until https://github.com/elastic/elasticsearch/issues/100072 is fixed
// ...(JOURNEY_APM_CONFIG.active
// ? [
// '-E',
// 'tracing.apm.enabled=true',
// '-E',
// 'tracing.apm.agent.transaction_sample_rate=1.0',
// '-E',
// `tracing.apm.agent.server_url=${JOURNEY_APM_CONFIG.serverUrl}`,
// '-E',
// `tracing.apm.agent.secret_token=${JOURNEY_APM_CONFIG.secretToken}`,
// '-E',
// `tracing.apm.agent.environment=${JOURNEY_APM_CONFIG.environment}`,
// ]
// : []),
...(JOURNEY_APM_CONFIG.active
? [
'-E',
'tracing.apm.enabled=true',
'-E',
'tracing.apm.agent.transaction_sample_rate=1.0',
'-E',
`tracing.apm.agent.server_url=${JOURNEY_APM_CONFIG.serverUrl}`,
'-E',
`tracing.apm.agent.secret_token=${JOURNEY_APM_CONFIG.secretToken}`,
'-E',
`tracing.apm.agent.environment=${JOURNEY_APM_CONFIG.environment}`,
]
: []),
],
cwd: REPO_ROOT,
wait: /kbn\/es setup complete/,
Expand Down
1 change: 1 addition & 0 deletions src/dev/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,6 @@
"@kbn/get-repo-files",
"@kbn/import-locator",
"@kbn/config-schema",
"@kbn/journeys",
]
}

0 comments on commit 96e785d

Please sign in to comment.