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 to 1.x] backport multiple PRs #355

Merged
merged 9 commits into from
Jan 12, 2022

Conversation

ylwu-amzn
Copy link
Collaborator

@ylwu-amzn ylwu-amzn commented Jan 11, 2022

Signed-off-by: Yaliang Wu [email protected]

Description

Backport PRs: #334 , #325, #350, #349 #335, #348,, #353, #339, #354

Check List

  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@amitgalitz
Copy link
Member

CI failing cause build-tools 1.2.0-snapshot doesn't seem to be uploaded. I already messaged infra about this and waiting for a response.

@ylwu-amzn ylwu-amzn changed the title [Backport to 1.x] upgrade gson to 2.8.9 (#354) [Backport to 1.x] backport multiple PRs Jan 11, 2022
@codecov-commenter
Copy link

Codecov Report

Merging #355 (2b9a0d0) into 1.x (3fc502d) will increase coverage by 3.02%.
The diff coverage is 33.33%.

Impacted file tree graph

@@             Coverage Diff              @@
##                1.x     #355      +/-   ##
============================================
+ Coverage     75.93%   78.95%   +3.02%     
- Complexity     3945     4087     +142     
============================================
  Files           295      295              
  Lines         17180    17207      +27     
  Branches       1812     1826      +14     
============================================
+ Hits          13045    13586     +541     
+ Misses         3306     2722     -584     
- Partials        829      899      +70     
Flag Coverage Δ
plugin 78.95% <33.33%> (+3.02%) ⬆️

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

Impacted Files Coverage Δ
...a/org/opensearch/ad/model/ADEntityTaskProfile.java 57.77% <6.25%> (+48.53%) ⬆️
...a/org/opensearch/ad/model/AnomalyResultBucket.java 80.00% <12.50%> (+80.00%) ⬆️
...rg/opensearch/ad/constant/CommonErrorMessages.java 97.91% <100.00%> (+0.13%) ⬆️
...a/org/opensearch/ad/model/DetectorProfileName.java 64.28% <100.00%> (+7.14%) ⬆️
...opensearch/ad/model/IntervalTimeConfiguration.java 100.00% <100.00%> (ø)
.../handler/AbstractAnomalyDetectorActionHandler.java 60.59% <100.00%> (+6.79%) ⬆️
...ch/ad/transport/SearchTopAnomalyResultRequest.java 90.90% <100.00%> (+90.90%) ⬆️
...ansport/SearchTopAnomalyResultTransportAction.java 78.14% <100.00%> (+71.03%) ⬆️
.../java/org/opensearch/ad/util/RestHandlerUtils.java 81.25% <100.00%> (ø)
...port/SearchAnomalyDetectorInfoTransportAction.java 55.55% <0.00%> (-8.89%) ⬇️
... and 28 more

@ylwu-amzn
Copy link
Collaborator Author

DCO check failed, as this is to backport PRs, should be ok to ignore these

  eecc6ece631f2cc2162d620d9cd8a9f1283360d6    Expected "Amit Galitzky <[email protected]>", but got "Amit Galitzky <[email protected]>".
  8ca8dfa31ab83e675fd18aa9fe11c316655b40b0    Expected "Daniel Doubrovkine (dB.) <[email protected]>", but got "dblock <[email protected]>".
  b55d9abad0d5e17c66492992ea40bc916e6e5411    Expected "Amit Galitzky <[email protected]>", but got "Amit Galitzky <[email protected]>".

@amitgalitz
Copy link
Member

DCO check failed, as this is to backport PRs, should be ok to ignore these

  eecc6ece631f2cc2162d620d9cd8a9f1283360d6    Expected "Amit Galitzky <[email protected]>", but got "Amit Galitzky <[email protected]>".
  8ca8dfa31ab83e675fd18aa9fe11c316655b40b0    Expected "Daniel Doubrovkine (dB.) <[email protected]>", but got "dblock <[email protected]>".
  b55d9abad0d5e17c66492992ea40bc916e6e5411    Expected "Amit Galitzky <[email protected]>", but got "Amit Galitzky <[email protected]>".

I agree, seems okay to still backport PRs, I'm investigating why DCO would fail for these PRs since I had --signoff in my commit as I always do and the original PR had no issue.

@amitgalitz
Copy link
Member

DCO check failed, as this is to backport PRs, should be ok to ignore these

  eecc6ece631f2cc2162d620d9cd8a9f1283360d6    Expected "Amit Galitzky <[email protected]>", but got "Amit Galitzky <[email protected]>".
  8ca8dfa31ab83e675fd18aa9fe11c316655b40b0    Expected "Daniel Doubrovkine (dB.) <[email protected]>", but got "dblock <[email protected]>".
  b55d9abad0d5e17c66492992ea40bc916e6e5411    Expected "Amit Galitzky <[email protected]>", but got "Amit Galitzky <[email protected]>".

I agree, seems okay to still backport PRs, I'm investigating why DCO would fail for these PRs since I had --signoff in my commit as I always do and the original PR had no issue.

Seems like this issue is caused by the fact my email was set to private at some point and address changed to [email protected], I changed my email to public now. Should be fine from now on but re-running workflow doesn't fix issues for these commits.

Copy link
Member

@amitgalitz amitgalitz left a comment

Choose a reason for hiding this comment

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

LGTM, couldn't find a way to easily roll back sign off check for those commits. Updated my github email to public so it shouldn't fail DCO check the same way again

@ylwu-amzn ylwu-amzn merged commit d1d8e60 into opensearch-project:1.x Jan 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants