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

Bump kafka_version from 3.6.1 to 3.7.0 #4087

Merged
merged 2 commits into from
Mar 5, 2024

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Mar 4, 2024

Bumps kafka_version from 3.6.1 to 3.7.0.
Updates org.apache.kafka:kafka-clients from 3.6.1 to 3.7.0

Updates org.apache.kafka:kafka_2.13 from 3.6.1 to 3.7.0

Updates org.apache.kafka:kafka-server-common from 3.6.1 to 3.7.0

Updates org.apache.kafka:kafka-group-coordinator from 3.6.1 to 3.7.0

Updates org.apache.kafka:kafka-metadata from 3.6.1 to 3.7.0

Updates org.apache.kafka:kafka-storage from 3.6.1 to 3.7.0

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps `kafka_version` from 3.6.1 to 3.7.0.

Updates `org.apache.kafka:kafka-clients` from 3.6.1 to 3.7.0

Updates `org.apache.kafka:kafka_2.13` from 3.6.1 to 3.7.0

Updates `org.apache.kafka:kafka-server-common` from 3.6.1 to 3.7.0

Updates `org.apache.kafka:kafka-group-coordinator` from 3.6.1 to 3.7.0

Updates `org.apache.kafka:kafka-metadata` from 3.6.1 to 3.7.0

Updates `org.apache.kafka:kafka-storage` from 3.6.1 to 3.7.0

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.kafka:kafka_2.13
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.kafka:kafka-server-common
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.kafka:kafka-group-coordinator
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.kafka:kafka-metadata
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.kafka:kafka-storage
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot added dependencies Pull requests that update a dependency file java Pull requests that update Java code labels Mar 4, 2024
@willyborankin
Copy link
Collaborator

there are breaking changes for Kafka. Not sure do we want to upgrade?

@willyborankin willyborankin added the backport 2.x backport to 2.x branch label Mar 4, 2024
@peternied
Copy link
Member

java.lang.ClassNotFoundException: org.apache.kafka.server.NodeToControllerChannelManager

Not sure its a breaking change, looks like there might be some test binaries that need to be incremented at the same time.

@cwperks
Copy link
Member

cwperks commented Mar 4, 2024

I believe this can be resolved by adding testImplementation "org.apache.kafka:kafka-server:${kafka_version}" as a dependency. The org.apache.kafka.server.NodeToControllerChannelManager class was moved in this PR.

Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Copy link
Member

cwperks commented Mar 5, 2024

I believe this can be resolved by adding testImplementation "org.apache.kafka:kafka-server:${kafka_version}" as a dependency. The org.apache.kafka.server.NodeToControllerChannelManager class was moved in this PR.

@peternied @willyborankin I pushed a commit to add this dependency to account for the missing class changing packages/jars.

Copy link
Member

@DarshitChanpura DarshitChanpura left a comment

Choose a reason for hiding this comment

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

LGTM. We can always revert if its decided at some point that the blast radius is too big for this change.

Copy link

codecov bot commented Mar 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 65.92%. Comparing base (f3b5727) to head (c73776d).
Report is 3 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4087      +/-   ##
==========================================
+ Coverage   65.90%   65.92%   +0.02%     
==========================================
  Files         298      298              
  Lines       21352    21352              
  Branches     3475     3475              
==========================================
+ Hits        14071    14076       +5     
+ Misses       5541     5535       -6     
- Partials     1740     1741       +1     

see 1 file with indirect coverage changes

@willyborankin willyborankin merged commit d235d97 into main Mar 5, 2024
93 checks passed
@willyborankin willyborankin deleted the dependabot/gradle/kafka_version-3.7.0 branch March 5, 2024 15:41
@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/security/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.x
# Create a new branch
git switch --create backport/backport-4087-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d235d97840a8450426f3c9d272e91f6afbd6ddce
# Push it to GitHub
git push --set-upstream origin backport/backport-4087-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.x

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

peternied pushed a commit that referenced this pull request Mar 6, 2024
Manual backport 493fe02 and
c73776d from #4087

Signed-off-by: Andrey Pleskach <ples@aiven.io>
dlin2028 pushed a commit to dlin2028/security that referenced this pull request May 1, 2024
Bumps `kafka_version` from 3.6.1 to 3.7.0.
Updates `org.apache.kafka:kafka-clients` from 3.6.1 to 3.7.0

Updates `org.apache.kafka:kafka_2.13` from 3.6.1 to 3.7.0

Updates `org.apache.kafka:kafka-server-common` from 3.6.1 to 3.7.0

Updates `org.apache.kafka:kafka-group-coordinator` from 3.6.1 to 3.7.0

Updates `org.apache.kafka:kafka-metadata` from 3.6.1 to 3.7.0

Updates `org.apache.kafka:kafka-storage` from 3.6.1 to 3.7.0


Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-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 dependencies Pull requests that update a dependency file java Pull requests that update Java code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants