[pinpoint-apm#11431] Separate AsyncConnections for Span

kojandy · Aug 29, 2024 · 34bd79a · 34bd79a
1 parent b665206
commit 34bd79a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/commons-hbase/src/main/java/com/navercorp/pinpoint/common/hbase/async/AsyncPollerThread.java b/commons-hbase/src/main/java/com/navercorp/pinpoint/common/hbase/async/AsyncPollerThread.java
@@ -192,6 +192,7 @@ private boolean bufferOverflow(int drainSize) {
     @Override
     public String toString() {
         return "AsyncPollerThread{" +
+                "writerFactory=" + writerFactory +
                 ", queueSize=" + queueSize +
                 ", writeBufferSize=" + writeBufferSize +
                 ", writeBufferPeriodicFlush=" + writeBufferPeriodicFlush +

diff --git a/...base/src/main/java/com/navercorp/pinpoint/common/hbase/async/AsyncTableWriterFactory.java b/...base/src/main/java/com/navercorp/pinpoint/common/hbase/async/AsyncTableWriterFactory.java
@@ -18,4 +18,11 @@ public Writer writer(TableName tableName) {
         final AsyncTable<?> table = connection.getTable(tableName);
         return table::put;
     }
+
+    @Override
+    public String toString() {
+        return "AsyncTableWriterFactory{" +
+                "connection=" + connection +
+                '}';
+    }
 }
diff --git a/.../src/main/java/com/navercorp/pinpoint/common/hbase/config/HbaseTemplateConfiguration.java b/.../src/main/java/com/navercorp/pinpoint/common/hbase/config/HbaseTemplateConfiguration.java
@@ -290,8 +290,8 @@ public HbasePutWriter hbasePutWriter(@Qualifier("hbaseAsyncConnection") AsyncCon
                                              @Qualifier("defaultPollerOption")
                                              AsyncPollerOption option) {
 
-            HbasePutWriter hbasePutWriter = newPollerWriter("asyncPoller-", connection, decorator, option);
-            logger.info("hbasePollerPutWriter {}", hbasePutWriter);
+            HbasePutWriter hbasePutWriter = newPollerWriter("hbaseAsyncPoller-", connection, decorator, option);
+            logger.info("HbasePollerPutWriter {}", hbasePutWriter);
             return hbasePutWriter;
         }
 
@@ -307,13 +307,13 @@ public HbasePutWriterDecorator concurrencyDecorator(@Value("${hbase.client.put-w
         }
 
         @Bean
-        public HbasePutWriter spanPutWriter(@Qualifier("hbaseAsyncConnection") AsyncConnection connection,
+        public HbasePutWriter spanPutWriter(@Qualifier("spanAsyncConnection") AsyncConnection connection,
                                             @Qualifier("spanConcurrencyDecorator") HbasePutWriterDecorator decorator,
                                             @Qualifier("defaultPollerOption")
                                             AsyncPollerOption option) {
 
             HbasePutWriter hbasePutWriter = newPollerWriter("spanAsyncPoller-", connection, decorator, option);
-            logger.info("HbaseSpanPollerPutWriter {}", hbasePutWriter);
+            logger.info("SpanPollerPutWriter {}", hbasePutWriter);
             return hbasePutWriter;
         }
 

diff --git a/...main/java/com/navercorp/pinpoint/common/server/hbase/config/HbaseClientConfiguration.java b/...main/java/com/navercorp/pinpoint/common/server/hbase/config/HbaseClientConfiguration.java
@@ -96,6 +96,11 @@ public FactoryBean<AsyncConnection> hbaseAsyncConnection(Configuration configura
         return new AsyncConnectionFactoryBean(configuration, user);
     }
 
+    @Bean
+    public FactoryBean<AsyncConnection> spanAsyncConnection(Configuration configuration, User user) {
+        return new AsyncConnectionFactoryBean(configuration, user);
+    }
+
     @Bean
     public ExecutorCustomizer<ThreadPoolExecutorFactoryBean> hbaseExecutorCustomizer() {
         return new ThreadPoolExecutorCustomizer();