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

[improve] Upgrade Jetcd to 0.7.7 and VertX to 4.5.8 #22835

Merged
merged 3 commits into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions distribution/server/src/assemble/LICENSE.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,7 @@ The Apache Software License, Version 2.0
- io.grpc-grpc-rls-1.56.0.jar
- io.grpc-grpc-servlet-1.56.0.jar
- io.grpc-grpc-servlet-jakarta-1.56.0.jar
- io.grpc-grpc-util-1.60.0.jar
* Perfmark
- io.perfmark-perfmark-api-0.26.0.jar
* OpenCensus
Expand All @@ -455,7 +456,7 @@ The Apache Software License, Version 2.0
- io.opencensus-opencensus-proto-0.2.0.jar
* Jodah
- net.jodah-typetools-0.5.0.jar
- net.jodah-failsafe-2.4.4.jar
- dev.failsafe-failsafe-3.3.2.jar
* Byte Buddy
- net.bytebuddy-byte-buddy-1.14.12.jar
* zt-zip
Expand Down Expand Up @@ -492,12 +493,12 @@ The Apache Software License, Version 2.0
* JCTools - Java Concurrency Tools for the JVM
- org.jctools-jctools-core-2.1.2.jar
* Vertx
- io.vertx-vertx-auth-common-4.3.8.jar
- io.vertx-vertx-bridge-common-4.3.8.jar
- io.vertx-vertx-core-4.3.8.jar
- io.vertx-vertx-web-4.3.8.jar
- io.vertx-vertx-web-common-4.3.8.jar
- io.vertx-vertx-grpc-4.3.5.jar
- io.vertx-vertx-auth-common-4.5.8.jar
- io.vertx-vertx-bridge-common-4.5.8.jar
- io.vertx-vertx-core-4.5.8.jar
- io.vertx-vertx-web-4.5.8.jar
- io.vertx-vertx-web-common-4.5.8.jar
- io.vertx-vertx-grpc-4.5.8.jar
* Apache ZooKeeper
- org.apache.zookeeper-zookeeper-3.9.2.jar
- org.apache.zookeeper-zookeeper-jute-3.9.2.jar
Expand All @@ -510,10 +511,10 @@ The Apache Software License, Version 2.0
- com.google.auto.value-auto-value-annotations-1.10.1.jar
- com.google.re2j-re2j-1.7.jar
* Jetcd
- io.etcd-jetcd-api-0.7.5.jar
- io.etcd-jetcd-common-0.7.5.jar
- io.etcd-jetcd-core-0.7.5.jar
- io.etcd-jetcd-grpc-0.7.5.jar
- io.etcd-jetcd-api-0.7.7.jar
- io.etcd-jetcd-common-0.7.7.jar
- io.etcd-jetcd-core-0.7.7.jar
- io.etcd-jetcd-grpc-0.7.7.jar
* IPAddress
- com.github.seancfoley-ipaddress-5.3.3.jar
* RxJava
Expand Down
23 changes: 21 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ flexible messaging model and an intuitive client API.</description>
<jersey.version>2.41</jersey.version>
<athenz.version>1.10.50</athenz.version>
<prometheus.version>0.16.0</prometheus.version>
<vertx.version>4.3.8</vertx.version>
<vertx.version>4.5.8</vertx.version>
<rocksdb.version>7.9.2</rocksdb.version>
<slf4j.version>2.0.13</slf4j.version>
<commons.collections4.version>4.4</commons.collections4.version>
Expand Down Expand Up @@ -251,7 +251,7 @@ flexible messaging model and an intuitive client API.</description>
<spring.version>5.3.27</spring.version>
<apache-http-client.version>4.5.13</apache-http-client.version>
<apache-httpcomponents.version>4.4.15</apache-httpcomponents.version>
<jetcd.version>0.7.5</jetcd.version>
<jetcd.version>0.7.7</jetcd.version>
<oxia.version>0.3.0</oxia.version>
<snakeyaml.version>2.0</snakeyaml.version>
<ant.version>1.10.12</ant.version>
Expand All @@ -265,6 +265,7 @@ flexible messaging model and an intuitive client API.</description>
<opentelemetry.instrumentation.alpha.version>${opentelemetry.instrumentation.version}-alpha</opentelemetry.instrumentation.alpha.version>
<opentelemetry.semconv.version>1.25.0-alpha</opentelemetry.semconv.version>
<picocli.version>4.7.5</picocli.version>
<failsafe.version>3.3.2</failsafe.version>

<!-- test dependencies -->
<testcontainers.version>1.18.3</testcontainers.version>
Expand Down Expand Up @@ -384,6 +385,12 @@ flexible messaging model and an intuitive client API.</description>
<version>${mockito.version}</version>
</dependency>

<dependency>
<groupId>dev.failsafe</groupId>
<artifactId>failsafe</artifactId>
<version>${failsafe.version}</version>
</dependency>

<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
Expand Down Expand Up @@ -509,6 +516,11 @@ flexible messaging model and an intuitive client API.</description>
<artifactId>vertx-web</artifactId>
<version>${vertx.version}</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc</artifactId>
<version>${vertx.version}</version>
</dependency>

<dependency>
<groupId>org.apache.curator</groupId>
Expand Down Expand Up @@ -607,6 +619,13 @@ flexible messaging model and an intuitive client API.</description>
</exclusions>
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-util</artifactId>
<!-- This is only used for JEtcd so far. Once we upgrade Grpc to >= 1.60, we can remove the special version pin -->
<version>1.60.0</version>
</dependency>

<dependency>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper-common</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions tests/integration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,12 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>dev.failsafe</groupId>
<artifactId>failsafe</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mysql</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package org.apache.pulsar.tests.integration.io;

import dev.failsafe.RetryPolicy;
import java.time.Duration;
import java.util.LinkedHashMap;
import java.util.Map;
Expand All @@ -33,7 +34,6 @@

import lombok.Cleanup;
import lombok.extern.slf4j.Slf4j;
import net.jodah.failsafe.RetryPolicy;

@Slf4j
public abstract class PulsarIOTestRunner {
Expand All @@ -42,10 +42,11 @@ public abstract class PulsarIOTestRunner {
final Duration ONE_MINUTE = Duration.ofMinutes(1);
final Duration TEN_SECONDS = Duration.ofSeconds(10);

protected final RetryPolicy<Void> statusRetryPolicy = new RetryPolicy<Void>()
protected final RetryPolicy<?> statusRetryPolicy = RetryPolicy.builder()
.withMaxDuration(ONE_MINUTE)
.withDelay(TEN_SECONDS)
.onRetry(e -> log.error("Retry ... "));
.onRetry(e -> log.error("Retry ... "))
.build();

protected PulsarCluster pulsarCluster;
protected String functionRuntimeType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;

import dev.failsafe.Failsafe;
import java.util.LinkedHashMap;
import java.util.Map;

Expand All @@ -46,7 +47,6 @@

import lombok.Cleanup;
import lombok.extern.slf4j.Slf4j;
import net.jodah.failsafe.Failsafe;

@Slf4j
public class PulsarIOSinkRunner extends PulsarIOTestRunner {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;

import dev.failsafe.Failsafe;
import java.util.Map;

import org.apache.commons.lang3.StringUtils;
Expand All @@ -45,7 +46,6 @@

import lombok.Cleanup;
import lombok.extern.slf4j.Slf4j;
import net.jodah.failsafe.Failsafe;

@Slf4j
public class PulsarIOSourceRunner extends PulsarIOTestRunner {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
package org.apache.pulsar.tests.integration.io.sources.debezium;

import com.google.common.base.Preconditions;
import dev.failsafe.Failsafe;
import lombok.Cleanup;
import lombok.extern.slf4j.Slf4j;
import net.jodah.failsafe.Failsafe;
import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.SubscriptionInitialPosition;
Expand Down
Loading