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

Resolve core Xcontent and CircuitBreaker refactor #1062

Merged
merged 4 commits into from
Aug 1, 2023

Conversation

lezzago
Copy link
Member

@lezzago lezzago commented Aug 1, 2023

Issue #, if available:
N/A

Description of changes:
Resolve core Xcontent refactor from opensearch-project/OpenSearch#8826
Resolve core CircuitBreaker refactor from opensearch-project/OpenSearch#9006

CheckList:

  • 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.

@codecov
Copy link

codecov bot commented Aug 1, 2023

Codecov Report

Merging #1062 (78c68b1) into main (2430d81) will increase coverage by 0.42%.
Report is 5 commits behind head on main.
The diff coverage is 78.18%.

@@             Coverage Diff              @@
##               main    #1062      +/-   ##
============================================
+ Coverage     72.13%   72.55%   +0.42%     
+ Complexity      113      105       -8     
============================================
  Files           160      160              
  Lines         10301    10324      +23     
  Branches       1571     1518      -53     
============================================
+ Hits           7431     7491      +60     
+ Misses         1977     1974       -3     
+ Partials        893      859      -34     
Files Changed Coverage Δ
...pensearch/percolator/PercolatorFieldMapperExt.java 78.12% <ø> (ø)
...n/kotlin/org/opensearch/alerting/AlertingPlugin.kt 94.53% <ø> (ø)
...rg/opensearch/alerting/BucketLevelMonitorRunner.kt 79.75% <ø> (-0.41%) ⬇️
.../opensearch/alerting/DocumentLevelMonitorRunner.kt 84.10% <ø> (+0.82%) ⬆️
...ain/kotlin/org/opensearch/alerting/InputService.kt 89.88% <ø> (ø)
...in/org/opensearch/alerting/MonitorRunnerService.kt 75.00% <ø> (+0.75%) ⬆️
...org/opensearch/alerting/WorkflowMetadataService.kt 63.88% <ø> (ø)
...pensearch/alerting/action/ExecuteMonitorRequest.kt 100.00% <ø> (ø)
...ensearch/alerting/action/ExecuteMonitorResponse.kt 100.00% <ø> (ø)
...ensearch/alerting/action/ExecuteWorkflowRequest.kt 37.93% <ø> (+3.44%) ⬆️
... and 82 more

... and 7 files with indirect coverage changes

@lezzago lezzago marked this pull request as ready for review August 1, 2023 21:40
@@ -115,6 +115,7 @@ dependencies {
api project(":alerting-core")
implementation "com.github.seancfoley:ipaddress:5.3.3"

testImplementation "org.antlr:antlr4-runtime:${versions.antlr4}"
Copy link
Member

Choose a reason for hiding this comment

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

why is this required?

Copy link
Member Author

Choose a reason for hiding this comment

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

This causes the integration tests to fail since its missing this dependency. This is because it is used by the Painless scripts and its caused by the BucketSelectorExtAggregator. I tried having this change in common-utils, but it wouldn't help.

@lezzago lezzago merged commit 5fbb18a into opensearch-project:main Aug 1, 2023
13 of 16 checks passed
lezzago added a commit to lezzago/alerting-opensearch that referenced this pull request Aug 21, 2023
…#1062)

* Resolve core Xcontent refactor

Signed-off-by: Ashish Agrawal <[email protected]>

* Resolve core CircuitBreaker refactor

Signed-off-by: Ashish Agrawal <[email protected]>

* Resolve integ test issues with adding test dependency

Signed-off-by: Ashish Agrawal <[email protected]>

---------

Signed-off-by: Ashish Agrawal <[email protected]>
lezzago added a commit that referenced this pull request Aug 23, 2023
* Update imports for files refactored in core PR #8157 (#1025)

Signed-off-by: Ashish Agrawal <[email protected]>

* Resolve core Xcontent and CircuitBreaker refactor (#1062)

* Resolve core Xcontent refactor

Signed-off-by: Ashish Agrawal <[email protected]>

* Resolve core CircuitBreaker refactor

Signed-off-by: Ashish Agrawal <[email protected]>

* Resolve integ test issues with adding test dependency

Signed-off-by: Ashish Agrawal <[email protected]>

---------

Signed-off-by: Ashish Agrawal <[email protected]>

* fix breaking change from core library refactor (#1090)

Signed-off-by: Surya Sashank Nistala <[email protected]>

* Resolve additional compile issues

Signed-off-by: Ashish Agrawal <[email protected]>

* fix bwc issues

Signed-off-by: Ashish Agrawal <[email protected]>

* Update BWC version to deal with ktlint issues

Signed-off-by: Ashish Agrawal <[email protected]>

* Update BWC version

Signed-off-by: Ashish Agrawal <[email protected]>

* Disable BWC for non-bwc CIs

Signed-off-by: Ashish Agrawal <[email protected]>

* Fix integ tests and update CI flows

Signed-off-by: Ashish Agrawal <[email protected]>

---------

Signed-off-by: Ashish Agrawal <[email protected]>
Signed-off-by: Surya Sashank Nistala <[email protected]>
Co-authored-by: Surya Sashank Nistala <[email protected]>
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.

3 participants