Using re2 for Timelion regular expressions #67416

kobelb · 2020-05-26T20:59:49Z

No description provided.

…5208)"" This reverts commit c90293d.

spalger

LGTM

kobelb · 2020-05-27T00:04:31Z

'node' is in the defaults, not sure why we aren't using the defaults... https://jestjs.io/docs/en/configuration#modulefileextensions-arraystring

kobelb · 2020-05-27T01:55:17Z

src/dev/jest/config.js

@@ -78,7 +78,7 @@ export default {
  ],
  coverageDirectory: '<rootDir>/target/kibana-coverage/jest',
  coverageReporters: !!process.env.CODE_COVERAGE ? ['json'] : ['html', 'text'],
-  moduleFileExtensions: ['js', 'json', 'ts', 'tsx'],
+  moduleFileExtensions: ['js', 'json', 'ts', 'tsx', 'node'],


Without this change, the build was failing with the following error:

Cannot find module './build/Release/re2' from 're2.js'

However, Jest was able to find: 'build/Release/re2.node' You might want to include a file extension in your import, or update your 'moduleFileExtensions', which is currently ['js', 'json', 'ts', 'tsx']. See https://jestjs.io/docs/en/configuration#modulefileextensions-array-string

'node' is already in the defaults, and I'm not sure why we're overriding the defaults. @elastic/kibana-operations mind double-checking this?

I expect the defaults have changed over the years to include ts/tsx, but didn't originally, which is probably why we're overriding them. LGTM, though I'm not opposed to just deleting the override and using the defaults either (in this and other files too).

kobelb · 2020-05-27T01:55:48Z

x-pack/dev-tools/jest/create_jest_config.js

@@ -9,7 +9,7 @@ export function createJestConfig({ kibanaDirectory, xPackKibanaDirectory }) {
  return {
    rootDir: xPackKibanaDirectory,
    roots: ['<rootDir>/plugins', '<rootDir>/legacy/plugins', '<rootDir>/legacy/server'],
-    moduleFileExtensions: ['js', 'json', 'ts', 'tsx'],
+    moduleFileExtensions: ['js', 'json', 'ts', 'tsx', 'node'],


I updated this to be consistent with src/dev/jest/config.js, this change isn't needed at this time.

kobelb · 2020-05-27T01:55:53Z

x-pack/test_utils/jest/config.js

@@ -28,7 +28,7 @@ export default {
  ],
  coverageDirectory: '<rootDir>/../target/kibana-coverage/jest',
  coverageReporters: ['html'],
-  moduleFileExtensions: ['js', 'json', 'ts', 'tsx'],
+  moduleFileExtensions: ['js', 'json', 'ts', 'tsx', 'node'],


I updated this to be consistent with src/dev/jest/config.js, this change isn't needed at this time.

kobelb · 2020-05-27T13:38:28Z

retest

kobelb · 2020-05-27T16:11:43Z

retest

kobelb · 2020-05-27T18:27:10Z

retest

spalger

LGTM

spalger · 2020-05-27T22:21:51Z

src/dev/jest/config.js

@@ -78,7 +78,7 @@ export default {
  ],
  coverageDirectory: '<rootDir>/target/kibana-coverage/jest',
  coverageReporters: !!process.env.CODE_COVERAGE ? ['json'] : ['html', 'text'],
-  moduleFileExtensions: ['js', 'json', 'ts', 'tsx'],
+  moduleFileExtensions: ['js', 'json', 'ts', 'tsx', 'node'],


I expect the defaults have changed over the years to include ts/tsx, but didn't originally, which is probably why we're overriding them. LGTM, though I'm not opposed to just deleting the override and using the defaults either (in this and other files too).

kobelb · 2020-06-01T14:37:05Z

@elasticmachine merge upstream

legrego

LGTM, tested locally

watson · 2020-06-03T09:25:10Z

@kobelb I thought re2 wanted to implement this solution upstream and that we, therefore, wanted to wait for that?

kobelb · 2020-06-03T13:42:16Z

@watson node-re2 implemented the changes to provide pre-built binaries. This allows Kibana to just reference and use node-re2 like any other npm package for most situations. However, when building Kibana's platform specific archives, we need to patch the pre-built binaries into the archives hence the work being done here: https://github.com/elastic/kibana/pull/67416/files#diff-dc74fa4ea2f321221fbe2ed00d29a120

watson · 2020-06-04T05:50:53Z

Ah ok, I missed that 👍

I'm used to - when shipping pre-built binaries - that they are all included inside the npm package instead of relying on a post-install script that downloads them from a 3rd party website.

I'm not really sure I like this approach, but I guess in this case we will have to deal with it as you do here 👍

kobelb · 2020-06-04T14:07:56Z

@elasticmachine merge upstream

flash1293 · 2020-06-10T13:45:26Z

@elasticmachine merge upstream

flash1293

Tested on Mac and regexes for labels still work in Timelion. LGTM

kibanamachine · 2020-06-10T15:27:49Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request
Commit: b1e8a48

History

💚 Build #51771 succeeded bbadb85
💚 Build #50807 succeeded 7bb088d
💚 Build #50115 succeeded e7c6ee3
💚 Build #50074 succeeded e7c6ee3
💚 Build #50022 succeeded e7c6ee3

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

* Revert "Revert "Using re2 for Timelion regular expressions (elastic#55208)"" This reverts commit c90293d. * Updating re2 to 1.14.0. Still need to update build patching * Extract the gzip to the destination, supporting multiple extract methods * Adding 'node' to jest's moduleFileExtensions 'node' is in the defaults, not sure why we aren't using the defaults... https://jestjs.io/docs/en/configuration#modulefileextensions-arraystring Co-authored-by: Elastic Machine <[email protected]>

* Revert "Revert "Using re2 for Timelion regular expressions (#55208)"" This reverts commit c90293d. * Updating re2 to 1.14.0. Still need to update build patching * Extract the gzip to the destination, supporting multiple extract methods * Adding 'node' to jest's moduleFileExtensions 'node' is in the defaults, not sure why we aren't using the defaults... https://jestjs.io/docs/en/configuration#modulefileextensions-arraystring Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Elastic Machine <[email protected]>

kibanamachine · 2020-06-12T21:28:44Z

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

kibanamachine · 2020-06-15T21:38:44Z

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

kibanamachine · 2020-06-16T21:48:44Z

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

kibanamachine · 2020-06-17T21:58:43Z

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

* Revert "Revert "Using re2 for Timelion regular expressions (#55208)"" This reverts commit c90293d. * Updating re2 to 1.14.0. Still need to update build patching * Extract the gzip to the destination, supporting multiple extract methods * Adding 'node' to jest's moduleFileExtensions 'node' is in the defaults, not sure why we aren't using the defaults... https://jestjs.io/docs/en/configuration#modulefileextensions-arraystring Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Elastic Machine <[email protected]>

kobelb added 3 commits May 26, 2020 11:11

Revert "Revert "Using re2 for Timelion regular expressions (elastic#5…

23f7033

…5208)"" This reverts commit c90293d.

Updating re2 to 1.14.0. Still need to update build patching

e000e9b

Extract the gzip to the destination, supporting multiple extract methods

94bf1f7

kobelb requested a review from a team May 26, 2020 20:59

kobelb requested a review from a team as a code owner May 26, 2020 20:59

kobelb added release_note:skip Skip the PR/issue when compiling release notes v8.0.0 v7.9.0 labels May 26, 2020

spalger approved these changes May 26, 2020

View reviewed changes

elasticmachine and others added 2 commits May 26, 2020 17:04

Merge branch 'master' into node-re2-2

a7111cc

Adding 'node' to jest's moduleFileExtensions

e7c6ee3

'node' is in the defaults, not sure why we aren't using the defaults... https://jestjs.io/docs/en/configuration#modulefileextensions-arraystring

kobelb commented May 27, 2020

View reviewed changes

kobelb requested a review from spalger May 27, 2020 01:56

spalger approved these changes May 27, 2020

View reviewed changes

Merge branch 'master' into node-re2-2

7bb088d

kobelb requested a review from a team June 1, 2020 14:41

legrego approved these changes Jun 1, 2020

View reviewed changes

Merge branch 'master' into node-re2-2

bbadb85

kobelb requested a review from flash1293 June 4, 2020 14:14

Merge branch 'master' into node-re2-2

b1e8a48

flash1293 approved these changes Jun 10, 2020

View reviewed changes

kobelb added the v6.8.11 label Jun 10, 2020

kobelb merged commit e616935 into elastic:master Jun 10, 2020

kobelb deleted the node-re2-2 branch June 10, 2020 16:55

This was referenced Jun 10, 2020

[7.x] Using re2 for Timelion regular expressions (#67416) #68792

Merged

[6.8] Using re2 for Timelion regular expressions (#67416) #68795

Merged

kobelb mentioned this pull request Jun 11, 2020

[7.8] Using re2 for Timelion regular expressions (#67416) #68964

Merged

kobelb added the v7.8.1 label Jun 11, 2020

kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Jun 12, 2020

kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Jun 18, 2020

jbudz mentioned this pull request Jul 12, 2024

chore(NA): remove usage of re2 and replace it with a non native module #188134

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Using re2 for Timelion regular expressions #67416

Using re2 for Timelion regular expressions #67416

kobelb commented May 26, 2020

spalger left a comment

kobelb commented May 27, 2020

kobelb May 27, 2020

spalger May 27, 2020

kobelb May 27, 2020

kobelb May 27, 2020

kobelb commented May 27, 2020

kobelb commented May 27, 2020

kobelb commented May 27, 2020

spalger left a comment

spalger May 27, 2020

kobelb commented Jun 1, 2020

legrego left a comment

watson commented Jun 3, 2020

kobelb commented Jun 3, 2020

watson commented Jun 4, 2020 •

edited

Loading

kobelb commented Jun 4, 2020

flash1293 commented Jun 10, 2020

flash1293 left a comment

kibanamachine commented Jun 10, 2020

kibanamachine commented Jun 12, 2020

kibanamachine commented Jun 15, 2020

kibanamachine commented Jun 16, 2020

kibanamachine commented Jun 17, 2020

Using re2 for Timelion regular expressions #67416

Using re2 for Timelion regular expressions #67416

Conversation

kobelb commented May 26, 2020

spalger left a comment

Choose a reason for hiding this comment

kobelb commented May 27, 2020

kobelb May 27, 2020

Choose a reason for hiding this comment

spalger May 27, 2020

Choose a reason for hiding this comment

kobelb May 27, 2020

Choose a reason for hiding this comment

kobelb May 27, 2020

Choose a reason for hiding this comment

kobelb commented May 27, 2020

kobelb commented May 27, 2020

kobelb commented May 27, 2020

spalger left a comment

Choose a reason for hiding this comment

spalger May 27, 2020

Choose a reason for hiding this comment

kobelb commented Jun 1, 2020

legrego left a comment

Choose a reason for hiding this comment

watson commented Jun 3, 2020

kobelb commented Jun 3, 2020

watson commented Jun 4, 2020 • edited Loading

kobelb commented Jun 4, 2020

flash1293 commented Jun 10, 2020

flash1293 left a comment

Choose a reason for hiding this comment

kibanamachine commented Jun 10, 2020

💚 Build Succeeded

History

kibanamachine commented Jun 12, 2020

kibanamachine commented Jun 15, 2020

kibanamachine commented Jun 16, 2020

kibanamachine commented Jun 17, 2020

watson commented Jun 4, 2020 •

edited

Loading