[pinpoint-apm#11497] Improve atomicity and performance of Redis call …

…in ActiveThread
emeroad · Oct 14, 2024 · 5ab421a · 5ab421a
1 parent 9a3454c
commit 5ab421a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/...ercorp/pinpoint/realtime/collector/service/state/RedisCollectorStatePublisherService.java b/...ercorp/pinpoint/realtime/collector/service/state/RedisCollectorStatePublisherService.java
@@ -61,8 +61,7 @@ public void publish(CollectorState state) {
 
     private void publishBytes(byte[] bytes) {
         String value = BytesUtils.toString(bytes);
-        this.redisTemplate.opsForValue().set(this.key, value);
-        this.redisTemplate.expire(this.key, this.ttl);
+        this.redisTemplate.opsForValue().set(this.key, value, this.ttl);
     }
 
 }
diff --git a/...rp/pinpoint/realtime/collector/service/state/RedisCollectorStatePublisherServiceTest.java b/...rp/pinpoint/realtime/collector/service/state/RedisCollectorStatePublisherServiceTest.java
@@ -52,8 +52,7 @@ public void test() throws IOException {
 
         doReturn(TEST_RESULT.getBytes()).when(serde).serializeToByteArray(eq(state));
         doReturn(redisValueOperations).when(redisTemplate).opsForValue();
-        doReturn(true).when(redisTemplate).expire(eq(TEST_KEY), any());
-        doNothing().when(redisValueOperations).set(eq(TEST_KEY), eq(TEST_RESULT));
+        doNothing().when(redisValueOperations).set(eq(TEST_KEY), eq(TEST_RESULT), any());
 
         RedisCollectorStatePublisherService service = new RedisCollectorStatePublisherService(
                 redisTemplate,
@@ -63,8 +62,7 @@ public void test() throws IOException {
         );
         service.publish(state);
 
-        verify(redisTemplate).expire(eq(TEST_KEY), any());
-        verify(redisValueOperations).set(eq(TEST_KEY), eq(TEST_RESULT));
+        verify(redisValueOperations).set(eq(TEST_KEY), eq(TEST_RESULT), any());
     }
 
 }
diff --git a/redis/src/main/java/com/navercorp/pinpoint/channel/redis/kv/RedisKVPubChannel.java b/redis/src/main/java/com/navercorp/pinpoint/channel/redis/kv/RedisKVPubChannel.java
@@ -39,8 +39,7 @@ class RedisKVPubChannel implements PubChannel {
 
     @Override
     public void publish(byte[] content) {
-        this.template.opsForValue().set(this.key, BytesUtils.toString(content));
-        this.template.expire(this.key, expireMs, TimeUnit.MILLISECONDS);
+        this.template.opsForValue().set(this.key, BytesUtils.toString(content), expireMs, TimeUnit.MILLISECONDS);
     }
 
 }