Skip to content

Commit 093be5b

Browse files
authored
Revert "[NA] [BE] Bump org.redisson:redisson from 3.52.0 to 4.0.0 in /apps/op…" (#4682)
This reverts commit d39ec5b.
1 parent 9849a79 commit 093be5b

File tree

8 files changed

+12
-24
lines changed

8 files changed

+12
-24
lines changed

apps/opik-backend/config.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,6 @@ redis:
129129
# Default: redis://:opik@localhost:6379/0
130130
# Description: single node redis's URL
131131
singleNodeUrl: ${REDIS_URL:-redis://:opik@localhost:6379/0}
132-
# Default: 3
133-
# Description: Number of retry attempts for Redis operations
134-
retryAttempts: ${REDIS_RETRY_ATTEMPTS:-3}
135132
# AWS IAM authentication configuration (optional)
136133
# When enabled, takes precedence over singleNodeUrl authentication
137134
awsIamAuth:

apps/opik-backend/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<testcontainers.version>2.0.2</testcontainers.version>
3131
<uuid.java.generator.version>5.2.0</uuid.java.generator.version>
3232
<wiremock.version>3.13.1</wiremock.version>
33-
<redisson.version>4.0.0</redisson.version>
33+
<redisson.version>3.52.0</redisson.version>
3434
<opentelmetry.version>2.23.0</opentelmetry.version>
3535
<aws.java.sdk.version>2.40.3</aws.java.sdk.version>
3636
<json-path.version>2.10.0</json-path.version>

apps/opik-backend/src/main/java/com/comet/opik/api/resources/v1/events/BaseRedisSubscriber.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
import lombok.Getter;
1212
import lombok.NonNull;
1313
import org.apache.commons.collections4.CollectionUtils;
14+
import org.redisson.api.AutoClaimResult;
15+
import org.redisson.api.PendingEntry;
1416
import org.redisson.api.RStreamReactive;
1517
import org.redisson.api.RedissonReactiveClient;
18+
import org.redisson.api.StreamMessageId;
1619
import org.redisson.api.options.PlainOptions;
17-
import org.redisson.api.stream.AutoClaimResult;
18-
import org.redisson.api.stream.PendingEntry;
1920
import org.redisson.api.stream.StreamCreateGroupArgs;
20-
import org.redisson.api.stream.StreamMessageId;
2121
import org.redisson.api.stream.StreamPendingRangeArgs;
2222
import org.redisson.api.stream.StreamReadGroupArgs;
2323
import org.slf4j.Logger;

apps/opik-backend/src/main/java/com/comet/opik/infrastructure/RedisConfig.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,13 @@ public class RedisConfig {
2727
@Valid @JsonProperty
2828
private AwsIamAuthConfig awsIamAuth = new AwsIamAuthConfig();
2929

30-
@Valid @JsonProperty
31-
private Integer retryAttempts;
32-
3330
public Config build() {
3431
Objects.requireNonNull(singleNodeUrl, "singleNodeUrl must not be null");
3532
var redisUrl = RedisUrl.parse(singleNodeUrl);
3633
var config = new Config();
3734
var singleServerConfig = config.useSingleServer()
3835
.setAddress(redisUrl.address())
3936
.setDatabase(redisUrl.database());
40-
if (retryAttempts != null) {
41-
singleServerConfig.setRetryAttempts(retryAttempts);
42-
}
4337
if (awsIamAuth.isEnabled()) {
4438
// Configure Redis with AWS IAM authentication using DefaultCredentialsProvider
4539
// This will read from environment variables, system properties, IAM roles, etc.

apps/opik-backend/src/main/java/com/comet/opik/infrastructure/redis/RedisHealthCheck.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,19 @@
44
import jakarta.inject.Singleton;
55
import lombok.NonNull;
66
import lombok.RequiredArgsConstructor;
7-
import org.redisson.api.RedissonClient;
8-
import org.redisson.api.redisnode.RedisNodes;
7+
import org.redisson.api.RedissonReactiveClient;
98
import ru.vyarus.dropwizard.guice.module.installer.feature.health.NamedHealthCheck;
109

1110
@Singleton
1211
@RequiredArgsConstructor(onConstructor_ = @Inject)
1312
public class RedisHealthCheck extends NamedHealthCheck {
1413

15-
private final @NonNull RedissonClient redisClient;
14+
private final @NonNull RedissonReactiveClient redisClient;
1615

1716
@Override
1817
protected Result check() {
1918
try {
20-
if (redisClient.getRedisNodes(RedisNodes.SINGLE).pingAll()) {
19+
if (redisClient.getNodesGroup().pingAll()) {
2120
return Result.healthy();
2221
}
2322
} catch (Exception ex) {

apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/events/BaseRedisSubscriberTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import org.redisson.Redisson;
1414
import org.redisson.api.RStreamReactive;
1515
import org.redisson.api.RedissonReactiveClient;
16+
import org.redisson.api.StreamMessageId;
1617
import org.redisson.api.stream.StreamAddArgs;
1718
import org.redisson.api.stream.StreamCreateGroupArgs;
18-
import org.redisson.api.stream.StreamMessageId;
1919
import org.redisson.api.stream.StreamReadGroupArgs;
2020
import org.redisson.codec.JsonJacksonCodec;
2121
import org.redisson.config.Config;
@@ -63,8 +63,7 @@ void setUpAll() {
6363
var redissonConfig = new Config();
6464
redissonConfig.useSingleServer()
6565
.setAddress(redis.getRedisURI())
66-
.setDatabase(0)
67-
.setRetryAttempts(0); // Disable retries for faster test execution
66+
.setDatabase(0);
6867
redissonConfig.setCodec(new JsonJacksonCodec(JsonUtils.getMapper()));
6968
redissonClient = Redisson.create(redissonConfig).reactive();
7069

apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/events/BaseRedisSubscriberUnitTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
import org.junit.jupiter.api.extension.ExtendWith;
1010
import org.mockito.Mock;
1111
import org.mockito.junit.jupiter.MockitoExtension;
12+
import org.redisson.api.AutoClaimResult;
1213
import org.redisson.api.RStreamReactive;
1314
import org.redisson.api.RedissonReactiveClient;
15+
import org.redisson.api.StreamMessageId;
1416
import org.redisson.api.options.PlainOptions;
15-
import org.redisson.api.stream.AutoClaimResult;
1617
import org.redisson.api.stream.StreamCreateGroupArgs;
17-
import org.redisson.api.stream.StreamMessageId;
1818
import org.redisson.api.stream.StreamPendingRangeArgs;
1919
import org.redisson.api.stream.StreamReadGroupArgs;
2020
import reactor.core.publisher.Mono;

apps/opik-backend/src/test/resources/config-test.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@ redis:
113113
# Default: redis://:opik@localhost:6379/0
114114
# Description: single node redis's URL
115115
singleNodeUrl: redis://:opik@localhost:6379/0
116-
# Disable retries for faster test execution
117-
retryAttempts: 0
118116

119117
openTelemetry:
120118
# Default: 3h
@@ -559,6 +557,7 @@ webhook:
559557
poolingInterval: 1s
560558
# Default: 5s
561559
# Description: Timeout for blocking read operations on Redis streams (long polling duration)
560+
# Note: In tests, set this <= poolingInterval to avoid backpressure drops
562561
longPollingDuration: 500ms
563562
# Default: 3
564563
# Description: Maximum number of retry attempts for failed webhooks (1-10)

0 commit comments

Comments
 (0)