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

Adding slf4j license header to LoggerMessageFormat.java #11069

Merged
merged 2 commits into from
Nov 2, 2023

Conversation

hyandell
Copy link
Contributor

@hyandell hyandell commented Nov 2, 2023

Description

Per #9879, I've added my suggested source header. I've only eyeballed the code (it's a comment being added) and haven't run any compiling/testing. No concerns if folk want to do a different PR for this, but I'm only a brief visitor to these shores.

Related Issues

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • Public documentation issue/PR created

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: Henri Yandell <hyandell@amazon.com>
Copy link
Contributor

github-actions bot commented Nov 2, 2023

Compatibility status:

Checks if related components are compatible with change 757409a

Incompatible components

Incompatible components: [https://github.com/opensearch-project/performance-analyzer.git]

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/performance-analyzer-rca.git]

@github-actions github-actions bot added the bug Something isn't working label Nov 2, 2023
Copy link
Contributor

github-actions bot commented Nov 2, 2023

Gradle Check (Jenkins) Run Completed with:

Copy link

codecov bot commented Nov 2, 2023

Codecov Report

Merging #11069 (757409a) into main (63aff16) will decrease coverage by 0.09%.
Report is 5 commits behind head on main.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##               main   #11069      +/-   ##
============================================
- Coverage     71.29%   71.20%   -0.09%     
- Complexity    58742    58787      +45     
============================================
  Files          4872     4872              
  Lines        276777   276780       +3     
  Branches      40240    40241       +1     
============================================
- Hits         197316   197070     -246     
- Misses        62943    63327     +384     
+ Partials      16518    16383     -135     
Files Coverage Δ
...earch/core/common/logging/LoggerMessageFormat.java 20.00% <ø> (ø)
...s/replication/SegmentReplicationTargetService.java 56.17% <100.00%> (+0.56%) ⬆️

... and 478 files with indirect coverage changes

@peternied
Copy link
Member

Thanks for digging into this @hyandell - changes look good to me, I'll see about getting this merged.

@peternied peternied changed the title Adding slf4j license header per #9879 Adding slf4j license header to LoggerMessageFormat.java Nov 2, 2023
Signed-off-by: Peter Nied <petern@amazon.com>
@peternied peternied self-assigned this Nov 2, 2023
Copy link
Contributor

github-actions bot commented Nov 2, 2023

Gradle Check (Jenkins) Run Completed with:

@peternied peternied merged commit c851b34 into opensearch-project:main Nov 2, 2023
31 of 32 checks passed
@dblock dblock added the backport 2.x Backport to 2.x branch label Nov 3, 2023
@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-11069-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c851b34735294a4eb6baf5c1254de1b130daa6c4
# Push it to GitHub
git push --set-upstream origin backport/backport-11069-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-11069-to-2.x.

@dblock
Copy link
Member

dblock commented Nov 3, 2023

I presume we need to backport it to active branches, I would do 2.x and 1.x.
@hyandell looks like you may need to do this by hand

@hyandell
Copy link
Contributor Author

hyandell commented Nov 3, 2023

Definitely looking for y'all to manage your backports :) But +1 to applying this on the active branches.

@dblock
Copy link
Member

dblock commented Nov 7, 2023

@hyandell You'll have to manually backport to 2.x and 1.x, these are active trees.

rayshrey pushed a commit to rayshrey/OpenSearch that referenced this pull request Mar 18, 2024
…roject#11069)

* Adding slf4j license header per opensearch-project#9879

Signed-off-by: Henri Yandell <hyandell@amazon.com>
Signed-off-by: Henri Yandell <477715+hyandell@users.noreply.github.com>
Signed-off-by: Peter Nied <petern@amazon.com>
Co-authored-by: Peter Nied <petern@amazon.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…roject#11069)

* Adding slf4j license header per opensearch-project#9879

Signed-off-by: Henri Yandell <hyandell@amazon.com>
Signed-off-by: Henri Yandell <477715+hyandell@users.noreply.github.com>
Signed-off-by: Peter Nied <petern@amazon.com>
Co-authored-by: Peter Nied <petern@amazon.com>
Signed-off-by: Shivansh Arora <hishiv@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Licensing of org.opensearch.core.common.logging.LoggerMessageFormat.java
3 participants