build(deps): bump grpc from 1.73.0 to 1.74.0

Bumps `grpc` from 1.73.0 to 1.74.0.

Updates `io.grpc:grpc-core` from 1.73.0 to 1.74.0
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.73.0...v1.74.0)

Updates `io.grpc:grpc-netty` from 1.73.0 to 1.74.0
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.73.0...v1.74.0)

Updates `io.grpc:grpc-protobuf` from 1.73.0 to 1.74.0
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.73.0...v1.74.0)

Updates `io.grpc:grpc-stub` from 1.73.0 to 1.74.0
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.73.0...v1.74.0)

Updates `io.grpc:grpc-grpclb` from 1.73.0 to 1.74.0
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.73.0...v1.74.0)

Updates `io.grpc:grpc-inprocess` from 1.73.0 to 1.74.0
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.73.0...v1.74.0)

Updates `io.grpc:grpc-util` from 1.73.0 to 1.74.0
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.73.0...v1.74.0)

---
updated-dependencies:
- dependency-name: io.grpc:grpc-core
  dependency-version: 1.74.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.grpc:grpc-netty
  dependency-version: 1.74.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.grpc:grpc-protobuf
  dependency-version: 1.74.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.grpc:grpc-stub
  dependency-version: 1.74.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.grpc:grpc-grpclb
  dependency-version: 1.74.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.grpc:grpc-inprocess
  dependency-version: 1.74.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.grpc:grpc-util
  dependency-version: 1.74.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/build-main.yml

@@ -42,8 +42,8 @@ jobs:
           - 17
           - 21
         etcd:
-          - quay.io/coreos/etcd:v3.5.14
-          - quay.io/coreos/etcd:v3.4.33
+          - quay.io/coreos/etcd:v3.5.21
+          - quay.io/coreos/etcd:v3.6.0
     uses: ./.github/workflows/build.yml
     with:
       javaVersion: "${{ matrix.java-version }}"

.github/workflows/build-pr.yml

@@ -43,8 +43,8 @@ jobs:
           - 17
           - 21
         etcd:
-          - quay.io/coreos/etcd:v3.5.14
-          - quay.io/coreos/etcd:v3.4.33
+          - quay.io/coreos/etcd:v3.5.21
+          - quay.io/coreos/etcd:v3.6.0
     uses: ./.github/workflows/build.yml
     with:
       javaVersion: "${{ matrix.java-version }}"

OWNERS

@@ -3,5 +3,4 @@
 approvers:
   - fanminshi       # Fanmin Shi <fanmin.shi@coreos.com>
   - lburgazzoli     # Luca Burgazzoli <lburgazzoli@gmail.com>
-  - xiang90         # Xiang Li <xiang.li@coreos.com>
-  - heyitsanthony   # Anthony Romano <anthony.romano@coreos.com>
+  - vorburger       # Michael Vorburger <mike@vorburger.ch>

README.md

@@ -111,7 +111,7 @@ The project is tested against a three node `etcd` setup started with the Launche
 
 ```sh
 $ ./gradlew test
-````
+```
 
 ### Troubleshooting
 

build.gradle

@@ -76,6 +76,13 @@ subprojects {
             maxFailures = 5
         }
     }
+    testing {
+        suites {
+            test {
+                useJUnitJupiter()
+            }
+        }
+    }
 
     testlogger {
         theme 'mocha-parallel'

gradle/libs.versions.toml

@@ -1,22 +1,22 @@
 [versions]
-grpc = "1.70.0"
-log4j = "2.24.3"
-mockito = "5.15.2"
+grpc = "1.74.0"
+log4j = "2.25.1"
+mockito = "5.18.0"
 slf4j = "2.0.17"
-guava = "33.4.0-jre"
+guava = "33.4.8-jre"
 assertj = "3.27.3"
-junit = "5.11.4"
-testcontainers = "1.20.5"
+junit = "5.13.4"
+testcontainers = "1.21.3"
 protoc = "3.25.1"
 failsafe = "3.3.2"
 awaitility = "4.3.0"
-commonsIo = "2.18.0"
-commonCompress = "1.27.1"
+commonsIo = "2.20.0"
+commonCompress = "1.28.0"
 autoService = "1.1.1"
 errorprone = "2.30.0"
-vertx = "4.5.13"
-picocli = "4.7.6"
-restAssured = "5.5.1"
+vertx = "5.0.1"
+picocli = "4.7.7"
+restAssured = "5.5.5"
 javaxAnnotation = "1.3.2"
 
 versionsPlugin = "0.52.0"
@@ -24,7 +24,7 @@ errorPronePlugin = "4.0.1"
 spotlessPlugin = "6.25.0"
 shadowPlugin = "8.1.1"
 testLoggerPlugin = "4.0.0"
-protobufPlugin = "0.9.4"
+protobufPlugin = "0.9.5"
 nexusPublishPlugin = "2.0.0"
 axionReleasePlugin = "1.18.17"
 testRetryPlugin = "1.6.2"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

jetcd-core/src/main/java/io/etcd/jetcd/ClientBuilder.java

@@ -37,6 +37,7 @@ import io.grpc.Metadata;
 import io.grpc.netty.GrpcSslContexts;
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
+import io.vertx.core.Vertx;
 
 import com.google.common.base.Strings;
 
@@ -68,6 +69,7 @@ public final class ClientBuilder implements Cloneable {
     private Duration retryMaxDuration;
     private Duration connectTimeout;
     private boolean waitForReady = true;
+    private Vertx vertx;
 
     ClientBuilder() {
     }
@@ -707,6 +709,30 @@ public final class ClientBuilder implements Cloneable {
         return this;
     }
 
+    /**
+     * Gets the Vertx instance.
+     *
+     * @return the vertx instance.
+     */
+    public Vertx vertx() {
+        return vertx;
+    }
+
+    /**
+     * configure Vertx instance.
+     *
+     * @param  vertx                    Vertx instance to use.
+     * @return                          this builder to train
+     * @throws IllegalArgumentException if vertx is null
+     */
+    public ClientBuilder vertx(Vertx vertx) {
+        Preconditions.checkArgument(vertx != null, "vertx can't be null");
+
+        this.vertx = vertx;
+
+        return this;
+    }
+
     /**
      * build a new Client.
      *

jetcd-core/src/main/java/io/etcd/jetcd/impl/ClientConnectionManager.java

@@ -61,6 +61,10 @@ final class ClientConnectionManager {
         } else {
             this.executorService = builder.executorService();
         }
+
+        if (builder.vertx() != null) {
+            this.vertx = builder.vertx();
+        }
     }
 
     ManagedChannel getChannel() {

jetcd-core/src/main/java/io/etcd/jetcd/impl/ElectionImpl.java

@@ -135,7 +135,7 @@ final class ElectionImpl extends Impl implements Election {
         requireNonNull(listener, "listener should not be null");
 
         LeaderRequest request = LeaderRequest.newBuilder()
-            .setName(ByteString.copyFrom(electionName.getBytes()))
+            .setName(Util.prefixNamespace(electionName, namespace))
             .build();
 
         stubWithLeader().observeWithHandler(request,

jetcd-core/src/main/java/io/etcd/jetcd/impl/WatchImpl.java

@@ -23,7 +23,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -357,7 +356,7 @@ final class WatchImpl extends Impl implements Watch {
         private void reschedule() {
             Futures.addCallback(executor.schedule(this::resume, 500, TimeUnit.MILLISECONDS), new FutureCallback<Object>() {
                 @Override
-                public void onFailure(@NonNull Throwable t) {
+                public void onFailure(Throwable t) {
                     LOG.warn("scheduled resume failed", t);
                 }
 

jetcd-core/src/test/java/io/etcd/jetcd/impl/ClientBuilderTest.java

@@ -50,6 +50,11 @@ public class ClientBuilderTest {
         assertThatThrownBy(() -> Client.builder().endpoints((URI) null)).isInstanceOf(NullPointerException.class);
     }
 
+    @Test
+    public void testVertx_Null() {
+        assertThatThrownBy(() -> Client.builder().vertx(null)).isInstanceOf(IllegalArgumentException.class);
+    }
+
     @Test
     public void testEndPoints_Verify_Empty() {
         assertThatThrownBy(() -> Client.builder().endpoints(new URI(""))).isInstanceOf(IllegalArgumentException.class);