8000 update dependencies · dannylee-/java-redis-client@eca51fb · GitHub
[go: up one dir, main page]
Skip to content

Commit eca51fb

Browse files
malafeevmalafeev
committed
update dependencies
Signed-off-by: Sergei Malafeev <sergeymalafeev@gmail.com>
1 parent 1013d8d commit eca51fb

File tree

19 files changed

+374
-32
lines changed

19 files changed

+374
-32
lines changed

‎opentracing-redis-common/src/main/java/io/opentracing/contrib/redis/common/RedisCommand.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,12 @@ public final class RedisCommand {
257257
public static final String IDLETIME = "IDLETIME";
258258
public static final String REFCOUNT = "REFCOUNT";
259259
public static final String EXECUTE = "EXECUTE";
260+
public static final String XACK = "XACK";
261+
public static final String XDEL = "XDEL";
262+
public static final String XGROUPCREATE = "XGROUPCREATE";
263+
public static final String XGROUPDELCONSUMER = "XGROUPDELCONSUMER";
264+
public static final String XGROUPDESTROY = "XGROUPDESTROY";
265+
public static final String XTRIM = "XTRIM";
260266

261267
private RedisCommand() {
262268
}

‎opentracing-redis-jedis3/pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
the License.
1515
1616
-->
17-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
<project xmlns="http://maven.apache.org/POM/4.0.0"
18+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1820
<parent>
1921
<artifactId>opentracing-redis-parent</artifactId>
2022
<groupId>io.opentracing.contrib</groupId>
@@ -37,7 +39,7 @@
3739
<dependency>
3840
<groupId>redis.clients</groupId>
3941
<artifactId>jedis</artifactId>
40-
<version>3.1.0</version>
42+
<version>3.2.0</version>
4143
<scope>provided</scope>
4244
</dependency>
4345

‎opentracing-redis-lettuce-5.2/pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
the License.
1515
1616
-->
17-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
<project xmlns="http://maven.apache.org/POM/4.0.0"
18+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1820
<parent>
1921
<artifactId>opentracing-redis-parent</artifactId>
2022
<groupId>io.opentracing.contrib</groupId>
@@ -37,7 +39,7 @@
3739
<dependency>
3840
<groupId>io.lettuce</groupId>
3941
<artifactId>lettuce-core</artifactId>
40-
<version>5.2.0.RELEASE</version>
42+
<version>5.2.2.RELEASE</version>
4143
<scope>provided</scope>
4244
</dependency>
4345

‎opentracing-redis-redisson/pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
the License.
1515
1616
-->
17-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
<project xmlns="http://maven.apache.org/POM/4.0.0"
18+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1820
<parent>
1921
<artifactId>opentracing-redis-parent</artifactId>
2022
<groupId>io.opentracing.contrib</groupId>
@@ -37,7 +39,7 @@
3739
<dependency>
3840
<groupId>org.redisson</groupId>
3941
<artifactId>redisson</artifactId>
40-
<version>3.11.2</version>
42+
<version>3.12.2</version>
4143
<scope>provided</scope>
4244
</dependency>
4345

‎opentracing-redis-redisson/src/main/java/io/opentracing/contrib/redis/redisson/TracingRBlockingDeque.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.Collection;
2222
import java.util.Iterator;
2323
import java.util.concurrent.TimeUnit;
24+
import java.util.function.Consumer;
2425
import org.redisson.api.RBlockingDeque;
2526
import org.redisson.api.RFuture;
2627

@@ -57,6 +58,18 @@ public V pollLastFromAny(long timeout, TimeUnit unit, String... queueNames)
5758
.decorateThrowing(span, () -> deque.pollLastFromAny(timeout, unit, queueNames));
5859
}
5960

61+
@Override
62+
public int subscribeOnFirstElements(Consumer<V> consumer) {
63+
Span span = tracingRedissonHelper.buildSpan("subscribeOnFirstElements", deque);
64+
return tracingRedissonHelper.decorate(span, () -> deque.subscribeOnFirstElements(consumer));
65+
}
66+
67+
@Override
68+
public int subscribeOnLastElements(Consumer<V> consumer) {
69+
Span span = tracingRedissonHelper.buildSpan("subscribeOnLastElements", deque);
70+
return tracingRedissonHelper.decorate(span, () -> deque.subscribeOnLastElements(consumer));
71+
}
72+
6073
@Override
6174
public void addFirst(V v) {
6275
Span span = tracingRedissonHelper.buildSpan("addFirst", deque);
@@ -308,6 +321,19 @@ public V takeLastAndOfferFirstTo(String queueName) throws InterruptedException {
308321
.decorateThrowing(span, () -> deque.takeLastAndOfferFirstTo(queueName));
309322
}
310323

324+
@Override
325+
public int subscribeOnElements(Consumer<V> consumer) {
326+
Span span = tracingRedissonHelper.buildSpan("subscribeOnElements", deque);
327+
return tracingRedissonHelper.decorate(span, () -> deque.subscribeOnElements(consumer));
328+
}
329+
330+
@Override
331+
public void unsubscribe(int listenerId) {
332+
Span span = tracingRedissonHelper.buildSpan("unsubscribe", deque);
333+
span.setTag("listenerId", listenerId);
334+
tracingRedissonHelper.decorate(span, () -> deque.unsubscribe(listenerId));
335+
}
336+
311337
@Override
312338
public RFuture<V> pollFromAnyAsync(long timeout, TimeUnit unit, String... queueNames) {
313339
Span span = tracingRedissonHelper.buildSpan("pollFromAnyAsync", deque);

‎opentracing-redis-redisson/src/main/java/io/opentracing/contrib/redis/redisson/TracingRBlockingQueue.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.Arrays;
2020
import java.util.Collection;
2121
import java.util.concurrent.TimeUnit;
22+
import java.util.function.Consumer;
2223
import org.redisson.api.RBlockingQueue;
2324
import org.redisson.api.RFuture;
2425

@@ -63,6 +64,19 @@ public V takeLastAndOfferFirstTo(String queueName) throws InterruptedException {
6364
.decorateThrowing(span, () -> queue.takeLastAndOfferFirstTo(queueName));
6465
}
6566

67+
@Override
68+
public int subscribeOnElements(Consumer<V> consumer) {
69+
Span span = tracingRedissonHelper.buildSpan("subscribeOnElements", queue);
70+
return tracingRedissonHelper.decorate(span, () -> queue.subscribeOnElements(consumer));
71+
}
72+
73+
@Override
74+
public void unsubscribe(int listenerId) {
75+
Span span = tracingRedissonHelper.buildSpan("unsubscribe", queue);
76+
span.setTag("listenerId", listenerId);
77+
tracingRedissonHelper.decorate(span, () -> queue.unsubscribe(listenerId));
78+
}
79+
6680
@Override
6781
public boolean add(V v) {
6882
Span span = tracingRedissonHelper.buildSpan("add", queue);

‎opentracing-redis-redisson/src/main/java/io/opentracing/contrib/redis/redisson/TracingRCountDownLatch.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,20 @@ public boolean trySetCount(long count) {
6464
return tracingRedissonHelper.decorateThrowing(span, () -> latch.trySetCount(count));
6565
}
6666

67+
@Override
68+
public RFuture<Void> awaitAsync() {
69+
Span span = tracingRedissonHelper.buildSpan("awaitAsync", latch);
70+
return tracingRedissonHelper.prepareRFuture(span, latch::awaitAsync);
71+
}
72+
73+
@Override
74+
public RFuture<Boolean> awaitAsync(long waitTime, TimeUnit unit) {
75+
Span span = tracingRedissonHelper.buildSpan("awaitAsync", latch);
76+
span.setTag("waitTime", waitTime);
77+
span.setTag("unit", nullable(unit));
78+
return tracingRedissonHelper.prepareRFuture(span, () -> latch.awaitAsync(waitTime, unit));
79+
}
80+
6781
@Override
6882
public RFuture<Void> countDownAsync() {
6983
Span span = tracingRedissonHelper.buildSpan("countDownAsync", latch);

‎opentracing-redis-redisson/src/main/java/io/opentracing/contrib/redis/redisson/TracingRDeque.java

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import io.opentracing.Span;
2020
import java.util.Iterator;
21+
import java.util.List;
2122
import org.redisson.api.RDeque;
2223
import org.redisson.api.RFuture;
2324

@@ -74,13 +75,13 @@ public V removeLast() {
7475
@Override
7576
public V pollFirst() {
7677
Span span = tracingRedissonHelper.buildSpan("pollFirst", deque);
77-
return tracingRedissonHelper.decorate(span, deque::pollFirst);
78+
return tracingRedissonHelper.decorate(span, () -> deque.pollFirst());
7879
}
7980

8081
@Override
8182
public V pollLast() {
8283
Span span = tracingRedissonHelper.buildSpan("pollLast", deque);
83-
return tracingRedissonHelper.decorate(span, deque::pollLast);
84+
return tracingRedissonHelper.decorate(span, () -> deque.pollLast());
8485
}
8586

8687
@Override
@@ -144,7 +145,7 @@ public V remove() {
144145
@Override
145146
public V poll() {
146147
Span span = tracingRedissonHelper.buildSpan("poll", deque);
147-
return tracingRedissonHelper.decorate(span, deque::poll);
148+
return tracingRedissonHelper.decorate(span, () -> deque.poll());
148149
}
149150

150151
@Override
@@ -299,4 +300,31 @@ public RFuture<Boolean> offerFirstAsync(V e) {
299300
return tracingRedissonHelper.prepareRFuture(span, () -> deque.offerFirstAsync(e));
300301
}
301302

303+
@Override
304+
public RFuture<List<V>> pollFirstAsync(int limit) {
305+
Span span = tracingRedissonHelper.buildSpan("pollFirstAsync", deque);
306+
span.setTag("limit", limit);
307+
return tracingRedissonHelper.prepareRFuture(span, () -> deque.pollFirstAsync(limit));
308+
}
309+
310+
@Override
311+
public RFuture<List<V>> pollLastAsync(int limit) {
312+
Span span = tracingRedissonHelper.buildSpan("pollLastAsync", deque);
313+
span.setTag("limit", limit);
314+
return tracingRedissonHelper.prepareRFuture(span, () -> deque.pollLastAsync(limit));
315+
}
316+
317+
@Override
318+
public List<V> pollLast(int limit) {
319+
Span span = tracingRedissonHelper.buildSpan("pollLast", deque);
320+
span.setTag("limit", limit);
321+
return tracingRedissonHelper.decorate(span, () -> deque.pollLast(limit));
322+
}
323+
324+
@Override
325+
public List<V> pollFirst(int limit) {
326+
Span span = tracingRedissonHelper.buildSpan("pollFirst", deque);
327+
span.setTag("limit", limit);
328+
return tracingRedissonHelper.decorate(span, () -> deque.pollFirst(limit));
329+
}
302330
}

‎opentracing-redis-redisson/src/main/java/io/opentracing/contrib/redis/redisson/TracingRKeys.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import io.opentracing.Span;
1919
import java.util.Arrays;
20-
import java.util.Collection;
2120
import java.util.concurrent.TimeUnit;
2221
import java.util.stream.Stream;
2322
import org.redisson.api.RFuture;
@@ -201,14 +200,6 @@ public String randomKey() {
201200
return tracingRedissonHelper.decorate(span, keys::randomKey);
202201
}
203202

204-
@Override
205-
@Deprecated
206-
public Collection<String> findKeysByPattern(String pattern) {
207-
Span span = tracingRedissonHelper.buildSpan("findKeysByPattern");
208-
span.setTag("pattern", nullable(pattern));
209-
return tracingRedissonHelper.decorate(span, () -> keys.findKeysByPattern(pattern));
210-
}
211-
212203
@Override
213204
public long deleteByPattern(String pattern) {
214205
Span span = tracingRedissonHelper.buildSpan("deleteByPattern");
@@ -382,14 +373,6 @@ public RFuture<String> randomKeyAsync() {
382373
return tracingRedissonHelper.prepareRFuture(span, keys::randomKeyAsync);
383374
}
384375

385-
@Override
386-
@Deprecated
387-
public RFuture<Collection<String>> findKeysByPatternAsync(String pattern) {
388-
Span span = tracingRedissonHelper.buildSpan("findKeysByPatternAsync");
389-
span.setTag("pattern", nullable(pattern));
390-
return tracingRedissonHelper.prepareRFuture(span, () -> keys.findKeysByPatternAsync(pattern));
391-
}
392-
393376
@Override
394377
public RFuture<Long> deleteByPatternAsync(String pattern) {
395378
Span span = tracingRedissonHelper.buildSpan("deleteByPatternAsync");

‎opentracing-redis-redisson/src/main/java/io/opentracing/contrib/redis/redisson/TracingRLocalCachedMap.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,14 @@ public TracingRLocalCachedMap(RLocalCachedMap<K, V> map,
3535
@Override
3636
public void preloadCache() {
3737
Span span = tracingRedissonHelper.buildSpan("preloadCache", map);
38-
tracingRedissonHelper.decorate(span, map::preloadCache);
38+
tracingRedissonHelper.decorate(span, () -> map.preloadCache());
39+
}
40+
41+
@Override
42+
public void preloadCache(int count) {
43+
Span span = tracingRedissonHelper.buildSpan("preloadCache", map);
44+
span.setTag("count", count);
45+
tracingRedissonHelper.decorate(span, () -> map.preloadCache(count));
3946
}
4047

4148
@Override

0 commit comments

Comments
 (0)
0