Skip to content

Comments

[8.18] [NL2ESQL] Add max function calls allowed to prevent tool being called recursively (#231719)#233153

Merged
qn895 merged 2 commits intoelastic:8.18from
qn895:backport/8.18/pr-231719
Aug 27, 2025
Merged

[8.18] [NL2ESQL] Add max function calls allowed to prevent tool being called recursively (#231719)#233153
qn895 merged 2 commits intoelastic:8.18from
qn895:backport/8.18/pr-231719

Conversation

@qn895
Copy link
Member

@qn895 qn895 commented Aug 27, 2025

Backport

This will backport the following commits from main to 8.18:

Questions ?

Please refer to the Backport tool documentation

@qn895 qn895 requested a review from kibanamachine as a code owner August 27, 2025 16:01
@qn895 qn895 added the backport This PR is a backport of another PR label Aug 27, 2025
@qn895 qn895 enabled auto-merge (squash) August 27, 2025 16:01
… recursively (elastic#231719)

Follow up of elastic#231217. This PR
fixes elastic#229979 and implements a
mechanism to stop the nl2esql tool being called indefinitely, and to
stop after 5 tries maximum.

<img width="776" height="1193" alt="image"
src="https://github.com/user-attachments/assets/69d16eb3-bb0a-45b8-8513-7b39edea448a"
/>

https://35-187-109-62.sslip.io/projects/UHJvamVjdDoxMTAy/traces/e035f0e5f983d2e61c1153f6f41abd80?selected=&selectedSpanNodeId=U3Bhbjo2NjczNjE%3D

Check the PR satisfies following conditions.

Reviewers should verify this PR satisfies this list as well.

- [ ] Any text added follows [EUI's writing
guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses
sentence case text and includes [i18n
support](https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-i18n/README.md)
- [ ]
[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)
was added for features that require explanation or tutorials
- [ ] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
- [ ] If a plugin configuration key changed, check if it needs to be
allowlisted in the cloud and added to the [docker
list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)
- [ ] This was checked for breaking HTTP API changes, and any breaking
changes have been approved by the breaking-change committee. The
`release_note:breaking` label should be applied in these situations.
- [ ] [Flaky Test
Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was
used on any tests changed
- [ ] The PR description includes the appropriate Release Notes section,
and the correct `release_note:*` label is applied per the
[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)
- [ ] Review the [backport
guidelines](https://docs.google.com/document/d/1VyN5k91e5OVumlc0Gb9RPa3h1ewuPE705nRtioPiTvY/edit?usp=sharing)
and apply applicable `backport:*` labels.

Does this PR introduce any risks? For example, consider risks like hard
to test bugs, performance regression, potential of data loss.

Describe the risk, its severity, and mitigation for each identified
risk. Invite stakeholders and evaluate how to proceed before merging.

- [ ] [See some risk
examples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx)
- [ ] ...

(cherry picked from commit 58869ae)
@qn895 qn895 force-pushed the backport/8.18/pr-231719 branch from 81c3d74 to dd5f08d Compare August 27, 2025 16:20
Copy link
Contributor

@alvarezmelissa87 alvarezmelissa87 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code LGTM ⚡

@qn895 qn895 merged commit a8493fd into elastic:8.18 Aug 27, 2025
8 checks passed
@elasticmachine
Copy link
Contributor

💛 Build succeeded, but was flaky

Failed CI Steps

Metrics [docs]

✅ unchanged

History

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants