[#9569] Add Pinot Module

pinpoint-apm · Dec 30, 2022 · 569d1a8 · 569d1a8
1 parent 310de7e
commit 569d1a8
Show file tree

Hide file tree

Showing 29 changed files with 184 additions and 56 deletions.
diff --git a/commons-pinot/README.md b/commons-pinot/README.md
@@ -0,0 +1 @@
+# pinpoint-commons-pinot
diff --git a/commons-pinot/pom.xml b/commons-pinot/pom.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2019 NAVER Corp.
+  ~
+  ~ 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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.navercorp.pinpoint</groupId>
+        <artifactId>pinpoint</artifactId>
+        <version>2.5.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>pinpoint-commons-pinot</artifactId>
+    <name>pinpoint-commons-pinot</name>
+    <packaging>jar</packaging>
+
+    <properties>
+        <jdk.version>11</jdk.version>
+        <jdk.home>${env.JAVA_11_HOME}</jdk.home>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.navercorp.pinpoint</groupId>
+            <artifactId>pinpoint-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.navercorp.pinpoint</groupId>
+            <artifactId>pinpoint-commons</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.pinot</groupId>
+            <artifactId>pinot-jdbc-client</artifactId>
+            <version>${pinot.client.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.grpc</groupId>
+                    <artifactId>grpc-netty-shaded</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis-spring</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
+        <!-- Logging dependencies -->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...etric/common/pinot/ParameterRecorder.java → ...n/pinot/datasource/ParameterRecorder.java b/...etric/common/pinot/ParameterRecorder.java → ...n/pinot/datasource/ParameterRecorder.java
@@ -1,6 +1,7 @@
-package com.navercorp.pinpoint.metric.common.pinot;
+package com.navercorp.pinpoint.common.pinot.datasource;
 
-import org.apache.hadoop.hbase.shaded.org.apache.commons.codec.binary.Hex;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.pinot.client.PreparedStatement;
 import org.apache.pinot.client.base.AbstractBasePreparedStatement;
 import org.apache.pinot.client.utils.DateTimeUtils;
 
@@ -15,9 +16,9 @@
 import java.util.Objects;
 
 public class ParameterRecorder extends AbstractBasePreparedStatement {
-    private org.apache.pinot.client.PreparedStatement preparedStatement;
+    private PreparedStatement preparedStatement;
 
-    public ParameterRecorder(org.apache.pinot.client.PreparedStatement preparedStatement) {
+    public ParameterRecorder(PreparedStatement preparedStatement) {
         this.preparedStatement = Objects.requireNonNull(preparedStatement, "preparedStatement");
     }
 

diff --git a/.../metric/common/pinot/PinotDataSource.java → ...mon/pinot/datasource/PinotDataSource.java b/.../metric/common/pinot/PinotDataSource.java → ...mon/pinot/datasource/PinotDataSource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.metric.common.pinot;
+package com.navercorp.pinpoint.common.pinot.datasource;
 
 import org.apache.pinot.client.PinotConnection;
 import org.apache.pinot.client.PinotDriver;

diff --git a/...metric/common/pinot/StatementWrapper.java → ...on/pinot/datasource/StatementWrapper.java b/...metric/common/pinot/StatementWrapper.java → ...on/pinot/datasource/StatementWrapper.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.metric.common.pinot;
+package com.navercorp.pinpoint.common.pinot.datasource;
 
 import org.apache.pinot.client.base.AbstractBaseStatement;
 

diff --git a/.../common/pinot/WrappedPinotConnection.java → ...ot/datasource/WrappedPinotConnection.java b/.../common/pinot/WrappedPinotConnection.java → ...ot/datasource/WrappedPinotConnection.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.metric.common.pinot;
+package com.navercorp.pinpoint.common.pinot.datasource;
 
 import org.apache.pinot.client.PinotConnection;
 
@@ -43,7 +43,6 @@
  */
 public class WrappedPinotConnection implements Connection {
 
-    private static final String QUERY_FORMAT = "sql";
     private static final String LIMIT_STATEMENT = "LIMIT";
 
     private final PinotConnection connection;

diff --git a/.../pinot/WrappedPinotPreparedStatement.java → ...source/WrappedPinotPreparedStatement.java b/.../pinot/WrappedPinotPreparedStatement.java → ...source/WrappedPinotPreparedStatement.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.metric.common.pinot;
+package com.navercorp.pinpoint.common.pinot.datasource;
 
 import org.apache.pinot.client.PinotConnection;
 import org.apache.pinot.client.PinotPreparedStatement;

diff --git a/...tric/common/pinot/PinotAsyncTemplate.java → ...mon/pinot/mybatis/PinotAsyncTemplate.java b/...tric/common/pinot/PinotAsyncTemplate.java → ...mon/pinot/mybatis/PinotAsyncTemplate.java
@@ -1,5 +1,10 @@
-package com.navercorp.pinpoint.metric.common.pinot;
+package com.navercorp.pinpoint.common.pinot.mybatis;
 
+import com.navercorp.pinpoint.common.pinot.datasource.ParameterRecorder;
+import com.navercorp.pinpoint.common.pinot.datasource.PinotDataSource;
+import com.navercorp.pinpoint.common.pinot.datasource.StatementWrapper;
+import com.navercorp.pinpoint.common.pinot.datasource.WrappedPinotConnection;
+import com.navercorp.pinpoint.common.pinot.util.JdbcUtils;
 import org.apache.ibatis.exceptions.PersistenceException;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.executor.parameter.ParameterHandler;
@@ -11,6 +16,8 @@
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.transaction.TransactionFactory;
 import org.apache.ibatis.transaction.managed.ManagedTransactionFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.pinot.client.Connection;
 import org.apache.pinot.client.PinotResultSet;
 import org.apache.pinot.client.PreparedStatement;
@@ -19,7 +26,6 @@
 import org.mybatis.spring.MyBatisExceptionTranslator;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.jdbc.support.JdbcUtils;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -31,6 +37,9 @@
 import java.util.function.Function;
 
 public class PinotAsyncTemplate {
+
+    private final Logger logger = LogManager.getLogger(this.getClass());
+
     private final SqlSessionFactory sqlSessionFactory;
     private final Configuration configuration;
     private final PinotDataSource dataSource;
@@ -81,6 +90,7 @@ private <E> Future<List<E>> selectList(String statement, Object parameter, RowBo
         }
     }
 
+
     private PreparedStatement preparedStatement(Connection session, MappedStatement mappedStatement, BoundSql boundSql) {
         String sql = boundSql.getSql();
         int fetchSize = getFetchSize(mappedStatement.getFetchSize());

diff --git a/.../metric/common/pinot/TransformFuture.java → ...common/pinot/mybatis/TransformFuture.java b/.../metric/common/pinot/TransformFuture.java → ...common/pinot/mybatis/TransformFuture.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.metric.common.pinot;
+package com.navercorp.pinpoint.common.pinot.mybatis;
 
 import java.util.Objects;
 import java.util.concurrent.ExecutionException;

diff --git a/commons-pinot/src/main/java/com/navercorp/pinpoint/common/pinot/util/JdbcUtils.java b/commons-pinot/src/main/java/com/navercorp/pinpoint/common/pinot/util/JdbcUtils.java
@@ -0,0 +1,26 @@
+package com.navercorp.pinpoint.common.pinot.util;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+public final class JdbcUtils {
+    private static final Logger logger = LogManager.getLogger(JdbcUtils.class);
+
+    private JdbcUtils() {
+    }
+
+    public static void closeConnection(Connection con) {
+        if (con != null) {
+            try {
+                con.close();
+            } catch (SQLException ex) {
+                logger.debug("Could not close JDBC Connection", ex);
+            } catch (Throwable ex) {
+                logger.debug("Unexpected exception on closing JDBC Connection", ex);
+            }
+        }
+    }
+}
diff --git a/...ric/common/pinot/PinotDataSourceTest.java → ...pinot/datasource/PinotDataSourceTest.java b/...ric/common/pinot/PinotDataSourceTest.java → ...pinot/datasource/PinotDataSourceTest.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.metric.common.pinot;
+package com.navercorp.pinpoint.common.pinot.datasource;
 
 import org.apache.pinot.client.PinotConnection;
 import org.apache.pinot.client.PinotDriver;

diff --git a/...ric/common/pinot/PinotTenantProvider.java → ...n/server/tenant/SimpleTenantProvider.java b/...ric/common/pinot/PinotTenantProvider.java → ...n/server/tenant/SimpleTenantProvider.java
@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.metric.common.pinot;
+package com.navercorp.pinpoint.common.server.tenant;
+
 
 /**
  * @author minwoo.jung
  */
-public class PinotTenantProvider implements TenantProvider {
+public class SimpleTenantProvider implements TenantProvider {
 
     private final String defaultTenantId;
 
-    public PinotTenantProvider(String defaultTenantId) {
+    public SimpleTenantProvider(String defaultTenantId) {
         this.defaultTenantId = defaultTenantId;
     }
 

diff --git a/...t/metric/common/pinot/TenantProvider.java → .../common/server/tenant/TenantProvider.java b/...t/metric/common/pinot/TenantProvider.java → .../common/server/tenant/TenantProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.metric.common.pinot;
+package com.navercorp.pinpoint.common.server.tenant;
 
 /**
  * @author minwoo.jung

diff --git a/...rter/src/main/java/com/navercorp/pinpoint/collector/service/PinotAgentUriStatService.java b/...rter/src/main/java/com/navercorp/pinpoint/collector/service/PinotAgentUriStatService.java
@@ -17,13 +17,12 @@
 package com.navercorp.pinpoint.collector.service;
 
 import com.navercorp.pinpoint.common.server.bo.stat.AgentUriStatBo;
-
 import com.navercorp.pinpoint.common.server.bo.stat.EachUriStatBo;
 import com.navercorp.pinpoint.common.server.bo.stat.UriStatHistogram;
+import com.navercorp.pinpoint.common.server.tenant.TenantProvider;
 import com.navercorp.pinpoint.metric.collector.MetricAppPropertySources;
 import com.navercorp.pinpoint.metric.collector.dao.UriStatDao;
 import com.navercorp.pinpoint.metric.common.model.UriStat;
-import com.navercorp.pinpoint.metric.common.pinot.TenantProvider;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.ImportResource;

diff --git a/metric-module/metric/pom.xml b/metric-module/metric/pom.xml
@@ -37,12 +37,14 @@
         <dependency>
             <groupId>com.navercorp.pinpoint</groupId>
             <artifactId>pinpoint-commons</artifactId>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.navercorp.pinpoint</groupId>
             <artifactId>pinpoint-commons-server</artifactId>
-            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.navercorp.pinpoint</groupId>
+            <artifactId>pinpoint-commons-pinot</artifactId>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -159,21 +161,6 @@
             <version>1.5.2-5</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.pinot</groupId>
-            <artifactId>pinot-jdbc-client</artifactId>
-            <version>0.11.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.grpc</groupId>
-                    <artifactId>grpc-netty-shaded</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.kafka</groupId>

diff --git a/...ain/java/com/navercorp/pinpoint/metric/collector/controller/TelegrafMetricController.java b/...ain/java/com/navercorp/pinpoint/metric/collector/controller/TelegrafMetricController.java
@@ -16,6 +16,7 @@
 
 package com.navercorp.pinpoint.metric.collector.controller;
 
+import com.navercorp.pinpoint.common.server.tenant.TenantProvider;
 import com.navercorp.pinpoint.common.util.CollectionUtils;
 import com.navercorp.pinpoint.metric.collector.model.TelegrafMetric;
 import com.navercorp.pinpoint.metric.collector.model.TelegrafMetrics;
@@ -27,7 +28,6 @@
 import com.navercorp.pinpoint.metric.common.model.SystemMetric;
 import com.navercorp.pinpoint.metric.common.model.Tag;
 import com.navercorp.pinpoint.metric.common.model.validation.SimpleErrorMessage;
-import com.navercorp.pinpoint.metric.common.pinot.TenantProvider;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.http.ResponseEntity;

diff --git a/...ic/src/main/java/com/navercorp/pinpoint/metric/web/controller/SystemMetricController.java b/...ic/src/main/java/com/navercorp/pinpoint/metric/web/controller/SystemMetricController.java
@@ -16,8 +16,8 @@
 
 package com.navercorp.pinpoint.metric.web.controller;
 
+import com.navercorp.pinpoint.common.server.tenant.TenantProvider;
 import com.navercorp.pinpoint.metric.common.model.Tag;
-import com.navercorp.pinpoint.metric.common.pinot.TenantProvider;
 import com.navercorp.pinpoint.metric.web.model.MetricDataSearchKey;
 import com.navercorp.pinpoint.metric.web.model.MetricInfo;
 import com.navercorp.pinpoint.metric.web.model.SystemMetricData;
@@ -53,7 +53,10 @@ public class SystemMetricController {
 
     private final TagParser tagParser = new TagParser();
 
-    public SystemMetricController(SystemMetricDataService systemMetricDataService, SystemMetricHostInfoService systemMetricHostInfoService, YMLSystemMetricBasicGroupManager systemMetricBasicGroupManager, TenantProvider tenantProvider) {
+    public SystemMetricController(SystemMetricDataService systemMetricDataService,
+                                  SystemMetricHostInfoService systemMetricHostInfoService,
+                                  YMLSystemMetricBasicGroupManager systemMetricBasicGroupManager,
+                                  TenantProvider tenantProvider) {
         this.systemMetricDataService = Objects.requireNonNull(systemMetricDataService, "systemMetricService");
         this.systemMetricHostInfoService = Objects.requireNonNull(systemMetricHostInfoService, "systemMetricHostInfoService");
         this.systemMetricBasicGroupManager = Objects.requireNonNull(systemMetricBasicGroupManager, "systemMetricBasicGroupManager");

diff --git a/.../metric/src/main/java/com/navercorp/pinpoint/metric/web/controller/UriStatController.java b/.../metric/src/main/java/com/navercorp/pinpoint/metric/web/controller/UriStatController.java
@@ -16,9 +16,9 @@
 
 package com.navercorp.pinpoint.metric.web.controller;
 
+import com.navercorp.pinpoint.common.server.tenant.TenantProvider;
 import com.navercorp.pinpoint.common.util.StringUtils;
 import com.navercorp.pinpoint.metric.common.model.UriStat;
-import com.navercorp.pinpoint.metric.common.pinot.TenantProvider;
 import com.navercorp.pinpoint.metric.web.model.UriStatSummary;
 import com.navercorp.pinpoint.metric.web.service.UriStatService;
 import com.navercorp.pinpoint.metric.web.util.Range;

diff --git a/...src/main/java/com/navercorp/pinpoint/metric/web/dao/pinot/PinotSystemMetricDoubleDao.java b/...src/main/java/com/navercorp/pinpoint/metric/web/dao/pinot/PinotSystemMetricDoubleDao.java
@@ -16,8 +16,8 @@
 
 package com.navercorp.pinpoint.metric.web.dao.pinot;
 
+import com.navercorp.pinpoint.common.pinot.mybatis.PinotAsyncTemplate;
 import com.navercorp.pinpoint.metric.common.model.MetricTag;
-import com.navercorp.pinpoint.metric.common.pinot.PinotAsyncTemplate;
 import com.navercorp.pinpoint.metric.web.dao.SystemMetricDao;
 import com.navercorp.pinpoint.metric.web.dao.model.SystemMetricDataSearchKey;
 import com.navercorp.pinpoint.metric.web.model.MetricDataSearchKey;
@@ -26,7 +26,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.mybatis.spring.SqlSessionTemplate;
-
 import org.springframework.stereotype.Repository;
 
 import java.util.List;