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 org.springframework.kafka:spring-kafka-test from 2.9.13 to 3.3.0 #4946

Merged
merged 2 commits into from
Dec 4, 2024

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Dec 4, 2024

Description

Bump org.springframework.kafka:spring-kafka-test from 2.9.13 to 3.3.0.

Unable to update kafka_version to > 3.7.1

This is possible now that spring-kafka-test has release 3.3.0: #4871 (comment)

  • Category (Enhancement, New feature, Bug fix, Test fix, Refactoring, Maintenance, Documentation)

Maintenance

Check List

  • New functionality includes testing
  • New functionality has been documented
  • New Roles/Permissions have a corresponding security dashboards plugin PR
  • API changes companion pull request created
  • 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.

@cwperks cwperks added backport 1.3 backport to 1.3 branch backport 2.x backport to 2.x branch labels Dec 4, 2024
Signed-off-by: Craig Perkins <[email protected]>
@cwperks cwperks changed the title Bump kafka_version from 3.7.1 to 3.9.0 and spring-kafka-test from 2.9.1 to 3.3.0 Bump org.springframework.kafka:spring-kafka-test from 2.9.13 to 3.3.0 Dec 4, 2024
@cwperks
Copy link
Member Author

cwperks commented Dec 4, 2024

Getting a new error with KafkaSinkTest now:

> ./gradlew citest --tests KafkaSinkTest

...
Suite: Test class org.opensearch.security.auditlog.sink.KafkaSinkTest
  1> [2024-12-04T11:12:25,463][WARN ][org.apache.zookeeper.server.ServerCnxnFactory] maxCnxns is not configured, using default value 0.
  2> java.lang.NoClassDefFoundError: org/apache/kafka/coordinator/group/api/assignor/ConsumerGroupPartitionAssignor
        at __randomizedtesting.SeedInfo.seed([F0240D194ED5F52B]:0)
        at java.base/java.lang.ClassLoader.defineClass1(Native Method)
        at java.base/java.lang.ClassLoader.defineClass(ClassLoader.java:1027)
        at java.base/java.security.SecureClassLoader.defineClass(SecureClassLoader.java:150)
        at java.base/jdk.internal.loader.BuiltinClassLoader.defineClass(BuiltinClassLoader.java:862)
        at java.base/jdk.internal.loader.BuiltinClassLoader.findClassOnClassPathOrNull(BuiltinClassLoader.java:760)
        at java.base/jdk.internal.loader.BuiltinClassLoader.loadClassOrNull(BuiltinClassLoader.java:681)
        at java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:639)
        at java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:188)
        at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:526)
        at org.apache.kafka.coordinator.group.GroupCoordinatorConfig.<clinit>(GroupCoordinatorConfig.java:119)
        at org.apache.kafka.server.config.AbstractKafkaConfig.<clinit>(AbstractKafkaConfig.java:46)
        at org.springframework.kafka.test.EmbeddedKafkaZKBroker.afterPropertiesSet(EmbeddedKafkaZKBroker.java:322)
        at org.springframework.kafka.test.rule.EmbeddedKafkaRule.before(EmbeddedKafkaRule.java:114)
        at org.opensearch.security.auditlog.sink.KafkaSinkTest$1.before(KafkaSinkTest.java:48)

        Caused by:
        java.lang.ClassNotFoundException: org.apache.kafka.coordinator.group.api.assignor.ConsumerGroupPartitionAssignor
            at java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:641)
            at java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:188)
            at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:526)
            ... 14 more

This is a different error than the one seen here: #4871 (comment)

Copy link

codecov bot commented Dec 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.47%. Comparing base (64f4d5b) to head (61aa3ef).
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4946      +/-   ##
==========================================
+ Coverage   71.43%   71.47%   +0.04%     
==========================================
  Files         334      334              
  Lines       22551    22551              
  Branches     3590     3590              
==========================================
+ Hits        16109    16119      +10     
+ Misses       4647     4636      -11     
- Partials     1795     1796       +1     

see 6 files with indirect coverage changes

@cwperks
Copy link
Member Author

cwperks commented Dec 4, 2024

@DarshitChanpura @reta @willyborankin Can I get a review for this dep update PR?

@willyborankin willyborankin merged commit 67f378a into opensearch-project:main Dec 4, 2024
42 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 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-1.3 1.3
# Navigate to the new working tree
pushd ../.worktrees/security/backport-1.3
# Create a new branch
git switch --create backport/backport-4946-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 67f378a11789eeea335270c3771a61c723b211f7
# Push it to GitHub
git push --set-upstream origin backport/backport-4946-to-1.3
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-1.3

Then, create a pull request where the base branch is 1.3 and the compare/head branch is backport/backport-4946-to-1.3.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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-4946-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 67f378a11789eeea335270c3771a61c723b211f7
# Push it to GitHub
git push --set-upstream origin backport/backport-4946-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-4946-to-2.x.

@cwperks
Copy link
Member Author

cwperks commented Dec 4, 2024

I'll create manual backports

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.3 backport to 1.3 branch backport 2.x backport to 2.x branch backport-failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants