Add Lettuce 5.2 (#47)

opentracing-contrib · Oct 2, 2019 · 657d7a1 · 657d7a1
1 parent a8d51d7
commit 657d7a1
Show file tree

Hide file tree

Showing 41 changed files with 18,066 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ pom.xml
 ```xml
 <dependency>
     <groupId>io.opentracing.contrib</groupId>
-    <artifactId>opentracing-redis-lettuce</artifactId>
+    <artifactId>opentracing-redis-lettuce-5.2</artifactId>
     <version>VERSION</version>
 </dependency>
 ```

diff --git a/opentracing-redis-lettuce5.0/pom.xml → opentracing-redis-lettuce-5.0/pom.xml b/opentracing-redis-lettuce5.0/pom.xml → opentracing-redis-lettuce-5.0/pom.xml
@@ -14,15 +14,17 @@
     the License.
 
 -->
-<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">
+<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">
   <parent>
     <artifactId>opentracing-redis-parent</artifactId>
     <groupId>io.opentracing.contrib</groupId>
     <version>0.1.13-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>opentracing-redis-lettuce5.0</artifactId>
+  <artifactId>opentracing-redis-lettuce-5.0</artifactId>
   <name>OpenTracing Instrumentation for Lettuce 5.0 Redis Client</name>
   <description>OpenTracing Instrumentation for Lettuce 5.0 Redis Client</description>
 

diff --git a/...dis/lettuce50/CompletableRedisFuture.java → ...dis/lettuce50/CompletableRedisFuture.java b/...dis/lettuce50/CompletableRedisFuture.java → ...dis/lettuce50/CompletableRedisFuture.java
diff --git a/...ingRedisAdvancedClusterAsyncCommands.java → ...ingRedisAdvancedClusterAsyncCommands.java b/...ingRedisAdvancedClusterAsyncCommands.java → ...ingRedisAdvancedClusterAsyncCommands.java
diff --git a/.../TracingRedisAdvancedClusterCommands.java → .../TracingRedisAdvancedClusterCommands.java b/.../TracingRedisAdvancedClusterCommands.java → .../TracingRedisAdvancedClusterCommands.java
diff --git a/.../lettuce50/TracingRedisAsyncCommands.java → .../lettuce50/TracingRedisAsyncCommands.java b/.../lettuce50/TracingRedisAsyncCommands.java → .../lettuce50/TracingRedisAsyncCommands.java
diff --git a/...redis/lettuce50/TracingRedisCommands.java → ...redis/lettuce50/TracingRedisCommands.java b/...redis/lettuce50/TracingRedisCommands.java → ...redis/lettuce50/TracingRedisCommands.java
diff --git a/...ce50/TracingRedisPubSubAsyncCommands.java → ...ce50/TracingRedisPubSubAsyncCommands.java b/...ce50/TracingRedisPubSubAsyncCommands.java → ...ce50/TracingRedisPubSubAsyncCommands.java
diff --git a/...lettuce50/TracingRedisPubSubCommands.java → ...lettuce50/TracingRedisPubSubCommands.java b/...lettuce50/TracingRedisPubSubCommands.java → ...lettuce50/TracingRedisPubSubCommands.java
diff --git a/...lettuce50/TracingRedisPubSubListener.java → ...lettuce50/TracingRedisPubSubListener.java b/...lettuce50/TracingRedisPubSubListener.java → ...lettuce50/TracingRedisPubSubListener.java
diff --git a/...racingStatefulRedisClusterConnection.java → ...racingStatefulRedisClusterConnection.java b/...racingStatefulRedisClusterConnection.java → ...racingStatefulRedisClusterConnection.java
diff --git a/...uce50/TracingStatefulRedisConnection.java → ...uce50/TracingStatefulRedisConnection.java b/...uce50/TracingStatefulRedisConnection.java → ...uce50/TracingStatefulRedisConnection.java
diff --git a/...TracingStatefulRedisPubSubConnection.java → ...TracingStatefulRedisPubSubConnection.java b/...TracingStatefulRedisPubSubConnection.java → ...TracingStatefulRedisPubSubConnection.java
diff --git a/...redis/lettuce50/TracingLettuce50Test.java → ...redis/lettuce50/TracingLettuce50Test.java b/...redis/lettuce50/TracingLettuce50Test.java → ...redis/lettuce50/TracingLettuce50Test.java
diff --git a/opentracing-redis-lettuce/pom.xml → opentracing-redis-lettuce-5.1/pom.xml b/opentracing-redis-lettuce/pom.xml → opentracing-redis-lettuce-5.1/pom.xml
@@ -14,17 +14,19 @@
     the License.
 
 -->
-<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">
+<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">
   <parent>
     <artifactId>opentracing-redis-parent</artifactId>
     <groupId>io.opentracing.contrib</groupId>
     <version>0.1.13-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>opentracing-redis-lettuce</artifactId>
-  <name>OpenTracing Instrumentation for Lettuce Redis Client</name>
-  <description>OpenTracing Instrumentation for Lettuce Redis Client</description>
+  <artifactId>opentracing-redis-lettuce-5.1</artifactId>
+  <name>OpenTracing Instrumentation for Lettuce 5.1 Redis Client</name>
+  <description>OpenTracing Instrumentation for Lettuce 5.1 Redis Client</description>
 
   <dependencies>
 

diff --git a/...redis/lettuce/CompletableRedisFuture.java → ...dis/lettuce51/CompletableRedisFuture.java b/...redis/lettuce/CompletableRedisFuture.java → ...dis/lettuce51/CompletableRedisFuture.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.opentracing.contrib.redis.lettuce;
+package io.opentracing.contrib.redis.lettuce51;
 
 import io.lettuce.core.RedisFuture;
 import java.util.concurrent.CompletableFuture;

diff --git a/...ingRedisAdvancedClusterAsyncCommands.java → ...ingRedisAdvancedClusterAsyncCommands.java b/...ingRedisAdvancedClusterAsyncCommands.java → ...ingRedisAdvancedClusterAsyncCommands.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.opentracing.contrib.redis.lettuce;
+package io.opentracing.contrib.redis.lettuce51;
 
 import static io.opentracing.contrib.redis.common.TracingHelper.nullable;
 import static io.opentracing.contrib.redis.common.TracingHelper.onError;

diff --git a/.../TracingRedisAdvancedClusterCommands.java → .../TracingRedisAdvancedClusterCommands.java b/.../TracingRedisAdvancedClusterCommands.java → .../TracingRedisAdvancedClusterCommands.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.opentracing.contrib.redis.lettuce;
+package io.opentracing.contrib.redis.lettuce51;
 
 import static io.opentracing.contrib.redis.common.TracingHelper.nullable;
 import static io.opentracing.contrib.redis.common.TracingHelper.onError;

diff --git a/...is/lettuce/TracingRedisAsyncCommands.java → .../lettuce51/TracingRedisAsyncCommands.java b/...is/lettuce/TracingRedisAsyncCommands.java → .../lettuce51/TracingRedisAsyncCommands.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.opentracing.contrib.redis.lettuce;
+package io.opentracing.contrib.redis.lettuce51;
 
 import static io.opentracing.contrib.redis.common.TracingHelper.nullable;
 import static io.opentracing.contrib.redis.common.TracingHelper.onError;

diff --git a/...b/redis/lettuce/TracingRedisCommands.java → ...redis/lettuce51/TracingRedisCommands.java b/...b/redis/lettuce/TracingRedisCommands.java → ...redis/lettuce51/TracingRedisCommands.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.opentracing.contrib.redis.lettuce;
+package io.opentracing.contrib.redis.lettuce51;
 
 
 import static io.opentracing.contrib.redis.common.TracingHelper.nullable;

diff --git a/...tuce/TracingRedisPubSubAsyncCommands.java → ...ce51/TracingRedisPubSubAsyncCommands.java b/...tuce/TracingRedisPubSubAsyncCommands.java → ...ce51/TracingRedisPubSubAsyncCommands.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.opentracing.contrib.redis.lettuce;
+package io.opentracing.contrib.redis.lettuce51;
 
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;

diff --git a/...s/lettuce/TracingRedisPubSubCommands.java → ...lettuce51/TracingRedisPubSubCommands.java b/...s/lettuce/TracingRedisPubSubCommands.java → ...lettuce51/TracingRedisPubSubCommands.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.opentracing.contrib.redis.lettuce;
+package io.opentracing.contrib.redis.lettuce51;
 
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands;

diff --git a/...s/lettuce/TracingRedisPubSubListener.java → ...lettuce51/TracingRedisPubSubListener.java b/...s/lettuce/TracingRedisPubSubListener.java → ...lettuce51/TracingRedisPubSubListener.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.opentracing.contrib.redis.lettuce;
+package io.opentracing.contrib.redis.lettuce51;
 
 import static io.opentracing.contrib.redis.common.TracingHelper.nullable;
 

diff --git a/...racingStatefulRedisClusterConnection.java → ...racingStatefulRedisClusterConnection.java b/...racingStatefulRedisClusterConnection.java → ...racingStatefulRedisClusterConnection.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.opentracing.contrib.redis.lettuce;
+package io.opentracing.contrib.redis.lettuce51;
 
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.ReadFrom;

diff --git a/...ttuce/TracingStatefulRedisConnection.java → ...uce51/TracingStatefulRedisConnection.java b/...ttuce/TracingStatefulRedisConnection.java → ...uce51/TracingStatefulRedisConnection.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.opentracing.contrib.redis.lettuce;
+package io.opentracing.contrib.redis.lettuce51;
 
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.api.StatefulRedisConnection;

diff --git a/...TracingStatefulRedisPubSubConnection.java → ...TracingStatefulRedisPubSubConnection.java b/...TracingStatefulRedisPubSubConnection.java → ...TracingStatefulRedisPubSubConnection.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.opentracing.contrib.redis.lettuce;
+package io.opentracing.contrib.redis.lettuce51;
 
 import io.lettuce.core.pubsub.RedisPubSubListener;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;

diff --git a/...rib/redis/lettuce/TracingLettuceTest.java → ...redis/lettuce51/TracingLettuce51Test.java b/...rib/redis/lettuce/TracingLettuceTest.java → ...redis/lettuce51/TracingLettuce51Test.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.opentracing.contrib.redis.lettuce;
+package io.opentracing.contrib.redis.lettuce51;
 
 import static org.awaitility.Awaitility.await;
 import static org.hamcrest.core.IsEqual.equalTo;
@@ -38,7 +38,7 @@
 import org.junit.Test;
 import redis.embedded.RedisServer;
 
-public class TracingLettuceTest {
+public class TracingLettuce51Test {
 
   private MockTracer mockTracer = new MockTracer();
 

diff --git a/opentracing-redis-lettuce-5.2/pom.xml b/opentracing-redis-lettuce-5.2/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2017-2019 The OpenTracing Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+    in compliance with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software distributed under the License
+    is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+    or implied. See the License for the specific language governing permissions and limitations under
+    the License.
+
+-->
+<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">
+  <parent>
+    <artifactId>opentracing-redis-parent</artifactId>
+    <groupId>io.opentracing.contrib</groupId>
+    <version>0.1.13-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>opentracing-redis-lettuce-5.2</artifactId>
+  <name>OpenTracing Instrumentation for Lettuce 5.2 Redis Client</name>
+  <description>OpenTracing Instrumentation for Lettuce 5.2 Redis Client</description>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.opentracing.contrib</groupId>
+      <artifactId>opentracing-redis-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.lettuce</groupId>
+      <artifactId>lettuce-core</artifactId>
+      <version>5.2.0.RELEASE</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.github.kstyrc</groupId>
+      <artifactId>embedded-redis</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/...tuce-5.2/src/main/java/io/opentracing/contrib/redis/lettuce52/CompletableRedisFuture.java b/...tuce-5.2/src/main/java/io/opentracing/contrib/redis/lettuce52/CompletableRedisFuture.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2017-2019 The OpenTracing Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package io.opentracing.contrib.redis.lettuce52;
+
+import io.lettuce.core.RedisFuture;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
+public class CompletableRedisFuture<T> extends CompletableFuture<T> implements RedisFuture<T> {
+
+  private RedisFuture<T> wrappedFuture;
+
+  public CompletableRedisFuture(RedisFuture<T> wrappedFuture) {
+    this.wrappedFuture = wrappedFuture;
+  }
+
+  @Override
+  public String getError() {
+    return wrappedFuture.getError();
+  }
+
+  @Override
+  public boolean await(long timeout, TimeUnit unit) throws InterruptedException {
+    return wrappedFuture.await(timeout, unit);
+  }
+}