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.

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

[Backport 1.x] Bug Fix, return default ID when log4j ThreadContext is empty #539

Merged
merged 1 commit into from
Apr 7, 2022

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 54b7257 from #538

Signed-off-by: penghuo <penghuo@gmail.com>
(cherry picked from commit 54b7257)
@opensearch-trigger-bot opensearch-trigger-bot bot requested a review from a team as a code owner April 5, 2022 20:44
@codecov-commenter
Copy link

codecov-commenter commented Apr 5, 2022

Codecov Report

Merging #539 (54b7257) into 1.x (1f0d7e1) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

❗ Current head 54b7257 differs from pull request most recent head 264e74d. Consider uploading reports for the commit 264e74d to get more accurate results

@@             Coverage Diff              @@
##                1.x     #539      +/-   ##
============================================
- Coverage     95.25%   95.23%   -0.02%     
+ Complexity     2746     2744       -2     
============================================
  Files           276      276              
  Lines          7416     7410       -6     
  Branches        544      538       -6     
============================================
- Hits           7064     7057       -7     
- Misses          298      299       +1     
  Partials         54       54              
Flag Coverage Δ
query-workbench 62.76% <ø> (-0.16%) ⬇️
sql-engine 98.40% <100.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...c/main/java/org/opensearch/sql/expression/DSL.java 100.00% <ø> (ø)
...ch/sql/opensearch/client/OpenSearchNodeClient.java 100.00% <100.00%> (ø)
...ublic/components/QueryResults/QueryResultsBody.tsx 68.32% <0.00%> (-0.36%) ⬇️
...g/opensearch/sql/expression/text/TextFunction.java 100.00% <0.00%> (ø)
.../opensearch/sql/planner/physical/SortOperator.java 100.00% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1f0d7e1...264e74d. Read the comment docs.

Copy link
Collaborator

@dai-chen dai-chen left a comment

Choose a reason for hiding this comment

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

Thanks for the fix!

@penghuo penghuo merged commit 7e215ff into 1.x Apr 7, 2022
@github-actions github-actions bot deleted the backport/backport-538-to-1.x branch April 7, 2022 18:58
opensearch-trigger-bot bot added a commit that referenced this pull request Apr 7, 2022
…539)

Signed-off-by: penghuo <penghuo@gmail.com>
(cherry picked from commit 54b7257)

Co-authored-by: Peng Huo <penghuo@gmail.com>
(cherry picked from commit 7e215ff)
penghuo pushed a commit that referenced this pull request Apr 8, 2022
…539) (#543)

Signed-off-by: penghuo <penghuo@gmail.com>
(cherry picked from commit 54b7257)
ps48 added a commit that referenced this pull request Jul 28, 2022
* Disable flaky test in JdbcTestIT. (#475)

Signed-off-by: penghuo <penghuo@gmail.com>

* Update dependency opensearch-ml-client group name (#477)

Signed-off-by: jackieyanghan <jkhanjob@gmail.com>

* Collected fixes related to bugs #280, #302, #783, #696 and 317 all together. (#479)

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>

* Add JDK 8 to CI Matrix  (#483) (#484)

* fixed references in java 8 and added to ci matrix
* filter test that fails due to jdk 8 bug
* use different degree to radian conversion for difference in jdk
* skip date time format tests that cause error due to jdk bug
* only disable DateTime unit test on Java 8

Bypassing failed DCO check

Signed-off-by: David Cui <davidcui@amazon.com>
(cherry picked from commit b6fccbd)

Co-authored-by: David Cui <53581635+davidcui1225@users.noreply.github.com>

* Add parse docs to PPL commands index (#486) (#487)

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Add 1.3.0 release notes (#492)

Signed-off-by: Eugene Lee <eugenesk@amazon.com>

* Add Kmeans and AD command documentation (#493) (#497)

Signed-off-by: jackieyanghan <jkhanjob@gmail.com>
(cherry picked from commit ee4bce0)

* Bump version to 1.3.1

Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>

* Bump ml

Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>

* Add new zip

Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>

* Updated release drafter

Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>

* Remove checked-in ml-commons dependency (#529)

Signed-off-by: jackieyanghan <jkhanjob@gmail.com>

* Bump workbench to 1.3.1 (#540)

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Bug Fix, return default ID when log4j ThreadContext is empty (#538) (#539) (#543)

Signed-off-by: penghuo <penghuo@gmail.com>
(cherry picked from commit 54b7257)

* Incremented version to 1.3.2. (#593)

Signed-off-by: Zelin Hao <zelinhao@amazon.com>
Signed-off-by: Joshua Li <joshuali925@gmail.com>

Co-authored-by: Joshua Li <joshuali925@gmail.com>

* Version bump 1.3.3

Signed-off-by: pgodithi <pgodithi@amazon.com>

* [1.3] Bump spring-beans to 5.2.20 (#632)

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Version bump 1.3.3

Signed-off-by: pgodithi <pgodithi@amazon.com>

* Incremented version to 1.3.4. (#681)

* Incremented version to 1.3.4.

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

* bump jackson to 2.13.2

Signed-off-by: Joshua Li <joshuali925@gmail.com>

Co-authored-by: Joshua Li <joshuali925@gmail.com>

Co-authored-by: Peng Huo <penghuo@gmail.com>
Co-authored-by: Jackie Han <41348518+jackiehanyang@users.noreply.github.com>
Co-authored-by: Yury-Fridlyand <88679692+Yury-Fridlyand@users.noreply.github.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: David Cui <53581635+davidcui1225@users.noreply.github.com>
Co-authored-by: Eugene Lee <eugenesk@amazon.com>
Co-authored-by: Sayali Gaikawad <gaiksaya@amazon.com>
Co-authored-by: Sayali Gaikawad <61760125+gaiksaya@users.noreply.github.com>
Co-authored-by: Joshua Li <joshuali925@gmail.com>
Co-authored-by: Zelin Hao <87548827+zelinh@users.noreply.github.com>
Co-authored-by: pgodithi <pgodithi@amazon.com>
Co-authored-by: Anirudha (Ani) Jadhav <anirudha@nyu.edu>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants