Skip to content

Commit

Permalink
[7.17] Setup Node.js environment before instrumenting Kibana with APM. (
Browse files Browse the repository at this point in the history
#155063) (#155378)

# Backport

This will backport the following commits from `main` to `7.17`:
- [Setup Node.js environment before instrumenting Kibana with APM.
(#155063)](#155063)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Aleh
Zasypkin","email":"aleh.zasypkin@elastic.co"},"sourceCommit":{"committedDate":"2023-04-19T16:33:11Z","message":"Setup
Node.js environment before instrumenting Kibana with APM.
(#155063)","sha":"eb90e40da5f48fa8554b495ecd9b046f5f5978e3","branchLabelMapping":{"^v8.8.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","release_note:skip","backport:all-open","v8.8.0"],"number":155063,"url":"https://github.com/elastic/kibana/pull/155063","mergeCommit":{"message":"Setup
Node.js environment before instrumenting Kibana with APM.
(#155063)","sha":"eb90e40da5f48fa8554b495ecd9b046f5f5978e3"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.8.0","labelRegex":"^v8.8.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/155063","number":155063,"mergeCommit":{"message":"Setup
Node.js environment before instrumenting Kibana with APM.
(#155063)","sha":"eb90e40da5f48fa8554b495ecd9b046f5f5978e3"}},{"url":"https://github.com/elastic/kibana/pull/155300","number":155300,"branch":"8.7","state":"OPEN"}]}]
BACKPORT-->
  • Loading branch information
azasypkin authored Apr 20, 2023
1 parent 13324bb commit 9869dd1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/cli/dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

require('./apm')(process.env.ELASTIC_APM_SERVICE_NAME || 'kibana-proxy');
require('../setup_node_env');
require('../setup_node_env/root');
require('./apm')(process.env.ELASTIC_APM_SERVICE_NAME || 'kibana-proxy');
require('./cli');
2 changes: 1 addition & 1 deletion src/cli/dist.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

require('./apm')();
require('../setup_node_env/dist');
require('../setup_node_env/root');
require('./apm')();
require('./cli');

0 comments on commit 9869dd1

Please sign in to comment.