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

Replace and block usages of org.apache.logging.log4j.util.Strings #15238

Merged
merged 2 commits into from
Aug 14, 2024

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Aug 14, 2024

Description

Replaces usages of org.apache.logging.log4j.util.Strings and joptsimple.internal.Strings with org.opensearch.core.common.Strings. This PR also makes the classes forbidden to prevent the precommit check from passing if there are any usages of org.apache.logging.log4j.util.Strings or joptsimple.internal.Strings.

Related Issues

Resolves #15211

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

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.

Signed-off-by: Craig Perkins <cwperx@amazon.com>
@github-actions github-actions bot added bug Something isn't working Libraries Lucene Upgrades and Libraries, Any 3rd party library that Core depends on, ex: nebula; team is respo labels Aug 14, 2024
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Copy link
Contributor

✅ Gradle check result for 9ebeab5: SUCCESS

Copy link
Contributor

❌ Gradle check result for cba60b2: TIMEOUT

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

✅ Gradle check result for cba60b2: SUCCESS

Copy link

codecov bot commented Aug 14, 2024

Codecov Report

Attention: Patch coverage is 33.33333% with 4 lines in your changes missing coverage. Please review.

Project coverage is 71.89%. Comparing base (6e27e5a) to head (cba60b2).
Report is 4 commits behind head on main.

Files Patch % Lines
...teway/remote/RemoteClusterStateCleanupManager.java 0.00% 0 Missing and 2 partials ⚠️
.../main/java/org/opensearch/env/NodeEnvironment.java 0.00% 0 Missing and 1 partial ⚠️
...ain/java/org/opensearch/index/shard/ShardPath.java 0.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff            @@
##               main   #15238   +/-   ##
=========================================
  Coverage     71.89%   71.89%           
- Complexity    63043    63071   +28     
=========================================
  Files          5197     5197           
  Lines        295311   295311           
  Branches      42676    42677    +1     
=========================================
+ Hits         212314   212316    +2     
- Misses        65552    65598   +46     
+ Partials      17445    17397   -48     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@dblock dblock added skip-changelog backport 2.x Backport to 2.x branch labels Aug 14, 2024
@dblock dblock merged commit d74e276 into opensearch-project:main Aug 14, 2024
36 of 38 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-15238-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d74e276af68edbc5caf382fd2e61f11b9935c221
# Push it to GitHub
git push --set-upstream origin backport/backport-15238-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-15238-to-2.x.

@dblock
Copy link
Member

dblock commented Aug 14, 2024

@cwperks backport manually please?

cwperks added a commit to cwperks/OpenSearch that referenced this pull request Aug 14, 2024
…ensearch-project#15238)

* Replace and block usages of org.apache.logging.log4j.util.Strings

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit d74e276)
@cwperks
Copy link
Member Author

cwperks commented Aug 14, 2024

@dblock Created a manual backport: #15246

reta pushed a commit that referenced this pull request Aug 14, 2024
…5238) (#15246)

* Replace and block usages of org.apache.logging.log4j.util.Strings

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit d74e276)
vibrantvarun added a commit to vibrantvarun/neural-search that referenced this pull request Aug 21, 2024
…rch Core

Signed-off-by: Varun Jain <varunudr@amazon.com>
vibrantvarun added a commit to opensearch-project/neural-search that referenced this pull request Aug 21, 2024
* Upgrade BWC version and fix neural search build (#868)

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Incrementing opensearch version to 2.17.0-SNAPSHOT

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Incorporate fix from opensearch-project/OpenSearch#15238 from OpenSearch Core

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Address Naveen's comment

Signed-off-by: Varun Jain <varunudr@amazon.com>

---------

Signed-off-by: Varun Jain <varunudr@amazon.com>
wdongyu pushed a commit to wdongyu/OpenSearch that referenced this pull request Aug 22, 2024
…ensearch-project#15238)

* Replace and block usages of org.apache.logging.log4j.util.Strings

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
akolarkunnu pushed a commit to akolarkunnu/OpenSearch that referenced this pull request Sep 10, 2024
…ensearch-project#15238)

* Replace and block usages of org.apache.logging.log4j.util.Strings

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch backport-failed bug Something isn't working Libraries Lucene Upgrades and Libraries, Any 3rd party library that Core depends on, ex: nebula; team is respo skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Replace (and block) uses of org.apache.logging.log4j.util.Strings
2 participants